From 6f0c7eb8c166040eb16787ba0a1248c67e075aa1 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Wed, 19 Dec 2012 09:22:33 +0100 Subject: [PATCH 01/34] Update test source and target JDK compatibility "test" source and target compatibility has been upgraded to 1.7 except where noted, allowing us to use 1.7 language features such as diamond-style (<>) generics declarations, automatic resource management and multi-catch. More importantly, we will be able to upgrade to 1.8 once it is available in order to make use of lambda expressions, etc in our test cases. IDE configurations must be relaxed to allow 1.7 across the board, as neither Eclipse nor IDEA are clever enough to allow for different language levels across production and test resources. See [1] for a feature request on that front. spring-oxm is a special case here, and has been pinned at 1.6 compatibility even for its test sources in order to avoid a class verification error that JibX throws when encountering 1.7-level bytecode [2]. Likewise with spring-orm, toplink encounters a similar class verification error, so has been pinned to 1.6 for the time being. When we remove the (already deprecated since 3.2) Toplink support we can restore compatibility to 1.7. [1]: http://youtrack.jetbrains.com/issue/IDEA-97814 [2]: http://jira.codehaus.org/browse/JIBX-465 Issue: SPR-10129 --- build.gradle | 26 +++++++++++++++++-- .../oxm/castor/CastorUnmarshallerTests.java | 10 ++++--- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 540694d2ee0..5e996570c49 100644 --- a/build.gradle +++ b/build.gradle @@ -32,8 +32,14 @@ configure(allprojects) { group = "org.springframework" - sourceCompatibility=1.5 - targetCompatibility=1.5 + compileJava { + sourceCompatibility=1.5 + targetCompatibility=1.5 + } + compileTestJava { + sourceCompatibility=1.7 + targetCompatibility=1.7 + } [compileJava, compileTestJava]*.options*.compilerArgs = [ "-Xlint:serial", @@ -333,6 +339,14 @@ project("spring-tx") { project("spring-oxm") { description = "Spring Object/XML Marshalling" apply from: "oxm.gradle" + + compileTestJava { + // necessary to avoid java.lang.VerifyError on jibx compilation + // see http://jira.codehaus.org/browse/JIBX-465 + sourceCompatibility=1.6 + targetCompatibility=1.6 + } + dependencies { compile(project(":spring-beans")) compile(project(":spring-core")) @@ -458,6 +472,14 @@ project("spring-web") { project("spring-orm") { description = "Spring Object/Relational Mapping" + + compileTestJava { + // necessary to avoid java.lang.VerifyError on toplink compilation + // TODO: remove this block when we remove toplink + sourceCompatibility=1.6 + targetCompatibility=1.6 + } + dependencies { compile("aopalliance:aopalliance:1.0") optional("org.hibernate:hibernate-core:3.3.2.GA") diff --git a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java index 4c5387aaa34..367b4aa5c15 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,6 +29,8 @@ import org.springframework.oxm.AbstractUnmarshallerTests; import org.springframework.oxm.MarshallingException; import org.springframework.oxm.Unmarshaller; +import static org.hamcrest.CoreMatchers.*; + import static org.junit.Assert.*; /** @@ -66,7 +68,7 @@ public class CastorUnmarshallerTests extends AbstractUnmarshallerTests { protected void testFlight(Object o) { Flight flight = (Flight) o; assertNotNull("Flight is null", flight); - assertEquals("Number is invalid", 42L, flight.getNumber()); + assertThat("Number is invalid", flight.getNumber(), equalTo(42L)); } @Override @@ -104,10 +106,10 @@ public class CastorUnmarshallerTests extends AbstractUnmarshallerTests { assertEquals("Invalid amount of items", 2, order.getOrderItemCount()); OrderItem item = order.getOrderItem(0); assertEquals("Invalid items", "1", item.getId()); - assertEquals("Invalid items", 15, item.getQuantity()); + assertThat("Invalid items", item.getQuantity(), equalTo(15)); item = order.getOrderItem(1); assertEquals("Invalid items", "3", item.getId()); - assertEquals("Invalid items", 20, item.getQuantity()); + assertThat("Invalid items", item.getQuantity(), equalTo(20)); } @Test From 4c8cd7b0bd45bbe37ec9cc588b0f29608831b05f Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Fri, 28 Dec 2012 13:59:24 +0100 Subject: [PATCH 02/34] Add @Override annotations to test sources Issue: SPR-10129 --- .../AspectJExpressionPointcutTests.java | 2 + .../BeanNamePointcutMatchingTests.java | 1 + ...hodInvocationProceedingJoinPointTests.java | 4 ++ .../TrickyAspectJPointcutExpressionTests.java | 2 + .../AbstractAspectJAdvisorFactoryTests.java | 11 +++ .../annotation/ArgumentBindingTests.java | 1 + .../annotation/AspectProxyFactoryTests.java | 1 + .../AspectJPrecedenceComparatorTests.java | 1 + .../aop/framework/AopProxyUtilsTests.java | 1 + .../framework/IntroductionBenchmarkTests.java | 1 + .../aop/framework/MethodInvocationTests.java | 1 + .../aop/framework/NullPrimitiveTests.java | 3 + .../aop/framework/PrototypeTargetTests.java | 2 + .../aop/framework/ProxyFactoryTests.java | 4 ++ .../adapter/ThrowsAdviceInterceptorTests.java | 1 + .../ConcurrencyThrottleInterceptorTests.java | 1 + .../CustomizableTraceInterceptorTests.java | 1 + .../interceptor/DebugInterceptorTests.java | 1 + .../ExposeBeanNameAdvisorsTests.java | 1 + .../ExposeInvocationInterceptorTests.java | 3 + .../aop/support/AopUtilsTests.java | 2 + .../aop/support/ComposablePointcutTests.java | 4 ++ ...elegatingIntroductionInterceptorTests.java | 8 +++ .../support/JdkRegexpMethodPointcutTests.java | 1 + .../aop/support/MethodMatchersTests.java | 3 + .../aop/support/PointcutsTests.java | 9 +++ .../target/LazyCreationTargetSourceTests.java | 2 + .../aop/target/LazyInitTargetSourceTests.java | 1 + .../PrototypeBasedTargetSourceTests.java | 2 + .../target/ThreadLocalTargetSourceTests.java | 1 + .../dynamic/RefreshableTargetSourceTests.java | 2 + .../java/test/aop/CountingBeforeAdvice.java | 1 + .../test/java/test/aop/DefaultLockable.java | 3 + .../test/java/test/aop/NopInterceptor.java | 1 + .../test/java/test/aop/PerTargetAspect.java | 1 + .../test/aop/SerializableNopInterceptor.java | 2 + .../test/java/test/beans/DerivedTestBean.java | 4 ++ .../test/java/test/beans/NestedTestBean.java | 1 + .../java/test/beans/SerializablePerson.java | 5 ++ .../src/test/java/test/beans/TestBean.java | 17 +++++ .../CollectingReaderEventListener.java | 4 ++ .../foo/ComponentBeanDefinitionParser.java | 1 + .../java/com/foo/ComponentFactoryBean.java | 3 + .../com/foo/ComponentNamespaceHandler.java | 1 + .../springframework/beans/BeanUtilsTests.java | 4 ++ .../beans/BeanWrapperGenericsTests.java | 6 ++ .../beans/BeanWrapperTests.java | 13 ++++ .../beans/ConcurrentBeanWrapperTests.java | 1 + .../beans/ExtendedBeanInfoTests.java | 5 ++ ...uiredAnnotationBeanPostProcessorTests.java | 2 + .../factory/ConcurrentBeanFactoryTests.java | 2 + .../DefaultListableBeanFactoryTests.java | 31 +++++++++ .../beans/factory/FactoryBeanTests.java | 8 +++ .../factory/SharedBeanRegistryTests.java | 1 + ...wiredAnnotationBeanPostProcessorTests.java | 7 ++ .../CustomAutowireConfigurerTests.java | 2 + ...njectAnnotationBeanPostProcessorTests.java | 7 ++ .../config/CustomEditorConfigurerTests.java | 2 + .../PropertyResourceConfigurerTests.java | 3 + .../factory/config/SimpleScopeTests.java | 1 + .../beans/factory/config/TestTypes.java | 5 ++ .../parsing/CustomProblemReporterTests.java | 3 + .../support/BeanFactoryGenericsTests.java | 2 + .../PropertiesBeanDefinitionReaderTests.java | 1 + .../beans/factory/support/Spr8954Tests.java | 3 + .../security/CallbacksSecurityTests.java | 18 +++++ .../security/support/CustomFactoryBean.java | 3 + .../support/security/support/DestroyBean.java | 1 + .../support/security/support/InitBean.java | 1 + .../factory/xml/AbstractBeanFactoryTests.java | 2 + .../factory/xml/BeanNameGenerationTests.java | 1 + .../xml/CollectingReaderEventListener.java | 4 ++ .../factory/xml/CollectionMergingTests.java | 1 + .../beans/factory/xml/CountingFactory.java | 3 + .../xml/DefaultLifecycleMethodsTests.java | 1 + .../xml/DelegatingEntityResolverTests.java | 1 + .../beans/factory/xml/DependenciesBean.java | 1 + .../factory/xml/EventPublicationTests.java | 1 + .../beans/factory/xml/GeneratedNameBean.java | 1 + .../factory/xml/MetadataAttachmentTests.java | 1 + .../xml/ProfileXmlBeanDefinitionTests.java | 1 + .../factory/xml/ProtectedLifecycleBean.java | 6 ++ .../xml/UtilNamespaceHandlerTests.java | 1 + .../xml/XmlListableBeanFactoryTests.java | 5 ++ .../beans/propertyeditors/BeanInfoTests.java | 2 + .../propertyeditors/CustomEditorTests.java | 46 +++++++++++++ .../support/PropertyComparatorTests.java | 1 + .../test/java/test/beans/DerivedTestBean.java | 4 ++ .../test/java/test/beans/DummyFactory.java | 7 ++ .../test/java/test/beans/LifecycleBean.java | 6 ++ .../test/java/test/beans/NestedTestBean.java | 1 + .../src/test/java/test/beans/TestBean.java | 20 ++++++ .../springframework/beans/NestedTestBean.java | 1 + .../org/springframework/beans/TestBean.java | 20 ++++++ .../cache/ehcache/EhCacheSupportTests.java | 3 + .../javamail/InternetAddressEditorTests.java | 1 + .../mail/javamail/JavaMailSenderTests.java | 4 ++ .../scheduling/quartz/QuartzSupportTests.java | 28 ++++++++ .../JasperReportsUtilsTests.java | 1 + .../AutowiredQualifierFooService.java | 3 + .../example/scannable/FooServiceImpl.java | 3 + .../scannable/ScopedProxyTestBean.java | 3 + .../java/example/scannable/StubFooDao.java | 1 + .../AspectAndAdvicePrecedenceTests.java | 10 +++ ...AspectJExpressionPointcutAdvisorTests.java | 1 + .../aop/aspectj/BeanNamePointcutTests.java | 1 + .../DeclarationOrderIndependenceTests.java | 6 ++ .../aop/aspectj/ProceedTests.java | 9 +++ .../SubtypeSensitiveMatchingTests.java | 3 + .../aspectj/TargetPointcutSelectionTests.java | 2 + ...tSelectionOnlyPointcutsAtAspectJTests.java | 3 + ...sAndTargetSelectionOnlyPointcutsTests.java | 1 + .../aop/aspectj/_TestTypes.java | 5 ++ .../autoproxy/AnnotationPointcutTests.java | 1 + .../AspectImplementingInterfaceTests.java | 1 + .../AspectJAutoProxyCreatorTests.java | 6 ++ .../AtAspectJAnnotationBindingTests.java | 3 + .../aop/aspectj/autoproxy/_TestTypes.java | 4 ++ .../autoproxy/benchmark/BenchmarkTests.java | 5 ++ .../autoproxy/spr3064/SPR3064Tests.java | 1 + .../GenericBridgeMethodMatchingTests.java | 2 + .../GenericParameterMatchingTests.java | 2 + .../aop/framework/AbstractAopProxyTests.java | 60 ++++++++++++++++ .../aop/framework/CglibProxyTests.java | 6 ++ .../aop/framework/JdkDynamicProxyTests.java | 7 ++ .../aop/framework/ProxyFactoryBeanTests.java | 10 +++ .../aop/framework/_TestTypes.java | 3 + .../AdvisorAdapterRegistrationTests.java | 4 ++ .../AdvisorAutoProxyCreatorTests.java | 1 + .../autoproxy/AutoProxyCreatorTests.java | 2 + .../BeanNameAutoProxyCreatorInitTests.java | 1 + .../BeanNameAutoProxyCreatorTests.java | 3 + .../beans/DerivedTestBean.java | 4 ++ .../springframework/beans/NestedTestBean.java | 1 + .../beans/SerializablePerson.java | 5 ++ .../org/springframework/beans/TestBean.java | 20 ++++++ .../factory/AbstractBeanFactoryTests.java | 1 + .../beans/factory/DummyFactory.java | 7 ++ .../beans/factory/LifecycleBean.java | 6 ++ .../beans/factory/MustBeInitialized.java | 1 + .../BridgeMethodAutowiringTests.java | 1 + .../beans/factory/config/SimpleMapScope.java | 5 ++ .../CollectingReaderEventListener.java | 4 ++ .../beans/factory/xml/DependenciesBean.java | 1 + .../factory/xml/QualifierAnnotationTests.java | 3 + .../factory/xml/XmlBeanFactoryTestTypes.java | 11 +++ .../factory/xml/XmlBeanFactoryTests.java | 10 +++ .../support/CustomNamespaceHandlerTests.java | 9 +++ .../AnnotatedClassCacheableService.java | 22 ++++++ .../cache/config/DefaultCacheableService.java | 22 ++++++ .../cache/config/EnableCachingTests.java | 4 ++ .../springframework/context/ACATester.java | 1 + .../AbstractApplicationContextTests.java | 2 + .../context/BeanThatBroadcasts.java | 1 + .../context/BeanThatListens.java | 1 + .../context/LifecycleContextBean.java | 3 + .../springframework/context/TestListener.java | 1 + ...ntextSingletonBeanFactoryLocatorTests.java | 2 + ...notationConfigApplicationContextTests.java | 7 ++ .../AnnotationProcessorPerformanceTests.java | 2 + ...ommonAnnotationBeanPostProcessorTests.java | 10 +++ .../annotation/ComponentScanParserTests.java | 1 + .../ConfigurationClassAndBFPPTests.java | 2 + ...tionWithFactoryBeanAndAutowiringTests.java | 6 ++ ...tionWithFactoryBeanAndParametersTests.java | 3 + .../DestroyMethodInferenceTests.java | 1 + .../EnableLoadTimeWeavingTests.java | 3 + .../FooServiceDependentConverter.java | 1 + .../context/annotation/ImportAwareTests.java | 5 ++ .../ImportBeanDefinitionRegistrarTests.java | 4 ++ .../NestedConfigurationClassTests.java | 1 + .../Spr3775InitDestroyLifecycleTests.java | 4 ++ .../context/annotation/Spr6602Tests.java | 3 + .../annotation/TestBeanNameGenerator.java | 1 + .../annotation/TestScopeMetadataResolver.java | 1 + .../ConfigurationBeanNameTests.java | 1 + ...ClassCglibCallbackDeregistrationTests.java | 1 + .../ConfigurationClassProcessingTests.java | 4 ++ .../configuration/ScopingTests.java | 5 ++ .../configuration/Spr7167Tests.java | 1 + .../context/annotation3/StubFooDao.java | 1 + .../context/annotation5/OtherFooDao.java | 1 + .../StringToBarConverter.java | 1 + .../event/ApplicationContextEventTests.java | 5 ++ .../EventPublicationInterceptorTests.java | 4 ++ .../context/event/LifecycleEventTests.java | 4 ++ .../ApplicationContextExpressionTests.java | 5 ++ .../BeanFactoryPostProcessorTests.java | 1 + .../ClassPathXmlApplicationContextTests.java | 1 + .../ConversionServiceFactoryBeanTests.java | 5 ++ .../DefaultLifecycleProcessorTests.java | 22 ++++++ .../FactoryBeanAndApplicationListener.java | 4 ++ .../context/support/LifecycleTestBean.java | 3 + .../context/support/Logic.java | 1 + .../context/support/ResourceConverter.java | 1 + .../context/support/Service.java | 4 ++ .../support/SimpleThreadScopeTest.java | 2 + ...ticApplicationContextMulticasterTests.java | 4 ++ .../StaticApplicationContextTests.java | 2 + .../support/StaticMessageSourceTests.java | 3 + .../context/support/TestProxyFactoryBean.java | 1 + .../core/task/NoOpRunnable.java | 1 + .../LocalSlsbInvokerInterceptorTests.java | 2 + ...StatelessSessionProxyFactoryBeanTests.java | 4 ++ ...mpleRemoteSlsbInvokerInterceptorTests.java | 2 + ...StatelessSessionProxyFactoryBeanTests.java | 9 +++ .../format/number/NumberFormattingTests.java | 1 + ...tingConversionServiceFactoryBeanTests.java | 8 +++ .../FormattingConversionServiceTests.java | 8 +++ .../ReflectiveLoadTimeWeaverTests.java | 2 + .../springframework/jmx/AbstractJmxTests.java | 2 + .../jmx/AbstractMBeanServerTests.java | 2 + .../org/springframework/jmx/JmxTestBean.java | 7 ++ .../access/MBeanClientInterceptorTests.java | 4 ++ ...moteMBeanClientInterceptorTestsIgnore.java | 3 + .../export/CustomEditorConfigurerTests.java | 1 + .../export/MBeanExporterOperationsTests.java | 2 + .../jmx/export/MBeanExporterTests.java | 8 +++ .../jmx/export/NotificationListenerTests.java | 3 + .../export/NotificationPublisherTests.java | 9 +++ .../PropertyPlaceholderConfigurerTests.java | 1 + .../jmx/export/TestDynamicMBean.java | 6 ++ .../AnnotationMetadataAssemblerTests.java | 4 ++ .../export/annotation/AnnotationTestBean.java | 7 ++ .../annotation/AnnotationTestBeanFactory.java | 3 + .../annotation/AnnotationTestSubBean.java | 4 ++ .../annotation/JmxUtilsAnnotationTests.java | 2 + ...tractMetadataAssemblerAutodetectTests.java | 1 + .../AbstractMetadataAssemblerTests.java | 4 ++ ...aceBasedMBeanInfoAssemblerCustomTests.java | 5 ++ ...aceBasedMBeanInfoAssemblerMappedTests.java | 5 ++ ...InterfaceBasedMBeanInfoAssemblerTests.java | 5 ++ ...ExclusionMBeanInfoAssemblerComboTests.java | 5 ++ ...xclusionMBeanInfoAssemblerMappedTests.java | 5 ++ ...usionMBeanInfoAssemblerNotMappedTests.java | 5 ++ ...ethodExclusionMBeanInfoAssemblerTests.java | 5 ++ ...ameBasedMBeanInfoAssemblerMappedTests.java | 5 ++ ...ethodNameBasedMBeanInfoAssemblerTests.java | 5 ++ .../assembler/ReflectiveAssemblerTests.java | 5 ++ .../export/naming/KeyNamingStrategyTests.java | 4 ++ .../PropertiesFileNamingStrategyTests.java | 1 + .../naming/PropertiesNamingStrategyTests.java | 4 ++ .../ModelMBeanNotificationPublisherTests.java | 2 + .../jmx/support/JmxUtilsTests.java | 9 +++ .../jndi/JndiObjectFactoryBeanTests.java | 4 ++ .../jndi/JndiTemplateTests.java | 7 ++ .../jndi/SimpleNamingContextTests.java | 9 +++ .../mock/jndi/ExpectedLookupTemplate.java | 1 + .../mock/jndi/SimpleNamingContext.java | 36 ++++++++++ .../mock/jndi/SimpleNamingContextBuilder.java | 2 + .../remoting/rmi/RmiSupportTests.java | 10 +++ ...AsyncAnnotationBeanPostProcessorTests.java | 3 + .../annotation/AsyncExecutionTests.java | 7 ++ .../annotation/EnableAsyncTests.java | 1 + .../annotation/EnableSchedulingTests.java | 7 ++ .../ScheduledExecutorFactoryBeanTests.java | 4 ++ .../ThreadPoolTaskSchedulerTests.java | 4 ++ .../ExecutorBeanDefinitionParserTests.java | 1 + ...heduledTasksBeanDefinitionParserTests.java | 1 + .../support/PeriodicTriggerTests.java | 3 + .../scheduling/timer/TimerSupportTests.java | 7 ++ .../timer/TimerTaskExecutorTests.java | 5 ++ .../scripting/config/OtherTestBean.java | 3 + .../scripting/groovy/ConcreteMessenger.java | 2 + .../groovy/GroovyScriptFactoryTests.java | 2 + .../scripting/groovy/LogUserAdvice.java | 1 + .../scripting/groovy/TestServiceImpl.java | 1 + .../jruby/JRubyScriptFactoryTests.java | 1 + .../scripting/support/StubMessenger.java | 2 + .../org/springframework/ui/ModelMapTests.java | 1 + .../DataBinderFieldAccessTests.java | 2 + .../validation/DataBinderTests.java | 50 ++++++++++++++ .../DefaultMessageCodesResolverTests.java | 1 + .../validation/ValidationUtilsTests.java | 4 ++ .../beanvalidation/MethodValidationTests.java | 1 + .../beanvalidation/ValidatorFactoryTests.java | 2 + .../advice/CountingAfterReturningAdvice.java | 1 + .../test/advice/CountingBeforeAdvice.java | 1 + .../java/test/aspect/PerTargetAspect.java | 1 + .../src/test/java/test/beans/CustomScope.java | 5 ++ .../test/java/test/beans/NestedTestBean.java | 1 + .../src/test/java/test/beans/TestBean.java | 17 +++++ .../java/test/interceptor/NopInterceptor.java | 1 + .../SerializableNopInterceptor.java | 2 + .../TimestampIntroductionInterceptor.java | 1 + .../test/java/test/mixin/DefaultLockable.java | 3 + .../src/test/java/test/mixin/LockMixin.java | 4 ++ .../beans/DerivedTestBean.java | 4 ++ .../springframework/beans/NestedTestBean.java | 1 + .../org/springframework/beans/TestBean.java | 18 +++++ .../core/AttributeAccessorSupportTests.java | 2 + .../core/BridgeMethodResolverTests.java | 69 +++++++++++++++++++ .../core/DefaultControlFlowTests.java | 1 + .../GenericCollectionTypeResolverTests.java | 2 + .../core/Jdk14ControlFlowTests.java | 1 + .../core/OrderComparatorTests.java | 2 + ...ioritizedParameterNameDiscovererTests.java | 4 ++ .../core/annotation/AnnotationUtilsTests.java | 5 ++ .../core/convert/TypeDescriptorTests.java | 8 +++ .../converter/ConvertingComparatorTests.java | 2 + .../CollectionToCollectionConverterTests.java | 12 ++++ .../support/DefaultConversionTests.java | 1 + .../GenericConversionServiceTests.java | 19 +++++ .../core/enums/LabeledEnumTests.java | 4 ++ .../core/io/ResourceTests.java | 6 ++ .../core/io/support/MyDummyFactory1.java | 1 + .../core/io/support/MyDummyFactory2.java | 1 + .../core/style/ToStringCreatorTests.java | 1 + .../task/SimpleAsyncTaskExecutorTests.java | 4 ++ .../util/AutoPopulatingListTests.java | 1 + .../util/CachingMapDecoratorTests.java | 1 + .../springframework/util/ClassUtilsTests.java | 1 + .../util/ConcurrentReferenceHashMapTests.java | 6 ++ .../util/FileSystemUtilsTests.java | 1 + .../util/MethodInvokerTests.java | 6 ++ .../util/MockLog4jAppender.java | 3 + .../util/PropertyPlaceholderHelperTests.java | 1 + .../util/ReflectionUtilsTests.java | 2 + .../util/ResourceUtilsTests.java | 1 + .../spel/ConstructorInvocationTests.java | 1 + .../expression/spel/EvaluationTests.java | 3 + .../spel/ExpressionLanguageScenarioTests.java | 10 +++ ...essionTestsUsingCoreConversionService.java | 2 + .../expression/spel/IndexingTests.java | 5 ++ .../expression/spel/MapAccessTests.java | 5 ++ .../spel/MethodInvocationTests.java | 3 + .../spel/OperatorOverloaderTests.java | 2 + .../expression/spel/PropertyAccessTests.java | 5 ++ .../spel/ScenariosForSpringSecurity.java | 15 ++++ .../spel/SpelDocumentationTests.java | 3 + .../expression/spel/SpelReproTests.java | 16 +++++ .../spel/TemplateExpressionParsingTests.java | 6 ++ .../expression/spel/ast/OpPlusTests.java | 1 + .../springframework/beans/NestedTestBean.java | 1 + .../org/springframework/beans/TestBean.java | 20 ++++++ .../jdbc/AbstractJdbcTests.java | 2 + .../InitializeDatabaseIntegrationTests.java | 1 + .../jdbc/core/AbstractRowMapperTests.java | 1 + .../jdbc/core/JdbcTemplateQueryTests.java | 5 ++ .../jdbc/core/JdbcTemplateTests.java | 52 ++++++++++++++ .../jdbc/core/RowMapperTests.java | 4 ++ .../core/SimpleRowCountCallbackHandler.java | 1 + .../jdbc/core/StatementCreatorUtilsTests.java | 2 + .../NamedParameterJdbcTemplateTests.java | 9 +++ .../namedparam/NamedParameterQueryTests.java | 4 ++ .../core/simple/CallMetaDataContextTests.java | 2 + ...rameterizedBeanPropertyRowMapperTests.java | 1 + .../jdbc/core/simple/SimpleJdbcCallTests.java | 2 + .../core/simple/SimpleJdbcInsertTests.java | 2 + .../core/simple/SimpleJdbcTemplateTests.java | 3 + .../simple/TableMetaDataContextTests.java | 2 + .../core/support/JdbcDaoSupportTests.java | 2 + .../jdbc/core/support/LobSupportTests.java | 2 + .../jdbc/core/support/SqlLobValueTests.java | 7 ++ .../DataSourceJtaTransactionTests.java | 15 ++++ .../DataSourceTransactionManagerTests.java | 58 ++++++++++++++++ .../DriverManagerDataSourceTests.java | 3 + .../datasource/TestDataSourceWrapper.java | 2 + .../EmbeddedDatabaseFactoryTests.java | 1 + .../lookup/JndiDataSourceLookupTests.java | 2 + .../datasource/lookup/StubDataSource.java | 2 + .../jdbc/object/CustomerMapper.java | 1 + .../jdbc/object/GenericSqlQueryTests.java | 3 + .../object/GenericStoredProcedureTests.java | 3 + .../jdbc/object/RdbmsOperationTests.java | 1 + .../jdbc/object/SqlQueryTests.java | 20 ++++++ .../jdbc/object/SqlUpdateTests.java | 3 + .../jdbc/object/StoredProcedureTests.java | 8 +++ .../support/CustomSqlExceptionTranslator.java | 1 + .../jdbc/support/KeyHolderTests.java | 1 + ...LErrorCodeSQLExceptionTranslatorTests.java | 1 + .../support/SQLErrorCodesFactoryTests.java | 5 ++ .../rowset/ResultSetWrappingRowSetTests.java | 1 + .../springframework/beans/NestedTestBean.java | 1 + .../org/springframework/beans/TestBean.java | 20 ++++++ .../core/task/StubTaskExecutor.java | 1 + .../jca/StubActivationSpec.java | 3 + .../jca/StubResourceAdapter.java | 5 ++ .../jms/StubConnectionFactory.java | 2 + .../org/springframework/jms/StubQueue.java | 1 + .../org/springframework/jms/StubTopic.java | 1 + .../jms/config/JmsNamespaceHandlerTests.java | 6 ++ .../JmsTransactionManagerTests.java | 20 ++++++ .../jms/connection/TestConnection.java | 11 +++ .../jms/connection/TestExceptionListener.java | 1 + .../jms/core/JmsTemplate102JtaTests.java | 2 + .../jms/core/JmsTemplate102Tests.java | 13 ++++ .../core/JmsTemplate102TransactedTests.java | 2 + .../jms/core/JmsTemplateJtaTests.java | 2 + .../jms/core/JmsTemplateTests.java | 10 +++ .../jms/core/JmsTemplateTransactedTests.java | 2 + .../core/support/JmsGatewaySupportTests.java | 2 + .../SimpleMessageListenerContainerTests.java | 15 ++++ .../MessageListenerAdapter102Tests.java | 6 ++ .../adapter/MessageListenerAdapterTests.java | 11 +++ .../adapter/StubMessageListenerAdapter.java | 1 + .../StubMessageListenerAdapter102.java | 1 + .../DefaultJmsActivationSpecFactoryTests.java | 1 + .../StubJmsActivationSpecFactory.java | 1 + .../jms/remoting/JmsInvokerTests.java | 66 ++++++++++++++++++ .../SimpleMessageConverter102Tests.java | 2 + .../support/SimpleMessageConverterTests.java | 2 + .../JndiDestinationResolverTests.java | 4 ++ .../CallCountingTransactionManager.java | 4 ++ .../web/DelegatingServletInputStream.java | 2 + .../web/DelegatingServletOutputStream.java | 3 + .../mock/web/MockFilterChain.java | 4 ++ .../mock/web/MockFilterConfig.java | 4 ++ .../mock/web/MockHttpServletRequest.java | 54 +++++++++++++++ .../mock/web/MockHttpServletResponse.java | 38 ++++++++++ .../mock/web/MockHttpSession.java | 17 +++++ .../mock/web/MockRequestDispatcher.java | 2 + .../mock/web/MockServletConfig.java | 4 ++ .../mock/web/MockServletContext.java | 25 +++++++ .../mock/web/PassThroughFilterChain.java | 1 + .../HibernateTransactionManagerTests.java | 32 +++++++++ .../springframework/beans/NestedTestBean.java | 1 + .../org/springframework/beans/TestBean.java | 20 ++++++ .../beans/factory/config/SimpleMapScope.java | 5 ++ .../mock/jndi/ExpectedLookupTemplate.java | 1 + .../mock/jndi/SimpleNamingContext.java | 36 ++++++++++ .../mock/jndi/SimpleNamingContextBuilder.java | 2 + .../hibernate3/HibernateInterceptorTests.java | 6 ++ .../HibernateJtaTransactionTests.java | 46 +++++++++++++ .../hibernate3/HibernateTemplateTests.java | 37 ++++++++++ .../HibernateTransactionManagerTests.java | 58 ++++++++++++++++ .../LocalSessionFactoryBeanTests.java | 47 +++++++++++++ .../support/HibernateDaoSupportTests.java | 2 + .../orm/hibernate3/support/LobTypeTests.java | 2 + .../support/OpenSessionInViewTests.java | 10 +++ .../support/ScopedBeanInterceptorTests.java | 4 ++ .../orm/ibatis/SqlMapClientTests.java | 4 ++ .../ibatis/support/LobTypeHandlerTests.java | 4 ++ .../orm/jdo/JdoInterceptorTests.java | 5 ++ .../orm/jdo/JdoTemplateTests.java | 14 ++++ .../orm/jdo/JdoTransactionManagerTests.java | 50 ++++++++++++++ .../LocalPersistenceManagerFactoryTests.java | 5 ++ .../orm/jdo/support/JdoDaoSupportTests.java | 2 + .../OpenPersistenceManagerInViewTests.java | 2 + ...AbstractEntityManagerFactoryBeanTests.java | 2 + ...tEntityManagerFactoryIntegrationTests.java | 1 + .../orm/jpa/DefaultJpaDialectTests.java | 2 + .../orm/jpa/JpaInterceptorTests.java | 5 ++ .../orm/jpa/JpaTemplateTests.java | 7 ++ .../orm/jpa/JpaTransactionManagerTests.java | 56 +++++++++++++++ ...ontainerEntityManagerFactoryBeanTests.java | 8 +++ .../LocalEntityManagerFactoryBeanTests.java | 2 + ...kEntityManagerFactoryIntegrationTests.java | 1 + ...eEntityManagerFactoryIntegrationTests.java | 1 + ...iEntityManagerFactoryIntegrationTests.java | 1 + ...aEntityManagerFactoryIntegrationTests.java | 2 + ...oryWithAspectJWeavingIntegrationTests.java | 1 + .../orm/jpa/support/JpaDaoSupportTests.java | 3 + .../support/OpenEntityManagerInViewTests.java | 6 ++ .../support/PersistenceInjectionTests.java | 5 ++ ...kEntityManagerFactoryIntegrationTests.java | 1 + ...iEntityManagerFactoryIntegrationTests.java | 1 + ...DependencyInjectionSpringContextTests.java | 1 + .../AbstractSingleSpringContextTests.java | 3 + ...sactionalDataSourceSpringContextTests.java | 1 + ...stractTransactionalSpringContextTests.java | 2 + .../test/ConditionalTestCase.java | 1 + ...ractAnnotationAwareTransactionalTests.java | 1 + .../annotation/SystemProfileValueSource.java | 1 + .../test/jpa/AbstractJpaTests.java | 4 ++ .../transaction/MockJtaTransaction.java | 7 ++ .../oxm/jaxb/Jaxb2MarshallerTests.java | 4 ++ .../web/struts/TestAction.java | 1 + .../web/servlet/DefaultMvcResultTests.java | 2 + .../test/web/servlet/StubMvcResult.java | 9 +++ .../MockHttpServletRequestBuilderTests.java | 1 + .../result/PrintingResultHandlerTests.java | 3 + .../samples/standalone/AsyncTests.java | 1 + .../samples/standalone/FilterTests.java | 1 + .../standalone/RequestBuilderTests.java | 1 + ...ConditionalDelegatingFilterProxyTests.java | 3 + .../springframework/beans/NestedTestBean.java | 1 + .../org/springframework/beans/TestBean.java | 20 ++++++ .../mock/web/MockFilterChainTests.java | 3 + ...stractSpr3350SingleSpringContextTests.java | 1 + ...sBasedSpr3350SingleSpringContextTests.java | 2 + ...DependencyInjectionSpringContextTests.java | 1 + ...lBasedSpr3350SingleSpringContextTests.java | 1 + ...alueAnnotationAwareTransactionalTests.java | 1 + .../test/context/ContextLoaderUtilsTests.java | 2 + .../MergedContextConfigurationTests.java | 2 + .../SpringRunnerContextCacheTests.java | 1 + ...ransactionalJUnit38SpringContextTests.java | 2 + ...ProfileValueJUnit38SpringContextTests.java | 1 + .../ClassLevelDisabledSpringRunnerTests.java | 5 ++ ...TransactionalJUnit4SpringContextTests.java | 3 + ...edProfileValueSourceSpringRunnerTests.java | 1 + ...ackTrueTransactionalSpringRunnerTests.java | 2 + .../SpringJUnit4ClassRunnerAppCtxTests.java | 3 + .../junit4/aci/DevProfileInitializer.java | 1 + .../junit4/aci/FooBarAliasInitializer.java | 1 + ...alizerWithoutConfigFilesOrClassesTest.java | 1 + ...rgedInitializersAnnotationConfigTests.java | 1 + ...eredInitializersAnnotationConfigTests.java | 3 + .../hibernate/HibernatePersonRepository.java | 2 + .../service/impl/StandardPersonService.java | 2 + ...aTransactionManagementConfigurerTests.java | 1 + ...TransactionalTestNGSpringContextTests.java | 2 + .../FailingBeforeAndAfterMethodsTests.java | 7 ++ .../context/web/AbstractBasicWacTests.java | 1 + .../CallCountingTransactionManager.java | 4 ++ .../test/util/ReflectionTestUtilsTests.java | 6 ++ .../beans/DerivedTestBean.java | 4 ++ .../springframework/beans/NestedTestBean.java | 1 + .../org/springframework/beans/TestBean.java | 20 ++++++ .../CollectingReaderEventListener.java | 4 ++ ...tenceExceptionTranslationAdvisorTests.java | 2 + ...xceptionTranslationPostProcessorTests.java | 1 + .../dao/support/DataAccessUtilsTests.java | 1 + .../jca/cci/CciLocalTransactionTests.java | 2 + .../jca/cci/CciTemplateTests.java | 1 + .../jca/cci/EisOperationTests.java | 2 + .../mock/jndi/ExpectedLookupTemplate.java | 1 + .../mock/jndi/SimpleNamingContext.java | 36 ++++++++++ .../mock/jndi/SimpleNamingContextBuilder.java | 2 + .../CallCountingTransactionManager.java | 4 ++ .../JndiJtaTransactionManagerTests.java | 5 ++ .../JtaTransactionManagerTests.java | 50 ++++++++++++++ ...kCallbackPreferringTransactionManager.java | 4 ++ .../transaction/MockJtaTransaction.java | 7 ++ .../transaction/TestTransactionManager.java | 6 ++ .../transaction/TransactionSupportTests.java | 7 ++ .../TxNamespaceHandlerEventTests.java | 1 + .../transaction/TxNamespaceHandlerTests.java | 1 + ...tationTransactionAttributeSourceTests.java | 33 +++++++++ ...AnnotationTransactionInterceptorTests.java | 7 ++ ...ationTransactionNamespaceHandlerTests.java | 2 + .../EnableTransactionManagementTests.java | 1 + .../config/AnnotationDrivenTests.java | 1 + .../AbstractTransactionAspectTests.java | 7 ++ .../BeanFactoryTransactionTests.java | 6 ++ .../MapTransactionAttributeSource.java | 2 + .../PlatformTransactionManagerFacade.java | 3 + .../TransactionInterceptorTests.java | 5 ++ .../transaction/jta/MockUOWManager.java | 11 +++ .../WebSphereUowTransactionManagerTests.java | 19 +++++ .../beans/DerivedTestBean.java | 4 ++ .../springframework/beans/NestedTestBean.java | 1 + .../beans/SerializablePerson.java | 5 ++ .../org/springframework/beans/TestBean.java | 28 ++++++++ .../beans/factory/DummyFactory.java | 7 ++ .../core/task/MockRunnable.java | 1 + .../http/MockHttpInputMessage.java | 2 + .../http/MockHttpOutputMessage.java | 2 + ...BufferedSimpleHttpRequestFactoryTests.java | 1 + ...mponentsClientHttpRequestFactoryTests.java | 1 + ...rceptingClientHttpRequestFactoryTests.java | 18 +++++ ...treamingSimpleHttpRequestFactoryTests.java | 1 + .../FormHttpMessageConverterTests.java | 4 ++ .../test/DelegatingServletInputStream.java | 2 + .../test/DelegatingServletOutputStream.java | 3 + .../mock/web/test/MockAsyncContext.java | 13 ++++ .../mock/web/test/MockBodyContent.java | 28 ++++++++ .../web/test/MockExpressionEvaluator.java | 3 + .../mock/web/test/MockFilterChain.java | 4 ++ .../mock/web/test/MockFilterConfig.java | 4 ++ .../mock/web/test/MockHttpServletRequest.java | 66 ++++++++++++++++++ .../web/test/MockHttpServletResponse.java | 42 +++++++++++ .../mock/web/test/MockHttpSession.java | 17 +++++ .../mock/web/test/MockJspWriter.java | 26 +++++++ .../mock/web/test/MockMultipartFile.java | 8 +++ .../test/MockMultipartHttpServletRequest.java | 9 +++ .../mock/web/test/MockPageContext.java | 27 ++++++++ .../mock/web/test/MockPart.java | 9 +++ .../mock/web/test/MockRequestDispatcher.java | 2 + .../mock/web/test/MockServletConfig.java | 4 ++ .../mock/web/test/MockServletContext.java | 51 ++++++++++++++ .../mock/web/test/PassThroughFilterChain.java | 1 + .../remoting/caucho/CauchoRemotingTests.java | 6 ++ .../httpinvoker/HttpInvokerTests.java | 19 +++++ .../remoting/jaxrpc/JaxRpcSupportTests.java | 17 +++++ .../remoting/jaxws/OrderServiceImpl.java | 1 + .../bind/ServletRequestDataBinderTests.java | 2 + .../support/WebRequestDataBinderTests.java | 1 + .../request/RequestContextListenerTests.java | 1 + .../context/request/RequestScopeTests.java | 1 + .../context/request/SessionScopeTests.java | 7 ++ .../request/async/DeferredResultTests.java | 2 + .../request/async/WebAsyncManagerTests.java | 1 + .../async/WebAsyncManagerTimeoutTests.java | 5 ++ .../web/filter/CompositeFilterTests.java | 3 + .../filter/DelegatingFilterProxyTests.java | 3 + .../filter/HiddenHttpMethodFilterTest.java | 2 + .../web/filter/RequestContextFilterTests.java | 1 + .../web/filter/RequestLoggingFilterTests.java | 4 ++ .../filter/ShallowEtagHeaderFilterTests.java | 3 + .../web/jsf/DelegatingPhaseListenerTests.java | 5 ++ .../jsf/DelegatingVariableResolverTests.java | 3 + .../web/jsf/MockFacesContext.java | 19 +++++ .../web/jsf/MockLifecycle.java | 5 ++ .../ModelAttributeMethodProcessorTests.java | 3 + .../support/InvocableHandlerMethodTests.java | 2 + .../method/support/StubArgumentResolver.java | 2 + .../support/StubReturnValueHandler.java | 2 + .../CommonsMultipartResolverTests.java | 17 +++++ .../util/ExpressionEvaluationUtilsTests.java | 3 + .../web/util/MockLog4jAppender.java | 3 + .../beans/DerivedTestBean.java | 4 ++ .../springframework/beans/NestedTestBean.java | 1 + .../org/springframework/beans/TestBean.java | 20 ++++++ .../factory/AbstractBeanFactoryTests.java | 1 + .../beans/factory/DummyFactory.java | 7 ++ .../beans/factory/LifecycleBean.java | 6 ++ .../beans/factory/MustBeInitialized.java | 1 + .../springframework/context/ACATester.java | 1 + .../AbstractApplicationContextTests.java | 2 + .../context/BeanThatBroadcasts.java | 1 + .../context/BeanThatListens.java | 1 + .../context/LifecycleContextBean.java | 3 + .../springframework/context/TestListener.java | 1 + .../web/DelegatingServletOutputStream.java | 3 + .../mock/web/MockHttpServletResponse.java | 38 ++++++++++ .../mock/web/MockHttpSession.java | 17 +++++ .../mock/web/MockMultipartFile.java | 8 +++ .../mock/web/MockRequestDispatcher.java | 2 + .../mock/web/MockServletContext.java | 25 +++++++ .../mock/web/portlet/MockActionResponse.java | 7 ++ .../mock/web/portlet/MockBaseURL.java | 9 +++ .../mock/web/portlet/MockCacheControl.java | 8 +++ .../web/portlet/MockClientDataRequest.java | 7 ++ .../mock/web/portlet/MockEvent.java | 3 + .../mock/web/portlet/MockEventRequest.java | 2 + .../mock/web/portlet/MockEventResponse.java | 1 + .../mock/web/portlet/MockMimeResponse.java | 16 +++++ .../portlet/MockMultipartActionRequest.java | 6 ++ .../mock/web/portlet/MockPortalContext.java | 5 ++ .../mock/web/portlet/MockPortletConfig.java | 11 +++ .../mock/web/portlet/MockPortletContext.java | 20 ++++++ .../mock/web/portlet/MockPortletRequest.java | 38 ++++++++++ .../portlet/MockPortletRequestDispatcher.java | 3 + .../mock/web/portlet/MockPortletResponse.java | 7 ++ .../mock/web/portlet/MockPortletSession.java | 18 +++++ .../mock/web/portlet/MockPortletURL.java | 5 ++ .../mock/web/portlet/MockRenderRequest.java | 1 + .../mock/web/portlet/MockRenderResponse.java | 2 + .../mock/web/portlet/MockResourceRequest.java | 4 ++ .../web/portlet/MockResourceResponse.java | 1 + .../mock/web/portlet/MockResourceURL.java | 3 + .../web/portlet/MockStateAwareResponse.java | 11 +++ .../ServletWrappingPortletContext.java | 20 ++++++ .../ComplexPortletApplicationContext.java | 39 +++++++++++ .../web/portlet/DispatcherPortletTests.java | 1 + .../SimplePortletApplicationContext.java | 5 ++ .../bind/PortletRequestDataBinderTests.java | 1 + ...AbstractXmlWebApplicationContextTests.java | 4 ++ .../context/PortletConfigAwareBean.java | 1 + .../context/PortletContextAwareBean.java | 1 + .../XmlPortletApplicationContextTests.java | 6 ++ .../handler/ParameterHandlerMappingTests.java | 1 + .../PortletModeHandlerMappingTests.java | 1 + ...rtletModeParameterHandlerMappingTests.java | 1 + .../SimpleMappingExceptionResolverTests.java | 1 + .../portlet/mvc/CommandControllerTests.java | 16 +++++ .../PortletModeNameViewControllerTests.java | 1 + .../mvc/PortletWrappingControllerTests.java | 5 ++ .../Portlet20AnnotationControllerTests.java | 25 +++++++ .../PortletAnnotationControllerTests.java | 24 +++++++ .../web/portlet/util/PortletUtilsTests.java | 3 + .../beans/DerivedTestBean.java | 4 ++ .../springframework/beans/NestedTestBean.java | 1 + .../beans/SerializablePerson.java | 5 ++ .../org/springframework/beans/TestBean.java | 20 ++++++ .../beans/factory/DummyFactory.java | 7 ++ .../beans/factory/LifecycleBean.java | 6 ++ .../beans/factory/MustBeInitialized.java | 1 + .../springframework/context/ACATester.java | 1 + .../context/BeanThatBroadcasts.java | 1 + .../context/BeanThatListens.java | 1 + .../context/LifecycleContextBean.java | 3 + .../springframework/context/TestListener.java | 1 + .../AbstractApplicationContextTests.java | 2 + .../web/context/AbstractBeanFactoryTests.java | 1 + .../web/context/ContextLoaderTests.java | 6 ++ .../ResourceBundleMessageSourceTests.java | 3 + .../web/context/ServletConfigAwareBean.java | 1 + .../web/context/ServletContextAwareBean.java | 1 + .../XmlWebApplicationContextTests.java | 8 +++ .../support/HttpRequestHandlerTests.java | 1 + .../support/ServletContextSupportTests.java | 4 ++ .../servlet/ComplexWebApplicationContext.java | 33 +++++++++ .../web/servlet/DispatcherServletTests.java | 2 + .../servlet/SimpleWebApplicationContext.java | 4 ++ ...tationDrivenBeanDefinitionParserTests.java | 7 ++ .../web/servlet/config/MvcNamespaceTests.java | 2 + .../annotation/InterceptorRegistryTests.java | 3 + ...MvcConfigurationSupportExtensionTests.java | 3 + .../BeanNameUrlHandlerMappingTests.java | 1 + .../mvc/CancellableFormControllerTests.java | 3 + .../servlet/mvc/CommandControllerTests.java | 12 ++++ .../web/servlet/mvc/ControllerTests.java | 5 ++ .../web/servlet/mvc/FormControllerTests.java | 14 ++++ .../mvc/WizardFormControllerTests.java | 9 +++ ...ontrollerClassNameHandlerMappingTests.java | 1 + .../JdkProxyServletAnnotationTests.java | 3 + ...estSpecificMappingInfoComparatorTests.java | 1 + .../ServletAnnotationControllerTests.java | 35 ++++++++++ .../servlet/mvc/annotation/Spr7766Tests.java | 1 + .../servlet/mvc/annotation/Spr7839Tests.java | 1 + .../web/servlet/mvc/mapping/Controller.java | 1 + ...ControllerBeanNameHandlerMappingTests.java | 1 + ...ontrollerClassNameHandlerMappingTests.java | 1 + .../mvc/mapping/WelcomeController.java | 1 + .../mvc/method/RequestMappingInfoTests.java | 1 + ...HandlerMethodAnnotationDetectionTests.java | 18 +++++ .../HttpEntityMethodProcessorTests.java | 3 + ...ResolverMethodReturnValueHandlerTests.java | 1 + ...MappingHandlerAdapterIntegrationTests.java | 5 ++ ...equestPartMethodArgumentResolverTests.java | 1 + ...tResponseBodyMethodProcessorMockTests.java | 1 + ...questResponseBodyMethodProcessorTests.java | 3 + ...nnotationControllerHandlerMethodTests.java | 58 ++++++++++++++++ .../ServletInvocableHandlerMethodTests.java | 2 + ...letRequestMethodArgumentResolverTests.java | 1 + ...nnotationControllerHandlerMethodTests.java | 3 + .../RedirectAttributesModelMapTests.java | 1 + .../support/MockFilterRegistration.java | 11 +++ .../support/MockServletRegistration.java | 14 ++++ .../RequestDataValueProcessorWrapper.java | 4 ++ .../BindTagOutsideDispatcherServletTests.java | 1 + .../web/servlet/tags/BindTagTests.java | 2 + .../web/servlet/tags/EvalTagTests.java | 1 + ...scapeTagOutsideDispatcherServletTests.java | 1 + .../web/servlet/tags/HtmlEscapeTagTests.java | 9 +++ ...ssageTagOutsideDispatcherServletTests.java | 1 + .../web/servlet/tags/MessageTagTests.java | 20 ++++++ .../web/servlet/tags/ParamTagTests.java | 1 + .../web/servlet/tags/ThemeTagTests.java | 1 + .../tags/form/AbstractFormTagTests.java | 2 + .../form/AbstractHtmlElementTagTests.java | 1 + .../web/servlet/tags/form/ButtonTagTests.java | 2 + .../servlet/tags/form/CheckboxTagTests.java | 5 ++ .../servlet/tags/form/CheckboxesTagTests.java | 8 +++ .../web/servlet/tags/form/ErrorsTagTests.java | 4 ++ .../web/servlet/tags/form/FormTagTests.java | 2 + .../tags/form/HiddenInputTagTests.java | 3 + .../web/servlet/tags/form/InputTagTests.java | 3 + .../web/servlet/tags/form/ItemPet.java | 2 + .../web/servlet/tags/form/LabelTagTests.java | 4 ++ .../servlet/tags/form/OptionTagEnumTests.java | 3 + .../web/servlet/tags/form/OptionTagTests.java | 15 ++++ .../servlet/tags/form/OptionsTagTests.java | 6 ++ .../tags/form/PasswordInputTagTests.java | 5 ++ .../tags/form/RadioButtonTagTests.java | 5 ++ .../tags/form/RadioButtonsTagTests.java | 4 ++ .../web/servlet/tags/form/SelectTagTests.java | 22 ++++++ .../servlet/tags/form/SimpleFloatEditor.java | 2 + .../web/servlet/tags/form/TagWriterTests.java | 1 + .../servlet/tags/form/TextareaTagTests.java | 3 + .../web/servlet/view/BaseViewTests.java | 3 + .../view/InternalResourceViewTests.java | 2 + ...esourceBundleViewResolverNoCacheTests.java | 1 + .../view/ResourceBundleViewResolverTests.java | 3 + .../web/servlet/view/ViewResolverTests.java | 6 ++ .../servlet/view/document/ExcelViewTests.java | 11 +++ .../servlet/view/document/PdfViewTests.java | 1 + .../freemarker/FreeMarkerConfigurerTests.java | 2 + .../view/freemarker/FreeMarkerViewTests.java | 2 + .../AbstractJasperReportsTests.java | 1 + .../AbstractJasperReportsViewTests.java | 2 + ...rableJasperReportsViewWithStreamTests.java | 2 + ...rableJasperReportsViewWithWriterTests.java | 2 + .../jasperreports/ExporterParameterTests.java | 1 + .../JasperReportsCsvViewTests.java | 2 + .../JasperReportsHtmlViewTests.java | 2 + .../JasperReportsMultiFormatViewTests.java | 5 ++ ...ultiFormatViewWithCustomMappingsTests.java | 3 + .../JasperReportsPdfViewTests.java | 2 + .../JasperReportsXlsViewTests.java | 2 + .../view/velocity/TestVelocityEngine.java | 1 + .../velocity/VelocityConfigurerTests.java | 4 ++ .../view/velocity/VelocityMacroTests.java | 4 ++ .../view/velocity/VelocityRenderTests.java | 5 ++ .../velocity/VelocityToolboxViewTests.java | 2 + .../velocity/VelocityViewResolverTests.java | 4 ++ .../view/velocity/VelocityViewTests.java | 8 +++ .../servlet/view/xslt/TestXsltViewTests.java | 13 ++++ ...visorAutoProxyCreatorIntegrationTests.java | 8 +++ .../EnableCachingIntegrationTests.java | 1 + ...ionScannerJsr330ScopeIntegrationTests.java | 3 + ...efinitionScannerScopeIntegrationTests.java | 3 + .../core/env/EnvironmentIntegrationTests.java | 1 + .../support/BeanFactoryTypeConverter.java | 3 + ...ansactionalAnnotationIntegrationTests.java | 3 + .../CallCountingTransactionManager.java | 4 ++ ...TransactionManagementIntegrationTests.java | 3 + .../ProxyAnnotationDiscoveryTests.java | 2 + .../advice/CountingAfterReturningAdvice.java | 1 + .../test/advice/CountingBeforeAdvice.java | 1 + src/test/java/test/beans/NestedTestBean.java | 1 + src/test/java/test/beans/TestBean.java | 20 ++++++ .../java/test/interceptor/NopInterceptor.java | 1 + .../SerializableNopInterceptor.java | 2 + 797 files changed, 4745 insertions(+) diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java index 2b09c8a30d0..630c1e3ea44 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java @@ -113,6 +113,7 @@ public final class AspectJExpressionPointcutTests { public static class OtherIOther implements IOther { + @Override public void absquatulate() { // Empty } @@ -354,6 +355,7 @@ class CallCountingInterceptor implements MethodInterceptor { private int count; + @Override public Object invoke(MethodInvocation methodInvocation) throws Throwable { count++; return methodInvocation.proceed(); diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java index 37140304cbf..1c30480fbd6 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java @@ -90,6 +90,7 @@ public final class BeanNamePointcutMatchingTests { private static boolean matches(final String beanName, String pcExpression) { @SuppressWarnings("serial") AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut() { + @Override protected String getCurrentProxiedBeanName() { return beanName; } diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java index e72e475abee..2af6f16be4f 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java @@ -79,6 +79,7 @@ public final class MethodInvocationProceedingJoinPointTests { pf.addAdvice(new MethodBeforeAdvice() { private int depth; + @Override public void before(Method method, Object[] args, Object target) throws Throwable { JoinPoint jp = AbstractAspectJAdvice.currentJoinPoint(); assertTrue("Method named in toString", jp.toString().contains(method.getName())); @@ -135,6 +136,7 @@ public final class MethodInvocationProceedingJoinPointTests { ProxyFactory pf = new ProxyFactory(raw); pf.addAdvisor(ExposeInvocationInterceptor.ADVISOR); pf.addAdvice(new MethodBeforeAdvice() { + @Override public void before(Method method, Object[] args, Object target) throws Throwable { SourceLocation sloc = AbstractAspectJAdvice.currentJoinPoint().getSourceLocation(); assertEquals("Same source location must be returned on subsequent requests", sloc, AbstractAspectJAdvice.currentJoinPoint().getSourceLocation()); @@ -167,6 +169,7 @@ public final class MethodInvocationProceedingJoinPointTests { ProxyFactory pf = new ProxyFactory(raw); pf.addAdvisor(ExposeInvocationInterceptor.ADVISOR); pf.addAdvice(new MethodBeforeAdvice() { + @Override public void before(Method method, Object[] args, Object target) throws Throwable { StaticPart staticPart = AbstractAspectJAdvice.currentJoinPoint().getStaticPart(); assertEquals("Same static part must be returned on subsequent requests", staticPart, AbstractAspectJAdvice.currentJoinPoint().getStaticPart()); @@ -186,6 +189,7 @@ public final class MethodInvocationProceedingJoinPointTests { ProxyFactory pf = new ProxyFactory(raw); pf.addAdvisor(ExposeInvocationInterceptor.ADVISOR); pf.addAdvice(new MethodBeforeAdvice() { + @Override public void before(Method method, Object[] args, Object target) throws Throwable { // makeEncSJP, although meant for computing the enclosing join point, // it serves our purpose here diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java index c10c50ddf8a..088ba138c35 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java @@ -137,6 +137,7 @@ public class TrickyAspectJPointcutExpressionTests { @Log public static class TestServiceImpl implements TestService { + @Override public String sayHello() { throw new TestException("TestServiceImpl"); } @@ -148,6 +149,7 @@ public class TrickyAspectJPointcutExpressionTests { private int countThrows = 0; + @Override public void before(Method method, Object[] objects, Object o) throws Throwable { countBefore++; } diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java index f6f82fb4122..ae3ac04918e 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java @@ -675,19 +675,23 @@ public abstract class AbstractAspectJAdvisorFactoryTests { return this.count; } + @Override public Object getAspectInstance() { ++this.count; return new PerTypeWithinAspect(); } + @Override public ClassLoader getAspectClassLoader() { return PerTypeWithinAspect.class.getClassLoader(); } + @Override public AspectMetadata getAspectMetadata() { return new AspectMetadata(PerTypeWithinAspect.class, "perTypeWithin"); } + @Override public int getOrder() { return Ordered.LOWEST_PRECEDENCE; } @@ -897,14 +901,17 @@ abstract class AbstractMakeModifiable { public static class ModifiableImpl implements MutableModifable { private boolean modified; + @Override public void acceptChanges() { modified = false; } + @Override public boolean isModified() { return modified; } + @Override public void markDirty() { this.modified = true; } @@ -1020,17 +1027,21 @@ class MakeLockable { class CannotBeUnlocked implements Lockable, Comparable { + @Override public void lock() { } + @Override public void unlock() { throw new UnsupportedOperationException(); } + @Override public boolean locked() { return true; } + @Override public int compareTo(Object arg0) { throw new UnsupportedOperationException(); } diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java index ebb9f03c437..6a5a746063c 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java @@ -84,6 +84,7 @@ public final class ArgumentBindingTests { public static class TransactionalBean implements ITransactionalBean { + @Override @Transactional public void doInTransaction() { } diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java index d6c24cd0a10..c0b30c27e28 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java @@ -111,6 +111,7 @@ public final class AspectProxyFactoryTests { private int age; + @Override public int getAge() { return age; } diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java index de10e14b420..9c4b78b54d3 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java @@ -194,6 +194,7 @@ public final class AspectJPrecedenceComparatorTests { private Advisor createSpringAOPAfterAdvice(int order) { AfterReturningAdvice advice = new AfterReturningAdvice() { + @Override public void afterReturning(Object returnValue, Method method, Object[] args, Object target) throws Throwable { } }; diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java index fc5268c840d..96a22b33536 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java @@ -129,6 +129,7 @@ public final class AopProxyUtilsTests { public void testProxiedUserInterfacesWithNoInterface() { Object proxy = Proxy.newProxyInstance(getClass().getClassLoader(), new Class[0], new InvocationHandler() { + @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { return null; } diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java index 9de89648053..5940cd57187 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java @@ -42,6 +42,7 @@ public final class IntroductionBenchmarkTests { @SuppressWarnings("serial") public static class SimpleCounterIntroduction extends DelegatingIntroductionInterceptor implements Counter { + @Override public int getCount() { return EXPECTED_COMPARE; } diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java index f5c4a8edcae..f4602bf0b5c 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java @@ -42,6 +42,7 @@ public final class MethodInvocationTests { final Object returnValue = new Object(); List is = new LinkedList(); is.add(new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { return returnValue; } diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/NullPrimitiveTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/NullPrimitiveTests.java index 1879f8a4cd4..11b127d0bcb 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/NullPrimitiveTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/NullPrimitiveTests.java @@ -44,6 +44,7 @@ public class NullPrimitiveTests { public void testNullPrimitiveWithJdkProxy() { class SimpleFoo implements Foo { + @Override public int getValue() { return 100; } @@ -52,6 +53,7 @@ public class NullPrimitiveTests { SimpleFoo target = new SimpleFoo(); ProxyFactory factory = new ProxyFactory(target); factory.addAdvice(new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { return null; } @@ -76,6 +78,7 @@ public class NullPrimitiveTests { Bar target = new Bar(); ProxyFactory factory = new ProxyFactory(target); factory.addAdvice(new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { return null; } diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java index 814b9025409..64abdd4891e 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java @@ -73,6 +73,7 @@ public final class PrototypeTargetTests { constructionCount++; } + @Override public void doSomething() { } } @@ -81,6 +82,7 @@ public final class PrototypeTargetTests { public static class TestInterceptor implements MethodInterceptor { private int invocationCount = 0; + @Override public Object invoke(MethodInvocation methodInvocation) throws Throwable { invocationCount++; return methodInvocation.proceed(); diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java index f8999fe6744..1255baae2a9 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java @@ -165,6 +165,7 @@ public final class ProxyFactoryTests { @Test public void testAddRepeatedInterface() { TimeStamped tst = new TimeStamped() { + @Override public long getTimeStamp() { throw new UnsupportedOperationException("getTimeStamp"); } @@ -181,6 +182,7 @@ public final class ProxyFactoryTests { public void testGetsAllInterfaces() throws Exception { // Extend to get new interface class TestBeanSubclass extends TestBean implements Comparable { + @Override public int compareTo(Object arg0) { throw new UnsupportedOperationException("compareTo"); } @@ -214,6 +216,7 @@ public final class ProxyFactoryTests { @Test public void testInterceptorInclusionMethods() { class MyInterceptor implements MethodInterceptor { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { throw new UnsupportedOperationException(); } @@ -350,6 +353,7 @@ public final class ProxyFactoryTests { this.ts = ts; } + @Override public long getTimeStamp() { return ts; } diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java index ceae4f577e8..1a245999d12 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java @@ -125,6 +125,7 @@ public final class ThrowsAdviceInterceptorTests { @SuppressWarnings("serial") MyThrowsHandler th = new MyThrowsHandler() { + @Override public void afterThrowing(RemoteException ex) throws Throwable { super.afterThrowing(ex); throw t; diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java index 9b3aaf6d9a3..0d2edb525aa 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java @@ -120,6 +120,7 @@ public final class ConcurrencyThrottleInterceptorTests { this.ex = ex; } + @Override public void run() { if (this.ex != null) { try { diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java index 1fe27b3dfc5..14845cfd5ce 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java @@ -189,6 +189,7 @@ public final class CustomizableTraceInterceptorTests { this.log = log; } + @Override protected Log getLoggerForInvocation(MethodInvocation invocation) { return this.log; } diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java index cd7f8b8bda5..92908baac7c 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java @@ -96,6 +96,7 @@ public final class DebugInterceptorTests { this.log = log; } + @Override protected Log getLoggerForInvocation(MethodInvocation invocation) { return log; } diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java index c5f6cf8fe43..fc19053502b 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java @@ -38,6 +38,7 @@ public final class ExposeBeanNameAdvisorsTests { this.beanName = beanName; } + @Override public int getAge() { assertEquals(beanName, ExposeBeanNameAdvisors.getBeanName()); return super.getAge(); diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java index 72e2cf36933..f514800cfb5 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java @@ -53,12 +53,14 @@ public final class ExposeInvocationInterceptorTests { abstract class ExposedInvocationTestBean extends TestBean { + @Override public String getName() { MethodInvocation invocation = ExposeInvocationInterceptor.currentInvocation(); assertions(invocation); return super.getName(); } + @Override public void absquatulate() { MethodInvocation invocation = ExposeInvocationInterceptor.currentInvocation(); assertions(invocation); @@ -70,6 +72,7 @@ abstract class ExposedInvocationTestBean extends TestBean { class InvocationCheckExposedInvocationTestBean extends ExposedInvocationTestBean { + @Override protected void assertions(MethodInvocation invocation) { assertTrue(invocation.getThis() == this); assertTrue("Invocation should be on ITestBean: " + invocation.getMethod(), diff --git a/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java index 6b86cd7232a..6090b16b8dd 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java @@ -40,6 +40,7 @@ public final class AopUtilsTests { @Test public void testPointcutCanNeverApply() { class TestPointcut extends StaticMethodMatcherPointcut { + @Override public boolean matches(Method method, Class clazzy) { return false; } @@ -58,6 +59,7 @@ public final class AopUtilsTests { @Test public void testPointcutAppliesToOneMethodOnObject() { class TestPointcut extends StaticMethodMatcherPointcut { + @Override public boolean matches(Method method, Class clazz) { return method.getName().equals("hashCode"); } diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java index 41c3e2dd54a..b66105de6c7 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java @@ -35,24 +35,28 @@ import test.beans.TestBean; public final class ComposablePointcutTests { public static MethodMatcher GETTER_METHOD_MATCHER = new StaticMethodMatcher() { + @Override public boolean matches(Method m, Class targetClass) { return m.getName().startsWith("get"); } }; public static MethodMatcher GET_AGE_METHOD_MATCHER = new StaticMethodMatcher() { + @Override public boolean matches(Method m, Class targetClass) { return m.getName().equals("getAge"); } }; public static MethodMatcher ABSQUATULATE_METHOD_MATCHER = new StaticMethodMatcher() { + @Override public boolean matches(Method m, Class targetClass) { return m.getName().equals("absquatulate"); } }; public static MethodMatcher SETTER_METHOD_MATCHER = new StaticMethodMatcher() { + @Override public boolean matches(Method m, Class targetClass) { return m.getName().startsWith("set"); } diff --git a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java index f74bb4c61e9..65d58d61f89 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java @@ -112,8 +112,10 @@ public final class DelegatingIntroductionInterceptorTests { public void testAutomaticInterfaceRecognitionInDelegate() throws Exception { final long t = 1001L; class Tester implements TimeStamped, ITester { + @Override public void foo() throws Exception { } + @Override public long getTimeStamp() { return t; } @@ -141,8 +143,10 @@ public final class DelegatingIntroductionInterceptorTests { final long t = 1001L; @SuppressWarnings("serial") class TestII extends DelegatingIntroductionInterceptor implements TimeStamped, ITester { + @Override public void foo() throws Exception { } + @Override public long getTimeStamp() { return t; } @@ -206,6 +210,7 @@ public final class DelegatingIntroductionInterceptorTests { String company = "Interface21"; target.setCompany(company); TestBean delegate = new TestBean() { + @Override public ITestBean getSpouse() { return this; } @@ -250,6 +255,7 @@ public final class DelegatingIntroductionInterceptorTests { final long t = 1001L; @SuppressWarnings("serial") class TestII extends DelegatingIntroductionInterceptor implements TimeStamped { + @Override public long getTimeStamp() { return t; } @@ -278,6 +284,7 @@ public final class DelegatingIntroductionInterceptorTests { this.ts = ts; } + @Override public long getTimeStamp() { return ts; } @@ -292,6 +299,7 @@ public final class DelegatingIntroductionInterceptorTests { this.t = t; } + @Override public long getTimeStamp() { return t; } diff --git a/spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java index ca4f8839c8e..404fc55d81f 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java @@ -21,6 +21,7 @@ package org.springframework.aop.support; */ public final class JdkRegexpMethodPointcutTests extends AbstractRegexpMethodPointcutTests { + @Override protected AbstractRegexpMethodPointcut getRegexpMethodPointcut() { return new JdkRegexpMethodPointcut(); } diff --git a/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java b/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java index a55b083a3f3..614ba7a532e 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java @@ -107,6 +107,7 @@ public final class MethodMatchersTests { public StartsWithMatcher(String s) { this.prefix = s; } + @Override public boolean matches(Method m, Class targetClass) { return m.getName().startsWith(prefix); } @@ -114,12 +115,14 @@ public final class MethodMatchersTests { private static class TestDynamicMethodMatcherWhichMatches extends DynamicMethodMatcher { + @Override public boolean matches(Method m, Class targetClass, Object[] args) { return true; } } private static class TestDynamicMethodMatcherWhichDoesNotMatch extends DynamicMethodMatcher { + @Override public boolean matches(Method m, Class targetClass, Object[] args) { return false; } diff --git a/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java index e7967198669..72255612dfe 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java @@ -53,14 +53,17 @@ public final class PointcutsTests { * Matches only TestBean class, not subclasses */ public static Pointcut allTestBeanMethodsPointcut = new StaticMethodMatcherPointcut() { + @Override public ClassFilter getClassFilter() { return new ClassFilter() { + @Override public boolean matches(Class clazz) { return clazz.equals(TestBean.class); } }; } + @Override public boolean matches(Method m, Class targetClass) { return true; } @@ -73,10 +76,12 @@ public final class PointcutsTests { } public static Pointcut myTestBeanSetterPointcut = new StaticMethodMatcherPointcut() { + @Override public ClassFilter getClassFilter() { return new RootClassFilter(MyTestBean.class); } + @Override public boolean matches(Method m, Class targetClass) { return m.getName().startsWith("set"); } @@ -84,10 +89,12 @@ public final class PointcutsTests { // Will match MyTestBeanSubclass public static Pointcut myTestBeanGetterPointcut = new StaticMethodMatcherPointcut() { + @Override public ClassFilter getClassFilter() { return new RootClassFilter(MyTestBean.class); } + @Override public boolean matches(Method m, Class targetClass) { return m.getName().startsWith("get"); } @@ -98,10 +105,12 @@ public final class PointcutsTests { } public static Pointcut myTestBeanSubclassGetterPointcut = new StaticMethodMatcherPointcut() { + @Override public ClassFilter getClassFilter() { return new RootClassFilter(MyTestBeanSubclass.class); } + @Override public boolean matches(Method m, Class targetClass) { return m.getName().startsWith("get"); } diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java index d6dc8f426cd..55661a89012 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java @@ -32,9 +32,11 @@ public final class LazyCreationTargetSourceTests { @Test public void testCreateLazy() { TargetSource targetSource = new AbstractLazyCreationTargetSource() { + @Override protected Object createObject() { return new InitCountingBean(); } + @Override public Class getTargetClass() { return InitCountingBean.class; } diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java index d08d6f5357c..4283695ba6c 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java @@ -83,6 +83,7 @@ public final class LazyInitTargetSourceTests { @SuppressWarnings("serial") public static class CustomLazyInitTargetSource extends LazyInitTargetSource { + @Override protected void postProcessTargetObject(Object targetObject) { ((ITestBean) targetObject).setName("Rob Harrop"); } diff --git a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java index 3fe1c3ca709..39325e2dcbd 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java @@ -70,10 +70,12 @@ public final class PrototypeBasedTargetSourceTests { */ private TestBean thisFieldIsNotSerializable = new TestBean(); + @Override public Object getTarget() throws Exception { return newPrototypeInstance(); } + @Override public void releaseTarget(Object target) throws Exception { // Do nothing } diff --git a/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java index 2519e89f823..875ba6dc827 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java @@ -113,6 +113,7 @@ public class ThreadLocalTargetSourceTests { class Runner implements Runnable { public SideEffectBean mine; + @Override public void run() { this.mine = (SideEffectBean) beanFactory.getBean("apartment"); assertEquals(INITIAL_COUNT, mine.getCount() ); diff --git a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java index ee0913a1146..3f90fb8aefc 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java @@ -116,6 +116,7 @@ public final class RefreshableTargetSourceTests { this.requiresRefresh = requiresRefresh; } + @Override protected Object freshTarget() { this.callCount++; return new Object(); @@ -125,6 +126,7 @@ public final class RefreshableTargetSourceTests { return this.callCount; } + @Override protected boolean requiresRefresh() { return this.requiresRefresh; } diff --git a/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java b/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java index 7a7baa3ef25..d59b8ddd3be 100644 --- a/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java +++ b/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java @@ -28,6 +28,7 @@ import org.springframework.aop.MethodBeforeAdvice; @SuppressWarnings("serial") public class CountingBeforeAdvice extends MethodCounter implements MethodBeforeAdvice { + @Override public void before(Method m, Object[] args, Object target) throws Throwable { count(m); } diff --git a/spring-aop/src/test/java/test/aop/DefaultLockable.java b/spring-aop/src/test/java/test/aop/DefaultLockable.java index 82c59d8bc54..a7f6c4ac7ef 100644 --- a/spring-aop/src/test/java/test/aop/DefaultLockable.java +++ b/spring-aop/src/test/java/test/aop/DefaultLockable.java @@ -25,14 +25,17 @@ public class DefaultLockable implements Lockable { private boolean locked; + @Override public void lock() { this.locked = true; } + @Override public void unlock() { this.locked = false; } + @Override public boolean locked() { return this.locked; } diff --git a/spring-aop/src/test/java/test/aop/NopInterceptor.java b/spring-aop/src/test/java/test/aop/NopInterceptor.java index 1dc341d427b..fd4d9e9ff60 100644 --- a/spring-aop/src/test/java/test/aop/NopInterceptor.java +++ b/spring-aop/src/test/java/test/aop/NopInterceptor.java @@ -31,6 +31,7 @@ public class NopInterceptor implements MethodInterceptor { /** * @see org.aopalliance.intercept.MethodInterceptor#invoke(MethodInvocation) */ + @Override public Object invoke(MethodInvocation invocation) throws Throwable { increment(); return invocation.proceed(); diff --git a/spring-aop/src/test/java/test/aop/PerTargetAspect.java b/spring-aop/src/test/java/test/aop/PerTargetAspect.java index cee24201381..3896f2dc7ab 100644 --- a/spring-aop/src/test/java/test/aop/PerTargetAspect.java +++ b/spring-aop/src/test/java/test/aop/PerTargetAspect.java @@ -25,6 +25,7 @@ public class PerTargetAspect implements Ordered { ++count; } + @Override public int getOrder() { return this.order; } diff --git a/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java b/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java index 3b306743b27..5a21b1d7f09 100644 --- a/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java +++ b/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java @@ -37,10 +37,12 @@ public class SerializableNopInterceptor extends NopInterceptor implements Serial */ private int count; + @Override public int getCount() { return this.count; } + @Override protected void increment() { ++count; } diff --git a/spring-aop/src/test/java/test/beans/DerivedTestBean.java b/spring-aop/src/test/java/test/beans/DerivedTestBean.java index 8cb213cefe4..a26ee9b471b 100644 --- a/spring-aop/src/test/java/test/beans/DerivedTestBean.java +++ b/spring-aop/src/test/java/test/beans/DerivedTestBean.java @@ -51,12 +51,14 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void setBeanName(String beanName) { if (this.beanName == null || beanName == null) { this.beanName = beanName; } } + @Override public String getBeanName() { return beanName; } @@ -75,10 +77,12 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void destroy() { this.destroyed = true; } + @Override public boolean wasDestroyed() { return destroyed; } diff --git a/spring-aop/src/test/java/test/beans/NestedTestBean.java b/spring-aop/src/test/java/test/beans/NestedTestBean.java index a630f8662a7..6855305fb3d 100644 --- a/spring-aop/src/test/java/test/beans/NestedTestBean.java +++ b/spring-aop/src/test/java/test/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-aop/src/test/java/test/beans/SerializablePerson.java b/spring-aop/src/test/java/test/beans/SerializablePerson.java index adb2966907e..60fa67417de 100644 --- a/spring-aop/src/test/java/test/beans/SerializablePerson.java +++ b/spring-aop/src/test/java/test/beans/SerializablePerson.java @@ -31,22 +31,27 @@ public class SerializablePerson implements Person, Serializable { private String name; private int age; + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override public Object echo(Object o) throws Throwable { if (o instanceof Throwable) { throw (Throwable) o; diff --git a/spring-aop/src/test/java/test/beans/TestBean.java b/spring-aop/src/test/java/test/beans/TestBean.java index 8f14fd61a2c..5c5e4abb232 100644 --- a/spring-aop/src/test/java/test/beans/TestBean.java +++ b/spring-aop/src/test/java/test/beans/TestBean.java @@ -146,10 +146,12 @@ public class TestBean implements ITestBean, IOther, Comparable { return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -165,10 +167,12 @@ public class TestBean implements ITestBean, IOther, Comparable { } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -181,14 +185,17 @@ public class TestBean implements ITestBean, IOther, Comparable { this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -215,10 +222,12 @@ public class TestBean implements ITestBean, IOther, Comparable { this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -287,6 +296,7 @@ public class TestBean implements ITestBean, IOther, Comparable { this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -295,6 +305,7 @@ public class TestBean implements ITestBean, IOther, Comparable { this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -347,18 +358,21 @@ public class TestBean implements ITestBean, IOther, Comparable { /** * @see ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -366,9 +380,11 @@ public class TestBean implements ITestBean, IOther, Comparable { /** * @see IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -398,6 +414,7 @@ public class TestBean implements ITestBean, IOther, Comparable { return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java b/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java index 4d9355f616f..be5819bb3cc 100644 --- a/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java +++ b/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java @@ -46,6 +46,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { private final List imports = new LinkedList(); + @Override public void defaultsRegistered(DefaultsDefinition defaultsDefinition) { this.defaults.add(defaultsDefinition); } @@ -54,6 +55,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return Collections.unmodifiableList(this.defaults); } + @Override public void componentRegistered(ComponentDefinition componentDefinition) { this.componentDefinitions.put(componentDefinition.getName(), componentDefinition); } @@ -67,6 +69,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return collection.toArray(new ComponentDefinition[collection.size()]); } + @Override @SuppressWarnings("unchecked") public void aliasRegistered(AliasDefinition aliasDefinition) { List aliases = (List) this.aliasMap.get(aliasDefinition.getBeanName()); @@ -82,6 +85,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return aliases == null ? null : Collections.unmodifiableList(aliases); } + @Override public void importProcessed(ImportDefinition importDefinition) { this.imports.add(importDefinition); } diff --git a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParser.java b/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParser.java index 3483077e854..94dd439bfb0 100644 --- a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParser.java +++ b/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParser.java @@ -13,6 +13,7 @@ import org.w3c.dom.Element; public class ComponentBeanDefinitionParser extends AbstractBeanDefinitionParser { + @Override protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) { return parseComponentElement(element); diff --git a/spring-beans/src/test/java/com/foo/ComponentFactoryBean.java b/spring-beans/src/test/java/com/foo/ComponentFactoryBean.java index e62eab786e1..ac47c4efea9 100644 --- a/spring-beans/src/test/java/com/foo/ComponentFactoryBean.java +++ b/spring-beans/src/test/java/com/foo/ComponentFactoryBean.java @@ -16,6 +16,7 @@ public class ComponentFactoryBean implements FactoryBean { this.children = children; } + @Override public Component getObject() throws Exception { if (this.children != null && this.children.size() > 0) { for (Component child : children) { @@ -25,10 +26,12 @@ public class ComponentFactoryBean implements FactoryBean { return this.parent; } + @Override public Class getObjectType() { return Component.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-beans/src/test/java/com/foo/ComponentNamespaceHandler.java b/spring-beans/src/test/java/com/foo/ComponentNamespaceHandler.java index 3ccc7f167b5..b29eeca0614 100644 --- a/spring-beans/src/test/java/com/foo/ComponentNamespaceHandler.java +++ b/spring-beans/src/test/java/com/foo/ComponentNamespaceHandler.java @@ -3,6 +3,7 @@ package com.foo; import org.springframework.beans.factory.xml.NamespaceHandlerSupport; public class ComponentNamespaceHandler extends NamespaceHandlerSupport { + @Override public void init() { registerBeanDefinitionParser("component", new ComponentBeanDefinitionParser()); diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java index fb6831eb8c2..f62d8003566 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java @@ -360,18 +360,22 @@ public final class BeanUtilsTests { private String value; + @Override public String getKey() { return key; } + @Override public void setKey(String aKey) { key = aKey; } + @Override public String getValue() { return value; } + @Override public void setValue(String aValue) { value = aValue; } diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java index c1f3b5e3acc..5825d6a08b5 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java @@ -507,6 +507,7 @@ public class BeanWrapperGenericsTests { private Map>> mapOfListOfListOfInteger; + @Override public Map getMapOfInteger() { return mapOfInteger; } @@ -515,10 +516,12 @@ public class BeanWrapperGenericsTests { this.mapOfInteger = mapOfInteger; } + @Override public Map> getMapOfListOfInteger() { return mapOfListOfInteger; } + @Override public void setMapOfListOfInteger(Map> mapOfListOfInteger) { this.mapOfListOfInteger = mapOfListOfInteger; } @@ -591,6 +594,7 @@ public class BeanWrapperGenericsTests { private double version; + @Override public Double getVersion() { return this.version; } @@ -613,10 +617,12 @@ public class BeanWrapperGenericsTests { private Long id; + @Override public Long getId() { return id; } + @Override public void setId(Long aId) { this.id = aId; } diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java index d420e860c54..930c530961e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java @@ -329,6 +329,7 @@ public final class BeanWrapperTests { TestBean tb = new TestBean(); BeanWrapper bw = new BeanWrapperImpl(tb); bw.registerCustomEditor(String.class, new PropertyEditorSupport() { + @Override public void setValue(Object value) { super.setValue(value.toString()); } @@ -500,6 +501,7 @@ public final class BeanWrapperTests { PropsTester pt = new PropsTester(); BeanWrapper bw = new BeanWrapperImpl(pt); bw.registerCustomEditor(String.class, "stringArray", new PropertyEditorSupport() { + @Override public void setAsText(String text) { setValue(text.substring(1)); } @@ -559,6 +561,7 @@ public final class BeanWrapperTests { TestBean tb = new TestBean(); BeanWrapper bw = new BeanWrapperImpl(tb); bw.registerCustomEditor(String.class, "name", new PropertyEditorSupport() { + @Override public void setValue(Object value) { if (value instanceof String[]) { setValue(StringUtils.arrayToDelimitedString(((String[]) value), "-")); @@ -636,6 +639,7 @@ public final class BeanWrapperTests { PropsTester pt = new PropsTester(); BeanWrapper bw = new BeanWrapperImpl(pt); bw.registerCustomEditor(int.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) { setValue(new Integer(Integer.parseInt(text) + 1)); } @@ -1022,6 +1026,7 @@ public final class BeanWrapperTests { IndexedTestBean bean = new IndexedTestBean(); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(TestBean.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { if (!StringUtils.hasLength(text)) { throw new IllegalArgumentException(); @@ -1055,6 +1060,7 @@ public final class BeanWrapperTests { IndexedTestBean bean = new IndexedTestBean(); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(TestBean.class, "map", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { if (!StringUtils.hasLength(text)) { throw new IllegalArgumentException(); @@ -1078,6 +1084,7 @@ public final class BeanWrapperTests { IndexedTestBean bean = new IndexedTestBean(); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(TestBean.class, "map", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { if (!StringUtils.hasLength(text)) { throw new IllegalArgumentException(); @@ -1191,6 +1198,7 @@ public final class BeanWrapperTests { PrimitiveArrayBean tb = new PrimitiveArrayBean(); BeanWrapper bw = new BeanWrapperImpl(tb); bw.registerCustomEditor(int.class, "array", new PropertyEditorSupport() { + @Override public void setValue(Object value) { if (value instanceof Integer) { super.setValue(new Integer(((Integer) value).intValue() + 1)); @@ -1209,6 +1217,7 @@ public final class BeanWrapperTests { PrimitiveArrayBean tb = new PrimitiveArrayBean(); BeanWrapper bw = new BeanWrapperImpl(tb); bw.registerCustomEditor(int.class, "array[1]", new PropertyEditorSupport() { + @Override public void setValue(Object value) { if (value instanceof Integer) { super.setValue(new Integer(((Integer) value).intValue() + 1)); @@ -1821,6 +1830,7 @@ public final class BeanWrapperTests { this.frozen = true; } + @Override public V put(K key, V value) { if (this.frozen) { throw new UnsupportedOperationException(); @@ -1830,16 +1840,19 @@ public final class BeanWrapperTests { } } + @Override public Set> entrySet() { this.accessed = true; return super.entrySet(); } + @Override public Set keySet() { this.accessed = true; return super.keySet(); } + @Override public int size() { this.accessed = true; return super.size(); diff --git a/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java index 2a0cf025b09..8eaac3b46bc 100644 --- a/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java @@ -115,6 +115,7 @@ public final class ConcurrentBeanWrapperTests { this.test = test; } + @Override public void run() { try { for (int i = 0; i < 100; i++) { diff --git a/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java b/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java index 5e05fc91db3..fd53b58af71 100644 --- a/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java @@ -214,6 +214,7 @@ public class ExtendedBeanInfoTests { @Test public void cornerSpr9453() throws IntrospectionException { final class Bean implements Spr9453> { + @Override public Class getProp() { return null; } @@ -589,7 +590,9 @@ public class ExtendedBeanInfoTests { public Number setFoo(String foo) { return null; } } class C extends B { + @Override public String getFoo() { return null; } + @Override public Integer setFoo(String foo) { return null; } } @@ -861,6 +864,7 @@ public class ExtendedBeanInfoTests { } interface TextBookOperations extends BookOperations { + @Override TextBook getBook(); } @@ -870,6 +874,7 @@ public class ExtendedBeanInfoTests { } class LawLibrary extends Library implements TextBookOperations { + @Override public LawBook getBook() { return null; } } diff --git a/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java index dd52eea7b82..5696a0ad8c5 100644 --- a/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java @@ -182,10 +182,12 @@ class RequiredTestBean implements BeanNameAware, BeanFactoryAware { this.jobTitle = jobTitle; } + @Override @Required public void setBeanName(String name) { } + @Override @Required public void setBeanFactory(BeanFactory beanFactory) { } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java index 3ba946c9626..f3b990fdbab 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java @@ -72,6 +72,7 @@ public final class ConcurrentBeanFactoryTests { public void setUp() throws Exception { XmlBeanFactory factory = new XmlBeanFactory(CONTEXT); factory.addPropertyEditorRegistrar(new PropertyEditorRegistrar() { + @Override public void registerCustomEditors(PropertyEditorRegistry registry) { registry.registerCustomEditor(Date.class, new CustomDateEditor((DateFormat) DATE_FORMAT.clone(), false)); } @@ -125,6 +126,7 @@ public final class ConcurrentBeanFactoryTests { private class TestRun extends Thread { + @Override public void run() { try { for (int i = 0; i < 10000; i++) { diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java index d52f73e510b..bc9f1ffba10 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java @@ -836,6 +836,7 @@ public class DefaultListableBeanFactoryTests { public void testCustomEditor() { DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); lbf.addPropertyEditorRegistrar(new PropertyEditorRegistrar() { + @Override public void registerCustomEditors(PropertyEditorRegistry registry) { NumberFormat nf = NumberFormat.getInstance(Locale.GERMAN); registry.registerCustomEditor(Float.class, new CustomNumberEditor(Float.class, nf, true)); @@ -853,6 +854,7 @@ public class DefaultListableBeanFactoryTests { DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); GenericConversionService conversionService = new DefaultConversionService(); conversionService.addConverter(new Converter() { + @Override public Float convert(String source) { try { NumberFormat nf = NumberFormat.getInstance(Locale.GERMAN); @@ -875,6 +877,7 @@ public class DefaultListableBeanFactoryTests { public void testCustomEditorWithBeanReference() { DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); lbf.addPropertyEditorRegistrar(new PropertyEditorRegistrar() { + @Override public void registerCustomEditors(PropertyEditorRegistry registry) { NumberFormat nf = NumberFormat.getInstance(Locale.GERMAN); registry.registerCustomEditor(Float.class, new CustomNumberEditor(Float.class, nf, true)); @@ -1907,9 +1910,11 @@ public class DefaultListableBeanFactoryTests { RootBeanDefinition bd = new RootBeanDefinition(BeanWithDisposableBean.class); lbf.registerBeanDefinition("test", bd); lbf.addBeanPostProcessor(new BeanPostProcessor() { + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) { return new TestBean(); } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) { return bean; } @@ -1926,9 +1931,11 @@ public class DefaultListableBeanFactoryTests { RootBeanDefinition bd = new RootBeanDefinition(BeanWithCloseable.class); lbf.registerBeanDefinition("test", bd); lbf.addBeanPostProcessor(new BeanPostProcessor() { + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) { return new TestBean(); } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) { return bean; } @@ -1946,9 +1953,11 @@ public class DefaultListableBeanFactoryTests { bd.setDestroyMethodName("close"); lbf.registerBeanDefinition("test", bd); lbf.addBeanPostProcessor(new BeanPostProcessor() { + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) { return new TestBean(); } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) { return bean; } @@ -2117,6 +2126,7 @@ public class DefaultListableBeanFactoryTests { lbf.registerBeanDefinition("test", bd); final String nameSetOnField = "nameSetOnField"; lbf.addBeanPostProcessor(new InstantiationAwareBeanPostProcessorAdapter() { + @Override public boolean postProcessAfterInstantiation(Object bean, String beanName) throws BeansException { TestBean tb = (TestBean) bean; try { @@ -2156,6 +2166,7 @@ public class DefaultListableBeanFactoryTests { TestSecuredBean bean = (TestSecuredBean) Subject.doAsPrivileged(subject, new PrivilegedAction() { + @Override public Object run() { return lbf.getBean("test"); } @@ -2244,14 +2255,17 @@ public class DefaultListableBeanFactoryTests { public ConstructorDependencyFactoryBean(String dependency) { } + @Override public Object getObject() { return "test"; } + @Override public Class getObjectType() { return String.class; } + @Override public boolean isSingleton() { return true; } @@ -2262,6 +2276,7 @@ public class DefaultListableBeanFactoryTests { private static boolean closed; + @Override public void destroy() { closed = true; } @@ -2272,6 +2287,7 @@ public class DefaultListableBeanFactoryTests { private static boolean closed; + @Override public void close() { closed = true; } @@ -2316,14 +2332,17 @@ public class DefaultListableBeanFactoryTests { public static class FactoryBeanThatShouldntBeCalled implements FactoryBean { + @Override public Object getObject() { throw new IllegalStateException(); } + @Override public Class getObjectType() { return null; } + @Override public boolean isSingleton() { return false; } @@ -2334,15 +2353,18 @@ public class DefaultListableBeanFactoryTests { public boolean initialized = false; + @Override public Object getObject() throws Exception { this.initialized = true; return ""; } + @Override public Class getObjectType() { return String.class; } + @Override public boolean isSingleton() { return true; } @@ -2353,23 +2375,28 @@ public class DefaultListableBeanFactoryTests { public boolean initialized = false; + @Override public Object getObject() throws Exception { this.initialized = true; return ""; } + @Override public Class getObjectType() { return String.class; } + @Override public boolean isSingleton() { return true; } + @Override public boolean isPrototype() { return false; } + @Override public boolean isEagerInit() { return true; } @@ -2452,6 +2479,7 @@ public class DefaultListableBeanFactoryTests { this.numberFormat = numberFormat; } + @Override @SuppressWarnings("unchecked") public Object convertIfNecessary(Object value, Class requiredType) { if (value instanceof String && Float.class.isAssignableFrom(requiredType)) { @@ -2470,11 +2498,13 @@ public class DefaultListableBeanFactoryTests { } } + @Override @SuppressWarnings("unchecked") public Object convertIfNecessary(Object value, Class requiredType, MethodParameter methodParam) { return convertIfNecessary(value, requiredType); } + @Override @SuppressWarnings("unchecked") public Object convertIfNecessary(Object value, Class requiredType, Field field) { return convertIfNecessary(value, requiredType); @@ -2490,6 +2520,7 @@ public class DefaultListableBeanFactoryTests { this.name = name; } + @Override public String getName() { return this.name; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java index c1e5f9acfed..5bb7f93ae06 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java @@ -77,14 +77,17 @@ public final class FactoryBeanTests { public static class NullReturningFactoryBean implements FactoryBean { + @Override public Object getObject() { return null; } + @Override public Class getObjectType() { return null; } + @Override public boolean isSingleton() { return true; } @@ -103,6 +106,7 @@ public final class FactoryBeanTests { return beta; } + @Override public void afterPropertiesSet() { Assert.notNull(beta, "'beta' property is required"); } @@ -131,6 +135,7 @@ public final class FactoryBeanTests { return name; } + @Override public void afterPropertiesSet() { Assert.notNull(gamma, "'gamma' property is required"); } @@ -149,14 +154,17 @@ public final class FactoryBeanTests { this.beta = beta; } + @Override public Object getObject() { return this.beta; } + @Override public Class getObjectType() { return null; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java index 15dd2bcf93a..e417ccdba09 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java @@ -43,6 +43,7 @@ public final class SharedBeanRegistryTests { assertSame(tb, beanRegistry.getSingleton("tb")); TestBean tb2 = (TestBean) beanRegistry.getSingleton("tb2", new ObjectFactory() { + @Override public Object getObject() throws BeansException { return new TestBean(); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java index a24c78d9893..9df0cbc3090 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java @@ -989,6 +989,7 @@ public final class AutowiredAnnotationBeanPostProcessorTests { public ExtendedResourceInjectionBean() { } + @Override @Autowired @Required public void setTestBean2(TestBean testBean2) { super.setTestBean2(testBean2); @@ -1068,6 +1069,7 @@ public final class AutowiredAnnotationBeanPostProcessorTests { private ITestBean testBean4; + @Override @Autowired(required = false) public void setTestBean2(TestBean testBean2) { super.setTestBean2(testBean2); @@ -1114,6 +1116,7 @@ public final class AutowiredAnnotationBeanPostProcessorTests { private ITestBean testBean4; + @Override @Autowired(required = false) public void setTestBean2(TestBean testBean2) { super.setTestBean2(testBean2); @@ -1185,6 +1188,7 @@ public final class AutowiredAnnotationBeanPostProcessorTests { throw new UnsupportedOperationException(); } + @Override @Autowired public void setTestBean2(TestBean testBean2) { super.setTestBean2(testBean2); @@ -1447,14 +1451,17 @@ public final class AutowiredAnnotationBeanPostProcessorTests { public static class StringFactoryBean implements FactoryBean { + @Override public String getObject() throws Exception { return ""; } + @Override public Class getObjectType() { return String.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java index 4f96efc8d3c..6afaa8b219a 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java @@ -69,6 +69,7 @@ public final class CustomAutowireConfigurerTests { public static class CustomResolver implements AutowireCandidateResolver { + @Override public boolean isAutowireCandidate(BeanDefinitionHolder bdHolder, DependencyDescriptor descriptor) { if (!bdHolder.getBeanDefinition().isAutowireCandidate()) { return false; @@ -82,6 +83,7 @@ public final class CustomAutowireConfigurerTests { return false; } + @Override public Object getSuggestedValue(DependencyDescriptor descriptor) { return null; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java index fdaa110f360..9760821441d 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java @@ -609,6 +609,7 @@ public class InjectAnnotationBeanPostProcessorTests { public ExtendedResourceInjectionBean() { } + @Override @Inject @Required public void setTestBean2(TestBean testBean2) { super.setTestBean2(testBean2); @@ -662,6 +663,7 @@ public class InjectAnnotationBeanPostProcessorTests { private ITestBean testBean4; + @Override @Inject public void setTestBean2(TestBean testBean2) { super.setTestBean2(testBean2); @@ -708,6 +710,7 @@ public class InjectAnnotationBeanPostProcessorTests { private ITestBean testBean4; + @Override @Inject public void setTestBean2(TestBean testBean2) { super.setTestBean2(testBean2); @@ -779,6 +782,7 @@ public class InjectAnnotationBeanPostProcessorTests { throw new UnsupportedOperationException(); } + @Override @Inject public void setTestBean2(TestBean testBean2) { super.setTestBean2(testBean2); @@ -1074,14 +1078,17 @@ public class InjectAnnotationBeanPostProcessorTests { public static class StringFactoryBean implements FactoryBean { + @Override public String getObject() throws Exception { return ""; } + @Override public Class getObjectType() { return String.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java index 265fea19a60..72073bc1905 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java @@ -53,6 +53,7 @@ public final class CustomEditorConfigurerTests { final DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, Locale.GERMAN); cec.setPropertyEditorRegistrars(new PropertyEditorRegistrar[] { new PropertyEditorRegistrar() { + @Override public void registerCustomEditors(PropertyEditorRegistry registry) { registry.registerCustomEditor(Date.class, new CustomDateEditor(df, true)); } @@ -189,6 +190,7 @@ public final class CustomEditorConfigurerTests { public static class MyTestEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) { setValue(new String[] {"test"}); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java index 1f080734bc3..931dd10e8e4 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java @@ -812,6 +812,7 @@ public final class PropertyResourceConfigurerTests { private static class ConvertingOverrideConfigurer extends PropertyOverrideConfigurer { + @Override protected String convertPropertyValue(String originalValue) { return "X" + originalValue; } @@ -826,10 +827,12 @@ public final class PropertyResourceConfigurerTests { private Preferences userRoot = new MockPreferences(); + @Override public Preferences systemRoot() { return systemRoot; } + @Override public Preferences userRoot() { return userRoot; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java index 14b272ee0f0..601e564b63f 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java @@ -53,6 +53,7 @@ public final class SimpleScopeTests { objects.add(new TestBean()); objects.add(new TestBean()); } + @Override public Object get(String name, ObjectFactory objectFactory) { if (index >= objects.size()) { index = 0; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java index 5460f8bd016..e834490226a 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java @@ -30,21 +30,26 @@ final class TestTypes {} */ class NoOpScope implements Scope { + @Override public Object get(String name, ObjectFactory objectFactory) { throw new UnsupportedOperationException(); } + @Override public Object remove(String name) { throw new UnsupportedOperationException(); } + @Override public void registerDestructionCallback(String name, Runnable callback) { } + @Override public Object resolveContextualObject(String key) { return null; } + @Override public String getConversationId() { return null; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java index d5e4441f20e..10422ae527e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java @@ -71,10 +71,12 @@ public final class CustomProblemReporterTests { private List warnings = new ArrayList(); + @Override public void fatal(Problem problem) { throw new BeanDefinitionParsingException(problem); } + @Override public void error(Problem problem) { System.out.println(problem); this.errors.add(problem); @@ -84,6 +86,7 @@ public final class CustomProblemReporterTests { return this.errors.toArray(new Problem[this.errors.size()]); } + @Override public void warning(Problem problem) { System.out.println(problem); this.warnings.add(problem); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java index f01cc9b303f..9a4612382ee 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java @@ -391,6 +391,7 @@ public class BeanFactoryGenericsTests { public void testGenericMapWithCollectionValueConstructor() throws MalformedURLException { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); bf.addPropertyEditorRegistrar(new PropertyEditorRegistrar() { + @Override public void registerCustomEditors(PropertyEditorRegistry registry) { registry.registerCustomEditor(Number.class, new CustomNumberEditor(Integer.class, false)); } @@ -547,6 +548,7 @@ public class BeanFactoryGenericsTests { public void testGenericMapWithCollectionValueFactoryMethod() throws MalformedURLException { DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); bf.addPropertyEditorRegistrar(new PropertyEditorRegistrar() { + @Override public void registerCustomEditors(PropertyEditorRegistry registry) { registry.registerCustomEditor(Number.class, new CustomNumberEditor(Integer.class, false)); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java index 3442e720d4c..caacb5604fd 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java @@ -30,6 +30,7 @@ public class PropertiesBeanDefinitionReaderTests extends TestCase { private PropertiesBeanDefinitionReader reader; + @Override protected void setUp() throws Exception { this.beanFactory = new DefaultListableBeanFactory(); this.reader = new PropertiesBeanDefinitionReader(beanFactory); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java index 0cd040b4695..5c1368c4610 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/Spr8954Tests.java @@ -61,14 +61,17 @@ public class Spr8954Tests { static class FooFactoryBean implements FactoryBean, AnInterface { + @Override public Foo getObject() throws Exception { return new Foo(); } + @Override public Class getObjectType() { return Foo.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java index cac02472cab..d4c80b410de 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java @@ -129,23 +129,28 @@ public class CallbacksSecurityTests { checkCurrentContext(); } + @Override public void afterPropertiesSet() { checkCurrentContext(); } + @Override public void destroy() { checkCurrentContext(); destroyed = true; } + @Override public void setBeanName(String name) { checkCurrentContext(); } + @Override public void setBeanClassLoader(ClassLoader classLoader) { checkCurrentContext(); } + @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { checkCurrentContext(); @@ -164,26 +169,31 @@ public class CallbacksSecurityTests { checkCurrentContext(); } + @Override public boolean isEagerInit() { checkCurrentContext(); return false; } + @Override public boolean isPrototype() { checkCurrentContext(); return true; } + @Override public Object getObject() throws Exception { checkCurrentContext(); return new Object(); } + @Override public Class getObjectType() { checkCurrentContext(); return Object.class; } + @Override public boolean isSingleton() { checkCurrentContext(); return false; @@ -219,6 +229,7 @@ public class CallbacksSecurityTests { return AccessController.doPrivileged(new PrivilegedAction() { + @Override public String run() { Subject subject = Subject.getSubject(acc); if (subject == null) { @@ -246,6 +257,7 @@ public class CallbacksSecurityTests { this.name = name; } + @Override public String getName() { return this.name; } @@ -291,6 +303,7 @@ public class CallbacksSecurityTests { private final AccessControlContext acc = new AccessControlContext( new ProtectionDomain[] { empty }); + @Override public AccessControlContext getAccessControlContext() { return acc; } @@ -320,6 +333,7 @@ public class CallbacksSecurityTests { try { AccessController.doPrivileged(new PrivilegedExceptionAction() { + @Override public Object run() throws Exception { method.invoke(bean); return null; @@ -334,6 +348,7 @@ public class CallbacksSecurityTests { AccessController.doPrivileged( new PrivilegedExceptionAction() { + @Override public Object run() throws Exception { return cl.newInstance(); } @@ -444,6 +459,7 @@ public class CallbacksSecurityTests { AccessController.doPrivileged(new PrivilegedExceptionAction() { + @Override public Object run() throws Exception { beanFactory.getBean("working-factory-method"); beanFactory.getBean("container-execution"); @@ -478,6 +494,7 @@ public class CallbacksSecurityTests { NonPrivilegedBean bean = Subject.doAsPrivileged( subject, new PrivilegedAction() { + @Override public NonPrivilegedBean run() { return lbf.getBean("test", NonPrivilegedBean.class); } @@ -502,6 +519,7 @@ public class CallbacksSecurityTests { // request the beans from non-privileged code Subject.doAsPrivileged(subject, new PrivilegedAction() { + @Override public Object run() { // sanity check assertEquals("user1", getCurrentSubjectName()); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java index 12f80e38b72..4296a2f3030 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java @@ -24,15 +24,18 @@ import org.springframework.beans.factory.FactoryBean; */ public class CustomFactoryBean implements FactoryBean { + @Override public Object getObject() throws Exception { return System.getProperties(); } + @Override public Class getObjectType() { System.setProperty("factory.object.type", "true"); return Properties.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java index b429cd8e4b7..175ce84f160 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.DisposableBean; */ public class DestroyBean implements DisposableBean { + @Override public void destroy() throws Exception { System.setProperty("security.destroy", "true"); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java index 62f379ee8b5..1009e9e76b9 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.InitializingBean; */ public class InitBean implements InitializingBean { + @Override public void afterPropertiesSet() throws Exception { System.getProperties(); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java index eba0541e09d..35fa49013b1 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java @@ -326,6 +326,7 @@ public abstract class AbstractBeanFactoryTests extends TestCase { public static class TestBeanEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) { TestBean tb = new TestBean(); StringTokenizer st = new StringTokenizer(text, "_"); @@ -350,6 +351,7 @@ class MustBeInitialized implements InitializingBean { /** * @see InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { this.inited = true; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java index 32e6134823d..ce0ba6e7f03 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java @@ -30,6 +30,7 @@ public class BeanNameGenerationTests extends TestCase { private DefaultListableBeanFactory beanFactory; + @Override public void setUp() { this.beanFactory = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(this.beanFactory); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java index 2be0637cf69..3b552f0762e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java @@ -45,6 +45,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { private final List imports = new LinkedList(); + @Override public void defaultsRegistered(DefaultsDefinition defaultsDefinition) { this.defaults.add(defaultsDefinition); } @@ -53,6 +54,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return Collections.unmodifiableList(this.defaults); } + @Override public void componentRegistered(ComponentDefinition componentDefinition) { this.componentDefinitions.put(componentDefinition.getName(), componentDefinition); } @@ -66,6 +68,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return (ComponentDefinition[]) collection.toArray(new ComponentDefinition[collection.size()]); } + @Override public void aliasRegistered(AliasDefinition aliasDefinition) { List aliases = (List) this.aliasMap.get(aliasDefinition.getBeanName()); if(aliases == null) { @@ -80,6 +83,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return aliases == null ? null : Collections.unmodifiableList(aliases); } + @Override public void importProcessed(ImportDefinition importDefinition) { this.imports.add(importDefinition); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java index 55f7f920f5c..0c0974fd722 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java @@ -40,6 +40,7 @@ public class CollectionMergingTests extends TestCase { private DefaultListableBeanFactory beanFactory; + @Override protected void setUp() throws Exception { this.beanFactory = new DefaultListableBeanFactory(); BeanDefinitionReader reader = new XmlBeanDefinitionReader(this.beanFactory); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java index 27ea4461be4..0b0a476bcab 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java @@ -51,14 +51,17 @@ public class CountingFactory implements FactoryBean { } + @Override public Object getObject() { return "myString"; } + @Override public Class getObjectType() { return String.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java index 8662e52c782..357dc5d6cee 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java @@ -27,6 +27,7 @@ public class DefaultLifecycleMethodsTests extends TestCase { private XmlBeanFactory beanFactory; + @Override protected void setUp() throws Exception { this.beanFactory = new XmlBeanFactory(new ClassPathResource("defaultLifecycleMethods.xml", getClass())); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java index ec52dfaa8c7..00933e788a9 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java @@ -45,6 +45,7 @@ public final class DelegatingEntityResolverTests { private static final class NoOpEntityResolver implements EntityResolver { + @Override public InputSource resolveEntity(String publicId, String systemId) { return null; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java index 7387cdf6003..7cb8a586274 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java @@ -62,6 +62,7 @@ public class DependenciesBean implements BeanFactoryAware { return spouse; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java index a9e9925d512..765c4384497 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java @@ -42,6 +42,7 @@ public class EventPublicationTests extends TestCase { private final CollectingReaderEventListener eventListener = new CollectingReaderEventListener(); + @Override protected void setUp() throws Exception { XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(this.beanFactory); reader.setEventListener(this.eventListener); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java index 52eb2b2938c..01afc690242 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java @@ -27,6 +27,7 @@ public class GeneratedNameBean implements BeanNameAware { private GeneratedNameBean child; + @Override public void setBeanName(String beanName) { this.beanName = beanName; } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java index b943361f1a2..b8757c3e3f3 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java @@ -29,6 +29,7 @@ public class MetadataAttachmentTests extends TestCase { private XmlBeanFactory beanFactory; + @Override protected void setUp() throws Exception { this.beanFactory = new XmlBeanFactory(new ClassPathResource("withMeta.xml", getClass())); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java index bc4e58426fc..1cd7a541244 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java @@ -171,6 +171,7 @@ public class ProfileXmlBeanDefinitionTests { private static Matcher containsBeanDefinition(final String beanName) { return new TypeSafeMatcher() { + @Override public void describeTo(Description desc) { desc.appendText("a BeanDefinitionRegistry containing bean named ") .appendValue(beanName); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java index ed8167b1126..75af81b55cc 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java @@ -57,6 +57,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial return initMethodDeclared; } + @Override public void setBeanName(String name) { this.beanName = name; } @@ -65,6 +66,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.owningFactory = beanFactory; } @@ -79,6 +81,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial this.postProcessedBeforeInit = true; } + @Override public void afterPropertiesSet() { if (this.owningFactory == null) { throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean"); @@ -130,6 +133,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial } } + @Override public void destroy() { if (this.destroyed) { throw new IllegalStateException("Already destroyed"); @@ -144,6 +148,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial public static class PostProcessor implements BeanPostProcessor { + @Override public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException { if (bean instanceof ProtectedLifecycleBean) { ((ProtectedLifecycleBean) bean).postProcessBeforeInit(); @@ -151,6 +156,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String name) throws BeansException { if (bean instanceof ProtectedLifecycleBean) { ((ProtectedLifecycleBean) bean).postProcessAfterInit(); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java index 3345bf52fb3..cf83b0be7c2 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java @@ -46,6 +46,7 @@ public class UtilNamespaceHandlerTests extends TestCase { private CollectingReaderEventListener listener = new CollectingReaderEventListener(); + @Override public void setUp() { this.beanFactory = new DefaultListableBeanFactory(); XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(this.beanFactory); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java index 22d4fcb30c2..9cc47454696 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java @@ -46,6 +46,7 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest private XmlBeanFactory factory; + @Override protected void setUp() { parent = new DefaultListableBeanFactory(); Map m = new HashMap(); @@ -59,6 +60,7 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest this.factory = new XmlBeanFactory(new ClassPathResource("test.xml", getClass()), parent); this.factory.addBeanPostProcessor(new BeanPostProcessor() { + @Override public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException { if (bean instanceof TestBean) { ((TestBean) bean).setPostProcessed(true); @@ -68,6 +70,7 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest } return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String name) throws BeansException { return bean; } @@ -77,10 +80,12 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest //this.factory.preInstantiateSingletons(); } + @Override protected BeanFactory getBeanFactory() { return factory; } + @Override public void testCount() { assertCount(24); } diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java index 9be6a107f39..7f4cf0d9fa0 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java @@ -70,6 +70,7 @@ public class BeanInfoTests extends TestCase { public static class ValueBeanBeanInfo extends SimpleBeanInfo { + @Override public PropertyDescriptor[] getPropertyDescriptors() { try { PropertyDescriptor pd = new PropertyDescriptor("value", ValueBean.class); @@ -96,6 +97,7 @@ public class BeanInfoTests extends TestCase { this.target = target; } + @Override public void setAsText(String text) throws IllegalArgumentException { if (JdkVersion.getMajorJavaVersion() >= JdkVersion.JAVA_15) { Assert.isTrue(this.target instanceof ValueBean, "Target must be available on JDK 1.5+"); diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java index c5a230a2c86..c8cf8d7649e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java @@ -113,6 +113,7 @@ public class CustomEditorTests { TestBean tb = new TestBean(); BeanWrapper bw = new BeanWrapperImpl(tb); bw.registerCustomEditor(String.class, "name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("prefix" + text); } @@ -130,6 +131,7 @@ public class CustomEditorTests { TestBean tb = new TestBean(); BeanWrapper bw = new BeanWrapperImpl(tb); bw.registerCustomEditor(String.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("prefix" + text); } @@ -148,6 +150,7 @@ public class CustomEditorTests { tb.setSpouse(new TestBean()); BeanWrapper bw = new BeanWrapperImpl(tb); bw.registerCustomEditor(String.class, "spouse.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("prefix" + text); } @@ -166,6 +169,7 @@ public class CustomEditorTests { tb.setSpouse(new TestBean()); BeanWrapper bw = new BeanWrapperImpl(tb); bw.registerCustomEditor(String.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("prefix" + text); } @@ -853,6 +857,7 @@ public class CustomEditorTests { IndexedTestBean bean = new IndexedTestBean(); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(String.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("prefix" + text); } @@ -905,16 +910,19 @@ public class CustomEditorTests { IndexedTestBean bean = new IndexedTestBean(false); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(String.class, "array.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("array" + text); } }); bw.registerCustomEditor(String.class, "list.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("list" + text); } }); bw.registerCustomEditor(String.class, "map.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("map" + text); } @@ -969,31 +977,37 @@ public class CustomEditorTests { IndexedTestBean bean = new IndexedTestBean(false); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(String.class, "array[0].name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("array0" + text); } }); bw.registerCustomEditor(String.class, "array[1].name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("array1" + text); } }); bw.registerCustomEditor(String.class, "list[0].name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("list0" + text); } }); bw.registerCustomEditor(String.class, "list[1].name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("list1" + text); } }); bw.registerCustomEditor(String.class, "map[key1].name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("mapkey1" + text); } }); bw.registerCustomEditor(String.class, "map[key2].name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("mapkey2" + text); } @@ -1060,28 +1074,34 @@ public class CustomEditorTests { tb5.setNestedIndexedBean(new IndexedTestBean()); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(String.class, "array.nestedIndexedBean.array.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("array" + text); } + @Override public String getAsText() { return ((String) getValue()).substring(5); } }); bw.registerCustomEditor(String.class, "list.nestedIndexedBean.list.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("list" + text); } + @Override public String getAsText() { return ((String) getValue()).substring(4); } }); bw.registerCustomEditor(String.class, "map.nestedIndexedBean.map.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("map" + text); } + @Override public String getAsText() { return ((String) getValue()).substring(4); } @@ -1138,16 +1158,19 @@ public class CustomEditorTests { tb5.setNestedIndexedBean(new IndexedTestBean()); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(String.class, "array[0].nestedIndexedBean.array[0].name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("array" + text); } }); bw.registerCustomEditor(String.class, "list.nestedIndexedBean.list[1].name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("list" + text); } }); bw.registerCustomEditor(String.class, "map[key1].nestedIndexedBean.map.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("map" + text); } @@ -1174,28 +1197,34 @@ public class CustomEditorTests { IndexedTestBean bean = new IndexedTestBean(); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(TestBean.class, "array", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean("array" + text, 99)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } }); bw.registerCustomEditor(TestBean.class, "list", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean("list" + text, 99)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } }); bw.registerCustomEditor(TestBean.class, "map", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean("map" + text, 99)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } @@ -1222,55 +1251,67 @@ public class CustomEditorTests { IndexedTestBean bean = new IndexedTestBean(); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(TestBean.class, "array[0]", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean("array0" + text, 99)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } }); bw.registerCustomEditor(TestBean.class, "array[1]", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean("array1" + text, 99)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } }); bw.registerCustomEditor(TestBean.class, "list[0]", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean("list0" + text, 99)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } }); bw.registerCustomEditor(TestBean.class, "list[1]", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean("list1" + text, 99)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } }); bw.registerCustomEditor(TestBean.class, "map[key1]", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean("mapkey1" + text, 99)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } }); bw.registerCustomEditor(TestBean.class, "map[key2]", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean("mapkey2" + text, 99)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } @@ -1297,6 +1338,7 @@ public class CustomEditorTests { IndexedTestBean bean = new IndexedTestBean(); BeanWrapper bw = new BeanWrapperImpl(bean); bw.registerCustomEditor(List.class, "list", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { List result = new ArrayList(); result.add(new TestBean("list" + text, 99)); @@ -1347,6 +1389,7 @@ public class CustomEditorTests { IndexedTestBean tb = new IndexedTestBean(); BeanWrapper bw = new BeanWrapperImpl(tb); bw.registerCustomEditor(TestBean.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean(text, 99)); } @@ -1362,6 +1405,7 @@ public class CustomEditorTests { TestBean tb = new TestBean(); BeanWrapper bw = new BeanWrapperImpl(tb); bw.registerCustomEditor(String.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("-" + text + "-"); } @@ -1436,6 +1480,7 @@ public class CustomEditorTests { private static class TestBeanEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) { TestBean tb = new TestBean(); StringTokenizer st = new StringTokenizer(text, "_"); @@ -1448,6 +1493,7 @@ public class CustomEditorTests { private static class OldValueAccessingTestBeanEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) { TestBean tb = new TestBean(); StringTokenizer st = new StringTokenizer(text, "_"); diff --git a/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java index 34bfbac3b9a..ab995152794 100644 --- a/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java @@ -104,6 +104,7 @@ public class PropertyComparatorTests { private String lastName; + @Override public int compareTo(Object o) { return nickName.compareTo(((Dog)o).nickName); } diff --git a/spring-beans/src/test/java/test/beans/DerivedTestBean.java b/spring-beans/src/test/java/test/beans/DerivedTestBean.java index fbc9fb50900..87133f27d56 100644 --- a/spring-beans/src/test/java/test/beans/DerivedTestBean.java +++ b/spring-beans/src/test/java/test/beans/DerivedTestBean.java @@ -51,12 +51,14 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void setBeanName(String beanName) { if (this.beanName == null || beanName == null) { this.beanName = beanName; } } + @Override public String getBeanName() { return beanName; } @@ -79,10 +81,12 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void destroy() { this.destroyed = true; } + @Override public boolean wasDestroyed() { return destroyed; } diff --git a/spring-beans/src/test/java/test/beans/DummyFactory.java b/spring-beans/src/test/java/test/beans/DummyFactory.java index 75b585a498f..99f2efc2665 100644 --- a/spring-beans/src/test/java/test/beans/DummyFactory.java +++ b/spring-beans/src/test/java/test/beans/DummyFactory.java @@ -81,6 +81,7 @@ public class DummyFactory * Return if the bean managed by this factory is a singleton. * @see FactoryBean#isSingleton() */ + @Override public boolean isSingleton() { return this.singleton; } @@ -92,6 +93,7 @@ public class DummyFactory this.singleton = singleton; } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -100,6 +102,7 @@ public class DummyFactory return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = (AutowireCapableBeanFactory) beanFactory; this.beanFactory.applyBeanPostProcessorsBeforeInitialization(this.testBean, this.beanName); @@ -126,6 +129,7 @@ public class DummyFactory return otherTestBean; } + @Override public void afterPropertiesSet() { if (initialized) { throw new RuntimeException("Cannot call afterPropertiesSet twice on the one bean"); @@ -151,6 +155,7 @@ public class DummyFactory * and prototype mode. * @see FactoryBean#getObject() */ + @Override public Object getObject() throws BeansException { if (isSingleton()) { return this.testBean; @@ -165,11 +170,13 @@ public class DummyFactory } } + @Override public Class getObjectType() { return TestBean.class; } + @Override public void destroy() { if (this.testBean != null) { this.testBean.setName(null); diff --git a/spring-beans/src/test/java/test/beans/LifecycleBean.java b/spring-beans/src/test/java/test/beans/LifecycleBean.java index 145413deefb..e0dd4d3e322 100644 --- a/spring-beans/src/test/java/test/beans/LifecycleBean.java +++ b/spring-beans/src/test/java/test/beans/LifecycleBean.java @@ -59,6 +59,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return initMethodDeclared; } + @Override public void setBeanName(String name) { this.beanName = name; } @@ -67,6 +68,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.owningFactory = beanFactory; } @@ -81,6 +83,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ this.postProcessedBeforeInit = true; } + @Override public void afterPropertiesSet() { if (this.owningFactory == null) { throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean"); @@ -132,6 +135,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ } } + @Override public void destroy() { if (this.destroyed) { throw new IllegalStateException("Already destroyed"); @@ -146,6 +150,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ public static class PostProcessor implements BeanPostProcessor { + @Override public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException { if (bean instanceof LifecycleBean) { ((LifecycleBean) bean).postProcessBeforeInit(); @@ -153,6 +158,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String name) throws BeansException { if (bean instanceof LifecycleBean) { ((LifecycleBean) bean).postProcessAfterInit(); diff --git a/spring-beans/src/test/java/test/beans/NestedTestBean.java b/spring-beans/src/test/java/test/beans/NestedTestBean.java index a630f8662a7..6855305fb3d 100644 --- a/spring-beans/src/test/java/test/beans/NestedTestBean.java +++ b/spring-beans/src/test/java/test/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-beans/src/test/java/test/beans/TestBean.java b/spring-beans/src/test/java/test/beans/TestBean.java index 7e8089e6e7a..1ad802cc977 100644 --- a/spring-beans/src/test/java/test/beans/TestBean.java +++ b/spring-beans/src/test/java/test/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-context-support/src/test/java/org/springframework/beans/TestBean.java b/spring-context-support/src/test/java/org/springframework/beans/TestBean.java index 7842bbfeacf..7a27cf0894e 100644 --- a/spring-context-support/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-context-support/src/test/java/org/springframework/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see org.springframework.beans.ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java b/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java index 8ea783e17cc..646a6797171 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java +++ b/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheSupportTests.java @@ -188,6 +188,7 @@ public class EhCacheSupportTests extends TestCase { cacheFb.setCacheManager(cm); cacheFb.setCacheName("myCache1"); cacheFb.setCacheEntryFactory(new CacheEntryFactory() { + @Override public Object createEntry(Object key) throws Exception { return key; } @@ -212,9 +213,11 @@ public class EhCacheSupportTests extends TestCase { cacheFb.setCacheManager(cm); cacheFb.setCacheName("myCache1"); cacheFb.setCacheEntryFactory(new UpdatingCacheEntryFactory() { + @Override public Object createEntry(Object key) throws Exception { return key; } + @Override public void updateEntryValue(Object key, Object value) throws Exception { } }); diff --git a/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java b/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java index 3233099baca..cd49644c6e3 100644 --- a/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java +++ b/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java @@ -30,6 +30,7 @@ public class InternetAddressEditorTests extends TestCase { private InternetAddressEditor editor; + @Override protected void setUp() { editor = new InternetAddressEditor(); } diff --git a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java index b0deb96a6a2..fc5bf4cfc52 100644 --- a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java +++ b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java @@ -170,6 +170,7 @@ public class JavaMailSenderTests extends TestCase { final List messages = new ArrayList(); MimeMessagePreparator preparator = new MimeMessagePreparator() { + @Override public void prepare(MimeMessage mimeMessage) throws MessagingException { mimeMessage.setRecipient(Message.RecipientType.TO, new InternetAddress("you@mail.org")); messages.add(mimeMessage); @@ -194,12 +195,14 @@ public class JavaMailSenderTests extends TestCase { final List messages = new ArrayList(); MimeMessagePreparator preparator1 = new MimeMessagePreparator() { + @Override public void prepare(MimeMessage mimeMessage) throws MessagingException { mimeMessage.setRecipient(Message.RecipientType.TO, new InternetAddress("he@mail.org")); messages.add(mimeMessage); } }; MimeMessagePreparator preparator2 = new MimeMessagePreparator() { + @Override public void prepare(MimeMessage mimeMessage) throws MessagingException { mimeMessage.setRecipient(Message.RecipientType.TO, new InternetAddress("she@mail.org")); messages.add(mimeMessage); @@ -300,6 +303,7 @@ public class JavaMailSenderTests extends TestCase { public void testJavaMailSenderWithParseExceptionOnMimeMessagePreparator() { MockJavaMailSender sender = new MockJavaMailSender(); MimeMessagePreparator preparator = new MimeMessagePreparator() { + @Override public void prepare(MimeMessage mimeMessage) throws MessagingException { mimeMessage.setFrom(new InternetAddress("")); } diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java index 0607947d6ca..3d78535c8b8 100644 --- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java +++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java @@ -154,6 +154,7 @@ public class QuartzSupportTests { schedulerControl.replay(); SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() { + @Override protected Scheduler createScheduler(SchedulerFactory schedulerFactory, String schedulerName) { return scheduler; } @@ -248,6 +249,7 @@ public class QuartzSupportTests { schedulerControl.replay(); SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() { + @Override protected Scheduler createScheduler(SchedulerFactory schedulerFactory, String schedulerName) { return scheduler; } @@ -346,6 +348,7 @@ public class QuartzSupportTests { schedulerControl.replay(); SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() { + @Override protected Scheduler createScheduler(SchedulerFactory schedulerFactory, String schedulerName) { return scheduler; } @@ -401,6 +404,7 @@ public class QuartzSupportTests { schedulerControl.replay(); SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() { + @Override protected Scheduler createScheduler(SchedulerFactory schedulerFactory, String schedulerName) { return scheduler; } @@ -570,6 +574,7 @@ public class QuartzSupportTests { schedulerControl.replay(); SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() { + @Override protected Scheduler createScheduler(SchedulerFactory schedulerFactory, String schedulerName) { return scheduler; } @@ -605,6 +610,7 @@ public class QuartzSupportTests { schedulerControl.replay(); SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() { + @Override protected Scheduler createScheduler(SchedulerFactory schedulerFactory, String schedulerName) { return scheduler; } @@ -1040,30 +1046,39 @@ public class QuartzSupportTests { private static class TestSchedulerListener implements SchedulerListener { + @Override public void jobScheduled(Trigger trigger) { } + @Override public void jobUnscheduled(String triggerName, String triggerGroup) { } + @Override public void triggerFinalized(Trigger trigger) { } + @Override public void triggersPaused(String triggerName, String triggerGroup) { } + @Override public void triggersResumed(String triggerName, String triggerGroup) { } + @Override public void jobsPaused(String jobName, String jobGroup) { } + @Override public void jobsResumed(String jobName, String jobGroup) { } + @Override public void schedulerError(String msg, SchedulerException cause) { } + @Override public void schedulerShutdown() { } } @@ -1071,16 +1086,20 @@ public class QuartzSupportTests { private static class TestJobListener implements JobListener { + @Override public String getName() { return null; } + @Override public void jobToBeExecuted(JobExecutionContext context) { } + @Override public void jobExecutionVetoed(JobExecutionContext context) { } + @Override public void jobWasExecuted(JobExecutionContext context, JobExecutionException jobException) { } } @@ -1088,20 +1107,25 @@ public class QuartzSupportTests { private static class TestTriggerListener implements TriggerListener { + @Override public String getName() { return null; } + @Override public void triggerFired(Trigger trigger, JobExecutionContext context) { } + @Override public boolean vetoJobExecution(Trigger trigger, JobExecutionContext context) { return false; } + @Override public void triggerMisfired(Trigger trigger) { } + @Override public void triggerComplete(Trigger trigger, JobExecutionContext context, int triggerInstructionCode) { } } @@ -1111,6 +1135,7 @@ public class QuartzSupportTests { private int count; + @Override public void execute(Runnable task) { this.count++; task.run(); @@ -1131,6 +1156,7 @@ public class QuartzSupportTests { param = value; } + @Override public synchronized void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { count++; } @@ -1150,6 +1176,7 @@ public class QuartzSupportTests { param = value; } + @Override protected synchronized void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException { count++; } @@ -1169,6 +1196,7 @@ public class QuartzSupportTests { param = value; } + @Override public void run() { count++; } diff --git a/spring-context-support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java b/spring-context-support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java index 7e22fe88f75..4f8cc86fca8 100644 --- a/spring-context-support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java +++ b/spring-context-support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java @@ -236,6 +236,7 @@ public class JasperReportsUtilsTests extends TestCase { private boolean invoked = false; + @Override public void afterPageExport() { this.invoked = true; } diff --git a/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java b/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java index 2bdea2ecce8..1bf169f777c 100644 --- a/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java +++ b/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java @@ -45,14 +45,17 @@ public class AutowiredQualifierFooService implements FooService { this.initCalled = true; } + @Override public String foo(int id) { return this.fooDao.findFoo(id); } + @Override public Future asyncFoo(int id) { return new AsyncResult(this.fooDao.findFoo(id)); } + @Override public boolean isInitCalled() { return this.initCalled; } diff --git a/spring-context/src/test/java/example/scannable/FooServiceImpl.java b/spring-context/src/test/java/example/scannable/FooServiceImpl.java index ef2b6094b31..e4941f4bf82 100644 --- a/spring-context/src/test/java/example/scannable/FooServiceImpl.java +++ b/spring-context/src/test/java/example/scannable/FooServiceImpl.java @@ -74,16 +74,19 @@ public class FooServiceImpl implements FooService { this.initCalled = true; } + @Override public String foo(int id) { return this.fooDao.findFoo(id); } + @Override public Future asyncFoo(int id) { System.out.println(Thread.currentThread().getName()); Assert.state(ServiceInvocationCounter.getThreadLocalCount() != null, "Thread-local counter not exposed"); return new AsyncResult(this.fooDao.findFoo(id)); } + @Override public boolean isInitCalled() { return this.initCalled; } diff --git a/spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java b/spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java index 34d31600986..601722be844 100644 --- a/spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java +++ b/spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java @@ -28,14 +28,17 @@ import org.springframework.scheduling.annotation.AsyncResult; @Scope("myScope") public class ScopedProxyTestBean implements FooService { + @Override public String foo(int id) { return "bar"; } + @Override public Future asyncFoo(int id) { return new AsyncResult("bar"); } + @Override public boolean isInitCalled() { return false; } diff --git a/spring-context/src/test/java/example/scannable/StubFooDao.java b/spring-context/src/test/java/example/scannable/StubFooDao.java index b4ea5b65d5d..052d9cd25e1 100644 --- a/spring-context/src/test/java/example/scannable/StubFooDao.java +++ b/spring-context/src/test/java/example/scannable/StubFooDao.java @@ -26,6 +26,7 @@ import org.springframework.stereotype.Repository; @Qualifier("testing") public class StubFooDao implements FooDao { + @Override public String findFoo(int id) { return "bar"; } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java index 0355c8f7c37..6eae7b3b64b 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java @@ -110,26 +110,32 @@ public final class AspectAndAdvicePrecedenceTests { } } + @Override public void beforeAdviceOne(String beanName) { checkAdvice("beforeAdviceOne(" + beanName + ")"); } + @Override public void beforeAdviceTwo(String beanName) { checkAdvice("beforeAdviceTwo(" + beanName + ")"); } + @Override public void aroundAdviceOne(String beanName) { checkAdvice("aroundAdviceOne(" + beanName + ")"); } + @Override public void aroundAdviceTwo(String beanName) { checkAdvice("aroundAdviceTwo(" + beanName + ")"); } + @Override public void afterAdviceOne(String beanName) { checkAdvice("afterAdviceOne(" + beanName + ")"); } + @Override public void afterAdviceTwo(String beanName) { checkAdvice("afterAdviceTwo(" + beanName + ")"); } @@ -147,6 +153,7 @@ class PrecedenceTestAspect implements BeanNameAware, Ordered { private Collaborator collaborator; + @Override public void setBeanName(String name) { this.name = name; } @@ -155,6 +162,7 @@ class PrecedenceTestAspect implements BeanNameAware, Ordered { this.order = order; } + @Override public int getOrder() { return order; } @@ -223,6 +231,7 @@ class SimpleSpringBeforeAdvice implements MethodBeforeAdvice, BeanNameAware { /* (non-Javadoc) * @see org.springframework.aop.MethodBeforeAdvice#before(java.lang.reflect.Method, java.lang.Object[], java.lang.Object) */ + @Override public void before(Method method, Object[] args, Object target) throws Throwable { this.collaborator.beforeAdviceOne(this.name); @@ -235,6 +244,7 @@ class SimpleSpringBeforeAdvice implements MethodBeforeAdvice, BeanNameAware { /* (non-Javadoc) * @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String) */ + @Override public void setBeanName(String name) { this.name = name; } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java index dbe4e3e51a0..977038a1f01 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java @@ -60,6 +60,7 @@ class CallCountingInterceptor implements MethodInterceptor { private int count; + @Override public Object invoke(MethodInvocation methodInvocation) throws Throwable { count++; return methodInvocation.proceed(); diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java index 2e998b24df3..5d5930c80be 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java @@ -126,6 +126,7 @@ public final class BeanNamePointcutTests { private int interceptionCount; + @Override public void before(Method method, Object[] args, Object target) throws Throwable { interceptionCount++; } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java index cfeb2ca217c..0eb1c2192d7 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java @@ -88,6 +88,7 @@ public final class DeclarationOrderIndependenceTests { /* (non-Javadoc) * @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String) */ + @Override public void setBeanName(String name) { this.beanName = name; } @@ -148,6 +149,7 @@ class TopsyTurvyTargetImpl implements TopsyTurvyTarget { /* (non-Javadoc) * @see org.springframework.aop.aspectj.TopsyTurvyTarget#doSomething() */ + @Override public void doSomething() { this.x = 10; } @@ -155,6 +157,7 @@ class TopsyTurvyTargetImpl implements TopsyTurvyTarget { /* (non-Javadoc) * @see org.springframework.aop.aspectj.TopsyTurvyTarget#getX() */ + @Override public int getX() { return x; } @@ -171,6 +174,7 @@ class AspectCollaborator implements TopsyTurvyAspect.Collaborator { /* (non-Javadoc) * @see org.springframework.aop.aspectj.TopsyTurvyAspect.Collaborator#afterReturningAdviceFired() */ + @Override public void afterReturningAdviceFired() { this.afterReturningFired = true; } @@ -178,6 +182,7 @@ class AspectCollaborator implements TopsyTurvyAspect.Collaborator { /* (non-Javadoc) * @see org.springframework.aop.aspectj.TopsyTurvyAspect.Collaborator#aroundAdviceFired() */ + @Override public void aroundAdviceFired() { this.aroundFired = true; } @@ -185,6 +190,7 @@ class AspectCollaborator implements TopsyTurvyAspect.Collaborator { /* (non-Javadoc) * @see org.springframework.aop.aspectj.TopsyTurvyAspect.Collaborator#beforeAdviceFired() */ + @Override public void beforeAdviceFired() { this.beforeFired = true; } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java index 70464c53128..22e729d6338 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java @@ -101,34 +101,42 @@ class SimpleBeanImpl implements SimpleBean { private String name; private String sex; + @Override public int getAge() { return age; } + @Override public float getMyFloat() { return aFloat; } + @Override public String getName() { return name; } + @Override public String getSex() { return sex; } + @Override public void setAge(int age) { this.age = age; } + @Override public void setMyFloat(float f) { this.aFloat = f; } + @Override public void setName(String name) { this.name = name; } + @Override public void setSex(String sex) { this.sex = sex; } @@ -143,6 +151,7 @@ class ProceedTestingAspect implements Ordered { private int order; public void setOrder(int order) { this.order = order; } + @Override public int getOrder() { return this.order; } public Object capitalize(ProceedingJoinPoint pjp, String value) throws Throwable { diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java index bcd1234398d..a31b0be91ec 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java @@ -74,6 +74,7 @@ interface SerializableFoo extends Serializable { void foo(); } class SubtypeMatchingTestClassA implements NonSerializableFoo { + @Override public void foo() {} } @@ -81,6 +82,7 @@ class SubtypeMatchingTestClassA implements NonSerializableFoo { @SuppressWarnings("serial") class SubtypeMatchingTestClassB implements SerializableFoo { + @Override public void foo() {} } @@ -89,6 +91,7 @@ interface Bar { void bar(Object o); } class SubtypeMatchingTestClassC implements Bar { + @Override public void bar(Object o) {} } \ No newline at end of file diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java index f440f0490b0..8b9ab4ea519 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java @@ -82,6 +82,7 @@ public final class TargetPointcutSelectionTests { // include the advised method's implementation (instead a base class should include it) public static abstract class AbstractTestImpl implements TestInterface { + @Override public void interfaceMethod() { } } @@ -107,6 +108,7 @@ public final class TargetPointcutSelectionTests { public static class TestInterceptor extends TestAspect implements MethodInterceptor { + @Override public Object invoke(MethodInvocation mi) throws Throwable { increment(); return mi.proceed(); diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java index 6633bb808ea..5bf6196f593 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java @@ -108,6 +108,7 @@ public final class ThisAndTargetSelectionOnlyPointcutsAtAspectJTests { } public static class TestImpl implements TestInterface { + @Override public void doIt() { } } @@ -119,11 +120,13 @@ public final class ThisAndTargetSelectionOnlyPointcutsAtAspectJTests { @TestAnnotation public static class AnnotatedClassTestImpl implements TestInterface { + @Override public void doIt() { } } public static class AnnotatedMethodTestImpl implements TestInterface { + @Override @TestAnnotation public void doIt() { } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java index bcd93c0523e..2ae946206eb 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java @@ -115,6 +115,7 @@ interface TestInterface { class TestImpl implements TestInterface { + @Override public void doIt() { } } \ No newline at end of file diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java b/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java index 935cf4bd583..2bb1fb39a66 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java @@ -118,22 +118,27 @@ final class Counter implements ICounter { public Counter() { } + @Override public void increment() { count++; } + @Override public void decrement() { count--; } + @Override public int getCount() { return count; } + @Override public void setCount(int counter) { this.count = counter; } + @Override public void reset() { this.count = 0; } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java index 925038414ec..a8247ac352b 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java @@ -55,6 +55,7 @@ public final class AnnotationPointcutTests { class TestMethodInterceptor implements MethodInterceptor { + @Override public Object invoke(MethodInvocation methodInvocation) throws Throwable { return "this value"; } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java index e88d5ada0b4..bdf4d1ddc1f 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java @@ -57,6 +57,7 @@ class InterfaceExtendingAspect implements AnInterface { pjp.proceed(); } + @Override public void interfaceMethod() { } } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java index 9bb9c8d83a3..66aa6e0e579 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java @@ -387,6 +387,7 @@ class PerTargetAspect implements Ordered { ++count; } + @Override public int getOrder() { return this.order; } @@ -438,14 +439,17 @@ class DummyAspectWithParameter { class DummyFactoryBean implements FactoryBean { + @Override public Object getObject() throws Exception { throw new UnsupportedOperationException(); } + @Override public Class getObjectType() { throw new UnsupportedOperationException(); } + @Override public boolean isSingleton() { throw new UnsupportedOperationException(); } @@ -573,12 +577,14 @@ class TestBeanAdvisor extends StaticMethodMatcherPointcutAdvisor { public TestBeanAdvisor() { setAdvice(new MethodBeforeAdvice() { + @Override public void before(Method method, Object[] args, Object target) throws Throwable { ++count; } }); } + @Override public boolean matches(Method method, Class targetClass) { return ITestBean.class.isAssignableFrom(targetClass); } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java index 1868a63a3d0..ef61c94dfda 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java @@ -82,16 +82,19 @@ class AtAspectJAnnotationBindingTestAspect { class ResourceArrayFactoryBean implements FactoryBean { + @Override @TestAnnotation("some value") public Object getObject() throws Exception { return new Resource[0]; } + @Override @TestAnnotation("some value") public Class getObjectType() { return Resource[].class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java index 66897ba62de..247e416e1ce 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java @@ -72,22 +72,26 @@ interface AnnotatedTestBean { */ class AnnotatedTestBeanImpl implements AnnotatedTestBean { + @Override @TestAnnotation("this value") public String doThis() { return "doThis"; } + @Override @TestAnnotation("that value") public String doThat() { return "doThat"; } + @Override @TestAnnotation("array value") public String[] doArray() { return new String[] {"doThis", "doThat"}; } // not annotated + @Override public String doTheOther() { return "doTheOther"; } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java index 918dd87535b..8d12136b544 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java @@ -206,6 +206,7 @@ class MultiplyReturnValueInterceptor implements MethodInterceptor { return this.multiple; } + @Override public Object invoke(MethodInvocation mi) throws Throwable { ++invocations; int result = (Integer) mi.proceed(); @@ -219,6 +220,7 @@ class TraceAfterReturningAdvice implements AfterReturningAdvice { public int afterTakesInt; + @Override public void afterReturning(Object returnValue, Method method, Object[] args, Object target) throws Throwable { ++afterTakesInt; } @@ -226,6 +228,7 @@ class TraceAfterReturningAdvice implements AfterReturningAdvice { public static Advisor advisor() { return new DefaultPointcutAdvisor( new StaticMethodMatcherPointcut() { + @Override public boolean matches(Method method, Class targetClass) { return method.getParameterTypes().length == 1 && method.getParameterTypes()[0].equals(Integer.class); @@ -261,6 +264,7 @@ class TraceBeforeAdvice implements MethodBeforeAdvice { public int beforeStringReturn; + @Override public void before(Method method, Object[] args, Object target) throws Throwable { ++beforeStringReturn; } @@ -268,6 +272,7 @@ class TraceBeforeAdvice implements MethodBeforeAdvice { public static Advisor advisor() { return new DefaultPointcutAdvisor( new StaticMethodMatcherPointcut() { + @Override public boolean matches(Method method, Class targetClass) { return method.getReturnType().equals(String.class); } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java index 17e5943b3a0..e048453a4fe 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java @@ -81,6 +81,7 @@ interface Service { class ServiceImpl implements Service { + @Override @Transaction public void serveMe() { } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java index b8c85fbef33..8085f19b229 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java @@ -87,9 +87,11 @@ interface DerivedInterface extends BaseInterface { class DerivedStringParameterizedClass implements DerivedInterface { + @Override public void genericDerivedInterfaceMethod(String t) { } + @Override public void genericBaseInterfaceMethod(String t) { } } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java index 6260e98b061..9bf53313296 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java @@ -82,9 +82,11 @@ public final class GenericParameterMatchingTests { static class GenericImpl implements GenericInterface { + @Override public void save(T bean) { } + @Override public void saveAll(Collection beans) { } } diff --git a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java index 5af410a894b..51b63bd7d6c 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java @@ -409,6 +409,7 @@ public abstract class AbstractAopProxyTests { final String s = "foo"; // Test return value MethodInterceptor mi = new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { if (!context) { assertNoInvocationContext(); @@ -457,6 +458,7 @@ public abstract class AbstractAopProxyTests { final Exception expectedException = new Exception(); // Test return value MethodInterceptor mi = new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { throw expectedException; } @@ -491,6 +493,7 @@ public abstract class AbstractAopProxyTests { final Exception unexpectedException = new Exception(); // Test return value MethodInterceptor mi = new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { throw unexpectedException; } @@ -523,6 +526,7 @@ public abstract class AbstractAopProxyTests { final RuntimeException unexpectedException = new RuntimeException(); // Test return value MethodInterceptor mi = new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { throw unexpectedException; } @@ -573,6 +577,7 @@ public abstract class AbstractAopProxyTests { AdvisedSupport pc = new AdvisedSupport(new Class[] {ITestBean.class, IOther.class}); pc.addAdvice(ExposeInvocationInterceptor.INSTANCE); TrapTargetInterceptor tii = new TrapTargetInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { // Assert that target matches BEFORE invocation returns assertEquals("Target is correct", expectedTarget, invocation.getThis()); @@ -727,6 +732,7 @@ public abstract class AbstractAopProxyTests { pc.addAdvice(di); final long ts = 37; pc.addAdvice(new DelegatingIntroductionInterceptor(new TimeStamped() { + @Override public long getTimeStamp() { return ts; } @@ -811,6 +817,7 @@ public abstract class AbstractAopProxyTests { /** * @see test.util.TimeStamped#getTimeStamp() */ + @Override public long getTimeStamp() { throw new UnsupportedOperationException(); } @@ -1132,6 +1139,7 @@ public abstract class AbstractAopProxyTests { pc.addInterface(ITestBean.class); MethodInterceptor twoBirthdayInterceptor = new MethodInterceptor() { + @Override public Object invoke(MethodInvocation mi) throws Throwable { // Clone the invocation to proceed three times // "The Moor's Last Sigh": this technology can cause premature aging @@ -1144,6 +1152,7 @@ public abstract class AbstractAopProxyTests { }; @SuppressWarnings("serial") StaticMethodMatcherPointcutAdvisor advisor = new StaticMethodMatcherPointcutAdvisor(twoBirthdayInterceptor) { + @Override public boolean matches(Method m, Class targetClass) { return "haveBirthday".equals(m.getName()); } @@ -1173,6 +1182,7 @@ public abstract class AbstractAopProxyTests { * Changes the name, then changes it back. */ MethodInterceptor nameReverter = new MethodInterceptor() { + @Override public Object invoke(MethodInvocation mi) throws Throwable { MethodInvocation clone = ((ReflectiveMethodInvocation) mi).invocableClone(); String oldName = ((ITestBean) mi.getThis()).getName(); @@ -1186,6 +1196,7 @@ public abstract class AbstractAopProxyTests { class NameSaver implements MethodInterceptor { private List names = new LinkedList(); + @Override public Object invoke(MethodInvocation mi) throws Throwable { names.add(mi.getArguments()[0]); return mi.proceed(); @@ -1219,12 +1230,14 @@ public abstract class AbstractAopProxyTests { ProxyFactory pc = new ProxyFactory(target); NopInterceptor overLoadVoids = new NopInterceptor(); pc.addAdvisor(new StaticMethodMatcherPointcutAdvisor(overLoadVoids) { + @Override public boolean matches(Method m, Class targetClass) { return m.getName().equals("overload") && m.getParameterTypes().length == 0; } }); NopInterceptor overLoadInts = new NopInterceptor(); pc.addAdvisor(new StaticMethodMatcherPointcutAdvisor(overLoadInts) { + @Override public boolean matches(Method m, Class targetClass) { return m.getName().equals("overload") && m.getParameterTypes().length == 1 && m.getParameterTypes()[0].equals(int.class); @@ -1255,19 +1268,23 @@ public abstract class AbstractAopProxyTests { Advised config = (Advised) proxy; // This class just checks proxy is bound before getTarget() call config.setTargetSource(new TargetSource() { + @Override public Class getTargetClass() { return TestBean.class; } + @Override public boolean isStatic() { return false; } + @Override public Object getTarget() throws Exception { assertEquals(proxy, AopContext.currentProxy()); return target; } + @Override public void releaseTarget(Object target) throws Exception { } }); @@ -1311,6 +1328,7 @@ public abstract class AbstractAopProxyTests { CountingBeforeAdvice cba = new CountingBeforeAdvice(); @SuppressWarnings("serial") Advisor matchesNoArgs = new StaticMethodMatcherPointcutAdvisor(cba) { + @Override public boolean matches(Method m, Class targetClass) { return m.getParameterTypes().length == 0; } @@ -1343,6 +1361,7 @@ public abstract class AbstractAopProxyTests { this.expectedValues = expectedValues; this.valuesToAdd = valuesToAdd; } + @Override public Object invoke(MethodInvocation invocation) throws Throwable { ReflectiveMethodInvocation rmi = (ReflectiveMethodInvocation) invocation; for (Iterator it = rmi.getUserAttributes().keySet().iterator(); it.hasNext(); ){ @@ -1390,6 +1409,7 @@ public abstract class AbstractAopProxyTests { CountingMultiAdvice cca = new CountingMultiAdvice(); @SuppressWarnings("serial") Advisor matchesNoArgs = new StaticMethodMatcherPointcutAdvisor(cca) { + @Override public boolean matches(Method m, Class targetClass) { return m.getParameterTypes().length == 0 || "exceptional".equals(m.getName()); } @@ -1428,6 +1448,7 @@ public abstract class AbstractAopProxyTests { final RuntimeException rex = new RuntimeException(); @SuppressWarnings("serial") CountingBeforeAdvice ba = new CountingBeforeAdvice() { + @Override public void before(Method m, Object[] args, Object target) throws Throwable { super.before(m, args, target); if (m.getName().startsWith("set")) @@ -1471,6 +1492,7 @@ public abstract class AbstractAopProxyTests { public void testAfterReturningAdvisorIsInvoked() { class SummingAfterAdvice implements AfterReturningAdvice { public int sum; + @Override public void afterReturning(Object returnValue, Method m, Object[] args, Object target) throws Throwable { sum += ((Integer) returnValue).intValue(); } @@ -1478,6 +1500,7 @@ public abstract class AbstractAopProxyTests { SummingAfterAdvice aa = new SummingAfterAdvice(); @SuppressWarnings("serial") Advisor matchesInt = new StaticMethodMatcherPointcutAdvisor(aa) { + @Override public boolean matches(Method m, Class targetClass) { return m.getReturnType() == int.class; } @@ -1535,6 +1558,7 @@ public abstract class AbstractAopProxyTests { MyThrowsHandler th = new MyThrowsHandler(); @SuppressWarnings("serial") Advisor matchesEchoInvocations = new StaticMethodMatcherPointcutAdvisor(th) { + @Override public boolean matches(Method m, Class targetClass) { return m.getName().startsWith("echo"); } @@ -1609,6 +1633,7 @@ public abstract class AbstractAopProxyTests { private static class CheckMethodInvocationIsSameInAndOutInterceptor implements MethodInterceptor { + @Override public Object invoke(MethodInvocation mi) throws Throwable { Method m = mi.getMethod(); Object retval = mi.proceed(); @@ -1623,6 +1648,7 @@ public abstract class AbstractAopProxyTests { */ private static class CheckMethodInvocationViaThreadLocalIsSameInAndOutInterceptor implements MethodInterceptor { + @Override public Object invoke(MethodInvocation mi) throws Throwable { String task = "get invocation on way IN"; try { @@ -1649,6 +1675,7 @@ public abstract class AbstractAopProxyTests { */ private static class ProxyMatcherInterceptor implements MethodInterceptor { + @Override public Object invoke(MethodInvocation mi) throws Throwable { Object proxy = AopContext.currentProxy(); Object ret = mi.proceed(); @@ -1667,6 +1694,7 @@ public abstract class AbstractAopProxyTests { protected static class StringSetterNullReplacementAdvice extends DefaultPointcutAdvisor { private static MethodInterceptor cleaner = new MethodInterceptor() { + @Override public Object invoke(MethodInvocation mi) throws Throwable { // We know it can only be invoked if there's a single parameter of type string mi.getArguments()[0] = ""; @@ -1677,9 +1705,11 @@ public abstract class AbstractAopProxyTests { public StringSetterNullReplacementAdvice() { super(cleaner); setPointcut(new DynamicMethodMatcherPointcut() { + @Override public boolean matches(Method m, Class targetClass, Object[] args) { return args[0] == null; } + @Override public boolean matches(Method m, Class targetClass) { return m.getName().startsWith("set") && m.getParameterTypes().length == 1 && @@ -1698,6 +1728,7 @@ public abstract class AbstractAopProxyTests { public TestDynamicPointcutAdvice(MethodInterceptor mi, final String pattern) { super(mi); setPointcut(new DynamicMethodMatcherPointcut() { + @Override public boolean matches(Method m, Class targetClass, Object[] args) { boolean run = m.getName().indexOf(pattern) != -1; if (run) ++count; @@ -1716,11 +1747,13 @@ public abstract class AbstractAopProxyTests { public TestDynamicPointcutForSettersOnly(MethodInterceptor mi, final String pattern) { super(mi); setPointcut(new DynamicMethodMatcherPointcut() { + @Override public boolean matches(Method m, Class targetClass, Object[] args) { boolean run = m.getName().indexOf(pattern) != -1; if (run) ++count; return run; } + @Override public boolean matches(Method m, Class clazz) { return m.getName().startsWith("set"); } @@ -1739,6 +1772,7 @@ public abstract class AbstractAopProxyTests { super(mi); this.pattern = pattern; } + @Override public boolean matches(Method m, Class targetClass) { boolean run = m.getName().indexOf(pattern) != -1; if (run) ++count; @@ -1757,6 +1791,7 @@ public abstract class AbstractAopProxyTests { public Object target; + @Override public Object invoke(MethodInvocation invocation) throws Throwable { this.target = invocation.getThis(); return invocation.proceed(); @@ -1766,6 +1801,7 @@ public abstract class AbstractAopProxyTests { private static class DummyIntroductionAdviceImpl implements DynamicIntroductionAdvice { + @Override public boolean implementsInterface(Class intf) { return true; } @@ -1774,6 +1810,7 @@ public abstract class AbstractAopProxyTests { public static class OwnSpouse extends TestBean { + @Override public ITestBean getSpouse() { return this; } @@ -1790,6 +1827,7 @@ public abstract class AbstractAopProxyTests { return getClass().hashCode(); } + @Override public void absquatulate() { } } @@ -1811,14 +1849,17 @@ public abstract class AbstractAopProxyTests { private int count; + @Override public int getCount() { return count; } + @Override public void incrementViaThis() { this.increment(); } + @Override public void incrementViaProxy() { INeedsToSeeProxy thisViaProxy = (INeedsToSeeProxy) AopContext.currentProxy(); thisViaProxy.increment(); @@ -1829,6 +1870,7 @@ public abstract class AbstractAopProxyTests { protected void checkAdvised(Advised advised) { } + @Override public void increment() { ++count; } @@ -1837,6 +1879,7 @@ public abstract class AbstractAopProxyTests { public static class TargetChecker extends NeedsToSeeProxy { + @Override protected void checkAdvised(Advised advised) { // TODO replace this check: no longer possible //assertEquals(advised.getTarget(), this); @@ -1854,11 +1897,13 @@ public abstract class AbstractAopProxyTests { this.expectedSource = expectedSource; } + @Override public void activated(AdvisedSupport advised) { assertEquals(expectedSource, advised); ++activates; } + @Override public void adviceChanged(AdvisedSupport advised) { assertEquals(expectedSource, advised); ++adviceChanges; @@ -1870,10 +1915,12 @@ public abstract class AbstractAopProxyTests { public int refreshes; + @Override public void activated(AdvisedSupport advised) { ++refreshes; } + @Override public void adviceChanged(AdvisedSupport advised) { ++refreshes; } @@ -1894,17 +1941,21 @@ public abstract class AbstractAopProxyTests { public static class Overloads implements IOverloads { + @Override public void overload() { } + @Override public int overload(int i) { return i; } + @Override public String overload(String s) { return s; } + @Override public void noAdvice() { } } @@ -1914,10 +1965,12 @@ public abstract class AbstractAopProxyTests { public static class CountingMultiAdvice extends MethodCounter implements MethodBeforeAdvice, AfterReturningAdvice, ThrowsAdvice { + @Override public void before(Method m, Object[] args, Object target) throws Throwable { count(m); } + @Override public void afterReturning(Object o, Method m, Object[] args, Object target) throws Throwable { count(m); @@ -1983,6 +2036,7 @@ public abstract class AbstractAopProxyTests { /** * @see org.springframework.aop.TargetSource#getTargetClass() */ + @Override public Class getTargetClass() { return target.getClass(); } @@ -1990,6 +2044,7 @@ public abstract class AbstractAopProxyTests { /** * @see org.springframework.aop.TargetSource#getTarget() */ + @Override public Object getTarget() throws Exception { ++gets; return target; @@ -1998,6 +2053,7 @@ public abstract class AbstractAopProxyTests { /** * @see org.springframework.aop.TargetSource#releaseTarget(java.lang.Object) */ + @Override public void releaseTarget(Object pTarget) throws Exception { if (pTarget != this.target) throw new RuntimeException("Released wrong target"); @@ -2016,6 +2072,7 @@ public abstract class AbstractAopProxyTests { /** * @see org.springframework.aop.TargetSource#isStatic() */ + @Override public boolean isStatic() { return false; } @@ -2025,12 +2082,14 @@ public abstract class AbstractAopProxyTests { static abstract class ExposedInvocationTestBean extends TestBean { + @Override public String getName() { MethodInvocation invocation = ExposeInvocationInterceptor.currentInvocation(); assertions(invocation); return super.getName(); } + @Override public void absquatulate() { MethodInvocation invocation = ExposeInvocationInterceptor.currentInvocation(); assertions(invocation); @@ -2042,6 +2101,7 @@ public abstract class AbstractAopProxyTests { static class InvocationCheckExposedInvocationTestBean extends ExposedInvocationTestBean { + @Override protected void assertions(MethodInvocation invocation) { TestCase.assertTrue(invocation.getThis() == this); TestCase.assertTrue("Invocation should be on ITestBean: " + invocation.getMethod(), diff --git a/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java index a52cbe3cc07..d600115868a 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java @@ -58,6 +58,7 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri private static final String DEPENDENCY_CHECK_CONTEXT = CglibProxyTests.class.getSimpleName() + "-with-dependency-checking.xml"; + @Override protected Object createProxy(ProxyCreatorSupport as) { as.setProxyTargetClass(true); Object proxy = as.createAopProxy().getProxy(); @@ -65,11 +66,13 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri return proxy; } + @Override protected AopProxy createAopProxy(AdvisedSupport as) { as.setProxyTargetClass(true); return new CglibAopProxy(as); } + @Override protected boolean requiresTarget() { return true; } @@ -207,10 +210,12 @@ public final class CglibProxyTests extends AbstractAopProxyTests implements Seri MethodInterceptor advice = new NopInterceptor(); Pointcut pointcut = new Pointcut() { + @Override public ClassFilter getClassFilter() { return ClassFilter.TRUE; } + @Override public MethodMatcher getMethodMatcher() { return MethodMatcher.TRUE; } @@ -492,6 +497,7 @@ class UnsupportedInterceptor implements MethodInterceptor { /** * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation) */ + @Override public Object invoke(MethodInvocation mi) throws Throwable { throw new UnsupportedOperationException(mi.getMethod().getName()); } diff --git a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java index b845070078f..fff56bde6f2 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java @@ -42,6 +42,7 @@ import org.springframework.beans.TestBean; @SuppressWarnings("serial") public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements Serializable { + @Override protected Object createProxy(ProxyCreatorSupport as) { assertFalse("Not forcible CGLIB", as.isProxyTargetClass()); Object proxy = as.createAopProxy().getProxy(); @@ -49,6 +50,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements return proxy; } + @Override protected AopProxy createAopProxy(AdvisedSupport as) { return new JdkDynamicAopProxy(as); } @@ -94,6 +96,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements public void testTargetCanGetInvocationWithPrivateClass() throws Throwable { final ExposedInvocationTestBean expectedTarget = new ExposedInvocationTestBean() { + @Override protected void assertions(MethodInvocation invocation) { assertTrue(invocation.getThis() == this); assertTrue("Invocation should be on ITestBean: " + invocation.getMethod(), @@ -104,6 +107,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements AdvisedSupport pc = new AdvisedSupport(new Class[] { ITestBean.class, IOther.class }); pc.addAdvice(ExposeInvocationInterceptor.INSTANCE); TrapTargetInterceptor tii = new TrapTargetInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { // Assert that target matches BEFORE invocation returns assertEquals("Target is correct", expectedTarget, invocation.getThis()); @@ -165,10 +169,12 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements public static class FooBar implements Foo, Bar { + @Override public Bar getBarThis() { return this; } + @Override public Foo getFooThis() { return this; } @@ -189,6 +195,7 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements private final String name = "Rob Harrop"; + @Override public String getName() { return this.name; } diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java index 6c255751b4d..0bf067154ac 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java @@ -307,6 +307,7 @@ public final class ProxyFactoryBeanTests { final Exception ex = new UnsupportedOperationException("invoke"); // Add evil interceptor to head of list config.addAdvice(0, new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { throw ex; } @@ -705,12 +706,14 @@ public final class ProxyFactoryBeanTests { public PointcutForVoid() { setAdvice(new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { methodNames.add(invocation.getMethod().getName()); return invocation.proceed(); } }); setPointcut(new DynamicMethodMatcherPointcut() { + @Override public boolean matches(Method m, Class targetClass, Object[] args) { return m.getReturnType() == Void.TYPE; } @@ -734,10 +737,12 @@ public final class ProxyFactoryBeanTests { */ public static class GlobalAspectInterfaceInterceptor implements IntroductionInterceptor { + @Override public boolean implementsInterface(Class intf) { return intf.equals(AddedGlobalInterface.class); } + @Override public Object invoke(MethodInvocation mi) throws Throwable { if (mi.getMethod().getDeclaringClass().equals(AddedGlobalInterface.class)) { return new Integer(-1); @@ -751,22 +756,27 @@ public final class ProxyFactoryBeanTests { private IntroductionInterceptor gi = new GlobalAspectInterfaceInterceptor(); + @Override public ClassFilter getClassFilter() { return ClassFilter.TRUE; } + @Override public Advice getAdvice() { return this.gi; } + @Override public Class[] getInterfaces() { return new Class[] { AddedGlobalInterface.class }; } + @Override public boolean isPerInstance() { return false; } + @Override public void validateInterfaces() { } } diff --git a/spring-context/src/test/java/org/springframework/aop/framework/_TestTypes.java b/spring-context/src/test/java/org/springframework/aop/framework/_TestTypes.java index 216510950ed..ea1924b1018 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/_TestTypes.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/_TestTypes.java @@ -27,14 +27,17 @@ interface IEcho { class Echo implements IEcho { private int a; + @Override public int echoException(int i, Throwable t) throws Throwable { if (t != null) throw t; return i; } + @Override public void setA(int a) { this.a = a; } + @Override public int getA() { return a; } diff --git a/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests.java b/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests.java index 39dc7410b81..57e8de81126 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests.java @@ -96,10 +96,12 @@ interface SimpleBeforeAdvice extends BeforeAdvice { @SuppressWarnings("serial") class SimpleBeforeAdviceAdapter implements AdvisorAdapter, Serializable { + @Override public boolean supportsAdvice(Advice advice) { return (advice instanceof SimpleBeforeAdvice); } + @Override public MethodInterceptor getInterceptor(Advisor advisor) { SimpleBeforeAdvice advice = (SimpleBeforeAdvice) advisor.getAdvice(); return new SimpleBeforeAdviceInterceptor(advice) ; @@ -112,6 +114,7 @@ class SimpleBeforeAdviceImpl implements SimpleBeforeAdvice { private int invocationCounter; + @Override public void before() throws Throwable { ++invocationCounter; } @@ -131,6 +134,7 @@ final class SimpleBeforeAdviceInterceptor implements MethodInterceptor { this.advice = advice; } + @Override public Object invoke(MethodInvocation mi) throws Throwable { advice.before(); return mi.proceed(); diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java index 185075670f9..e6bf8c37dae 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java @@ -218,6 +218,7 @@ class CountingTestBean extends TestBean { class SelectivePrototypeTargetSourceCreator extends AbstractBeanFactoryBasedTargetSourceCreator { + @Override protected AbstractBeanFactoryBasedTargetSource createBeanFactoryBasedTargetSource( Class beanClass, String beanName) { if (!beanName.startsWith("prototype")) { diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java index f8b0e7a01ff..d9237d23b9b 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java @@ -281,6 +281,7 @@ public final class AutoProxyCreatorTests { this.proxyObject = proxyObject; } + @Override protected Object[] getAdvicesAndAdvisorsForBean(Class beanClass, String name, TargetSource customTargetSource) { if (StaticMessageSource.class.equals(beanClass)) { return DO_NOT_PROXY; @@ -308,6 +309,7 @@ public final class AutoProxyCreatorTests { public int nrOfInvocations = 0; + @Override public Object invoke(MethodInvocation invocation) throws Throwable { if (!invocation.getMethod().getName().equals("finalize")) { this.nrOfInvocations++; diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java index 77bbaf3e3c2..0197bb68400 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java @@ -47,6 +47,7 @@ public final class BeanNameAutoProxyCreatorInitTests { class NullChecker implements MethodBeforeAdvice { + @Override public void before(Method method, Object[] args, Object target) throws Throwable { check(args); } diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java index 0b8f9a15cd2..54242e6ffc4 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java @@ -205,6 +205,7 @@ class CreatesTestBean implements FactoryBean { /** * @see org.springframework.beans.factory.FactoryBean#getObject() */ + @Override public Object getObject() throws Exception { return new TestBean(); } @@ -212,6 +213,7 @@ class CreatesTestBean implements FactoryBean { /** * @see org.springframework.beans.factory.FactoryBean#getObjectType() */ + @Override public Class getObjectType() { return TestBean.class; } @@ -219,6 +221,7 @@ class CreatesTestBean implements FactoryBean { /** * @see org.springframework.beans.factory.FactoryBean#isSingleton() */ + @Override public boolean isSingleton() { return true; } diff --git a/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java index 0940539f54a..8ada7848fa9 100644 --- a/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -51,12 +51,14 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void setBeanName(String beanName) { if (this.beanName == null || beanName == null) { this.beanName = beanName; } } + @Override public String getBeanName() { return beanName; } @@ -75,10 +77,12 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void destroy() { this.destroyed = true; } + @Override public boolean wasDestroyed() { return destroyed; } diff --git a/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java index 13c2c5447a5..9a2a3193df2 100644 --- a/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java +++ b/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java @@ -31,22 +31,27 @@ public class SerializablePerson implements Person, Serializable { private String name; private int age; + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override public Object echo(Object o) throws Throwable { if (o instanceof Throwable) { throw (Throwable) o; diff --git a/spring-context/src/test/java/org/springframework/beans/TestBean.java b/spring-context/src/test/java/org/springframework/beans/TestBean.java index b93bf96be31..21526c932bd 100644 --- a/spring-context/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-context/src/test/java/org/springframework/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see org.springframework.beans.ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java index a04d1796443..9c8be8ac4c4 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java @@ -317,6 +317,7 @@ public abstract class AbstractBeanFactoryTests extends TestCase { public static class TestBeanEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) { TestBean tb = new TestBean(); StringTokenizer st = new StringTokenizer(text, "_"); diff --git a/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java index b9999baa5e6..bd402c3040e 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java @@ -74,6 +74,7 @@ public class DummyFactory * Return if the bean managed by this factory is a singleton. * @see org.springframework.beans.factory.FactoryBean#isSingleton() */ + @Override public boolean isSingleton() { return this.singleton; } @@ -85,6 +86,7 @@ public class DummyFactory this.singleton = singleton; } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -93,6 +95,7 @@ public class DummyFactory return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = (AutowireCapableBeanFactory) beanFactory; this.beanFactory.applyBeanPostProcessorsBeforeInitialization(this.testBean, this.beanName); @@ -119,6 +122,7 @@ public class DummyFactory return otherTestBean; } + @Override public void afterPropertiesSet() { if (initialized) { throw new RuntimeException("Cannot call afterPropertiesSet twice on the one bean"); @@ -144,6 +148,7 @@ public class DummyFactory * and prototype mode. * @see org.springframework.beans.factory.FactoryBean#getObject() */ + @Override public Object getObject() throws BeansException { if (isSingleton()) { return this.testBean; @@ -158,11 +163,13 @@ public class DummyFactory } } + @Override public Class getObjectType() { return TestBean.class; } + @Override public void destroy() { if (this.testBean != null) { this.testBean.setName(null); diff --git a/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java index 19b7da62f8d..191b3509c73 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java @@ -53,6 +53,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return initMethodDeclared; } + @Override public void setBeanName(String name) { this.beanName = name; } @@ -61,6 +62,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.owningFactory = beanFactory; } @@ -75,6 +77,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ this.postProcessedBeforeInit = true; } + @Override public void afterPropertiesSet() { if (this.owningFactory == null) { throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean"); @@ -126,6 +129,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ } } + @Override public void destroy() { if (this.destroyed) { throw new IllegalStateException("Already destroyed"); @@ -140,6 +144,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ public static class PostProcessor implements BeanPostProcessor { + @Override public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException { if (bean instanceof LifecycleBean) { ((LifecycleBean) bean).postProcessBeforeInit(); @@ -147,6 +152,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String name) throws BeansException { if (bean instanceof LifecycleBean) { ((LifecycleBean) bean).postProcessAfterInit(); diff --git a/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java index 1dcc1aaf72d..afb3dbe2f1a 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java @@ -28,6 +28,7 @@ public class MustBeInitialized implements InitializingBean { /** * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { this.inited = true; } diff --git a/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java b/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java index 822da917c54..6bb485f835f 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java @@ -49,6 +49,7 @@ class UserServiceImpl extends GenericServiceImpl { protected Foo object; + @Override @Inject @Named("userObject") public void setObject(Foo object) { diff --git a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java index 604d2595b01..9901e8feb82 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java @@ -44,6 +44,7 @@ public class SimpleMapScope implements Scope, Serializable { } + @Override public Object get(String name, ObjectFactory objectFactory) { synchronized (this.map) { Object scopedObject = this.map.get(name); @@ -55,16 +56,19 @@ public class SimpleMapScope implements Scope, Serializable { } } + @Override public Object remove(String name) { synchronized (this.map) { return this.map.remove(name); } } + @Override public void registerDestructionCallback(String name, Runnable callback) { this.callbacks.add(callback); } + @Override public Object resolveContextualObject(String key) { return null; } @@ -76,6 +80,7 @@ public class SimpleMapScope implements Scope, Serializable { } } + @Override public String getConversationId() { return null; } diff --git a/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java b/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java index 8da9a81a6f8..ebd2ad7ea28 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java @@ -40,6 +40,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { private final List imports = new LinkedList(); + @Override public void defaultsRegistered(DefaultsDefinition defaultsDefinition) { this.defaults.add(defaultsDefinition); } @@ -48,6 +49,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return Collections.unmodifiableList(this.defaults); } + @Override public void componentRegistered(ComponentDefinition componentDefinition) { this.componentDefinitions.put(componentDefinition.getName(), componentDefinition); } @@ -61,6 +63,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return collection.toArray(new ComponentDefinition[collection.size()]); } + @Override public void aliasRegistered(AliasDefinition aliasDefinition) { List aliases = this.aliasMap.get(aliasDefinition.getBeanName()); if(aliases == null) { @@ -75,6 +78,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return aliases == null ? null : Collections.unmodifiableList(aliases); } + @Override public void importProcessed(ImportDefinition importDefinition) { this.imports.add(importDefinition); } diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java index f17b3dfc89e..d5c2f1ce3d8 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java @@ -65,6 +65,7 @@ public final class DependenciesBean implements BeanFactoryAware { return spouse; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java index 09bd64d34df..4a1923181f5 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java @@ -389,14 +389,17 @@ public final class QualifierAnnotationTests { @Qualifier(FACTORY_QUALIFIER) public static class QualifiedFactoryBean implements FactoryBean { + @Override public Theta getObject() { return new Theta() {}; } + @Override public Class getObjectType() { return Theta.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java index cebec37bd66..98f04505649 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java @@ -256,6 +256,7 @@ class DummyBoImpl implements DummyBo { this.dao = dao; } + @Override public void something() { } @@ -430,6 +431,7 @@ class FixedMethodReplacer implements MethodReplacer { public static final String VALUE = "fixedMethodReplacer"; + @Override public Object reimplement(Object obj, Method method, Object[] args) throws Throwable { return VALUE; } @@ -513,6 +515,7 @@ abstract class OverrideOneMethod extends MethodReplaceCandidate implements Overr protected abstract TestBean protectedOverrideSingleton(); + @Override public TestBean getPrototypeDependency(Object someParam) { return new TestBean(); } @@ -540,6 +543,7 @@ abstract class OverrideOneMethod extends MethodReplaceCandidate implements Overr return "replaceMe:" + someParam; } + @Override public String replaceMe(String someParam) { return "replaceMe:" + someParam; } @@ -595,6 +599,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial return initMethodDeclared; } + @Override public void setBeanName(String name) { this.beanName = name; } @@ -603,6 +608,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.owningFactory = beanFactory; } @@ -617,6 +623,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial this.postProcessedBeforeInit = true; } + @Override public void afterPropertiesSet() { if (this.owningFactory == null) { throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean"); @@ -668,6 +675,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial } } + @Override public void destroy() { if (this.destroyed) { throw new IllegalStateException("Already destroyed"); @@ -682,6 +690,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial public static class PostProcessor implements BeanPostProcessor { + @Override public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException { if (bean instanceof ProtectedLifecycleBean) { ((ProtectedLifecycleBean) bean).postProcessBeforeInit(); @@ -689,6 +698,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String name) throws BeansException { if (bean instanceof ProtectedLifecycleBean) { ((ProtectedLifecycleBean) bean).postProcessAfterInit(); @@ -706,6 +716,7 @@ class ProtectedLifecycleBean implements BeanNameAware, BeanFactoryAware, Initial @SuppressWarnings("serial") class ReverseMethodReplacer implements MethodReplacer, Serializable { + @Override public Object reimplement(Object obj, Method method, Object[] args) throws Throwable { String s = (String) args[0]; return new StringBuffer(s).reverse().toString(); diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java index 91c0c5f4b3f..997523aaf6c 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java @@ -1511,6 +1511,7 @@ public final class XmlBeanFactoryTests { public Object lastArg; + @Override public Object reimplement(Object obj, Method method, Object[] args) throws Throwable { assertEquals(1, args.length); assertEquals("doSomething", method.getName()); @@ -1558,6 +1559,7 @@ public final class XmlBeanFactoryTests { constructed = true; } + @Override public void afterPropertiesSet() { if (this.initMethodInvoked) { fail(); @@ -1579,6 +1581,7 @@ public final class XmlBeanFactoryTests { this.initMethodInvoked = true; } + @Override public void destroy() { if (this.customDestroyed) { fail(); @@ -1611,6 +1614,7 @@ public final class XmlBeanFactoryTests { prepared = true; } + @Override public void destroy() { destroyed = true; } @@ -1627,6 +1631,7 @@ public final class XmlBeanFactoryTests { prepared = true; } + @Override public void destroy() { destroyed = true; } @@ -1654,12 +1659,14 @@ public final class XmlBeanFactoryTests { public void setInTheMiddleBean(InTheMiddleBean bean) { } + @Override public void afterPropertiesSet() { if (!(PreparingBean1.prepared && PreparingBean2.prepared)) { throw new IllegalStateException("Need prepared PreparingBeans!"); } } + @Override public void destroy() { if (PreparingBean1.destroyed || PreparingBean2.destroyed) { throw new IllegalStateException("Should not be destroyed after PreparingBeans"); @@ -1692,6 +1699,7 @@ public final class XmlBeanFactoryTests { this.dependingBean = dependingBean; } + @Override public void destroy() { if (this.dependingBean.destroyed) { throw new IllegalStateException("Should not be destroyed after DependingBean"); @@ -1794,10 +1802,12 @@ public final class XmlBeanFactoryTests { public static class WrappingPostProcessor implements BeanPostProcessor { + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { ProxyFactory pf = new ProxyFactory(bean); return pf.getProxy(); diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java index d2366862757..148c3d2e2b9 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java @@ -194,6 +194,7 @@ public class CustomNamespaceHandlerTests { super(CLASS.getClassLoader()); } + @Override public InputSource resolveEntity(String publicId, String systemId) throws IOException { InputSource source = super.resolveEntity(publicId, systemId); if (source == null) { @@ -216,6 +217,7 @@ public class CustomNamespaceHandlerTests { */ final class TestNamespaceHandler extends NamespaceHandlerSupport { + @Override public void init() { registerBeanDefinitionParser("testBean", new TestBeanDefinitionParser()); registerBeanDefinitionParser("person", new PersonDefinitionParser()); @@ -228,6 +230,7 @@ final class TestNamespaceHandler extends NamespaceHandlerSupport { private static class TestBeanDefinitionParser implements BeanDefinitionParser { + @Override public BeanDefinition parse(Element element, ParserContext parserContext) { RootBeanDefinition definition = new RootBeanDefinition(); definition.setBeanClass(TestBean.class); @@ -245,10 +248,12 @@ final class TestNamespaceHandler extends NamespaceHandlerSupport { private static final class PersonDefinitionParser extends AbstractSingleBeanDefinitionParser { + @Override protected Class getBeanClass(Element element) { return TestBean.class; } + @Override protected void doParse(Element element, BeanDefinitionBuilder builder) { builder.addPropertyValue("name", element.getAttribute("name")); builder.addPropertyValue("age", element.getAttribute("age")); @@ -257,6 +262,7 @@ final class TestNamespaceHandler extends NamespaceHandlerSupport { private static class PropertyModifyingBeanDefinitionDecorator implements BeanDefinitionDecorator { + @Override public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext parserContext) { Element element = (Element) node; BeanDefinition def = definition.getBeanDefinition(); @@ -272,6 +278,7 @@ final class TestNamespaceHandler extends NamespaceHandlerSupport { private static class DebugBeanDefinitionDecorator extends AbstractInterceptorDrivenBeanDefinitionDecorator { + @Override protected BeanDefinition createInterceptorDefinition(Node node) { return new RootBeanDefinition(DebugInterceptor.class); } @@ -279,6 +286,7 @@ final class TestNamespaceHandler extends NamespaceHandlerSupport { private static class NopInterceptorBeanDefinitionDecorator extends AbstractInterceptorDrivenBeanDefinitionDecorator { + @Override protected BeanDefinition createInterceptorDefinition(Node node) { return new RootBeanDefinition(NopInterceptor.class); } @@ -286,6 +294,7 @@ final class TestNamespaceHandler extends NamespaceHandlerSupport { private static class ObjectNameBeanDefinitionDecorator implements BeanDefinitionDecorator { + @Override public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder definition, ParserContext parserContext) { Attr objectNameAttribute = (Attr) node; definition.getBeanDefinition().setAttribute("objectName", objectNameAttribute.getValue()); diff --git a/spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java b/spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java index 80fa6f50e21..4d4ea48a619 100644 --- a/spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java +++ b/spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java @@ -32,105 +32,127 @@ public class AnnotatedClassCacheableService implements CacheableService private final AtomicLong counter = new AtomicLong(); public static final AtomicLong nullInvocations = new AtomicLong(); + @Override public Object cache(Object arg1) { return counter.getAndIncrement(); } + @Override public Object conditional(int field) { return null; } + @Override @CacheEvict("default") public void invalidate(Object arg1) { } + @Override @CacheEvict("default") public void evictWithException(Object arg1) { throw new RuntimeException("exception thrown - evict should NOT occur"); } + @Override @CacheEvict(value = "default", allEntries = true) public void evictAll(Object arg1) { } + @Override @CacheEvict(value = "default", beforeInvocation = true) public void evictEarly(Object arg1) { throw new RuntimeException("exception thrown - evict should still occur"); } + @Override @CacheEvict(value = "default", key = "#p0") public void evict(Object arg1, Object arg2) { } + @Override @CacheEvict(value = "default", key = "#p0", beforeInvocation = true) public void invalidateEarly(Object arg1, Object arg2) { throw new RuntimeException("exception thrown - evict should still occur"); } + @Override @Cacheable(value = "default", key = "#p0") public Object key(Object arg1, Object arg2) { return counter.getAndIncrement(); } + @Override @Cacheable(value = "default", key = "#root.methodName + #root.caches[0].name") public Object name(Object arg1) { return counter.getAndIncrement(); } + @Override @Cacheable(value = "default", key = "#root.methodName + #root.method.name + #root.targetClass + #root.target") public Object rootVars(Object arg1) { return counter.getAndIncrement(); } + @Override @CachePut("default") public Object update(Object arg1) { return counter.getAndIncrement(); } + @Override @CachePut(value = "default", condition = "#arg.equals(3)") public Object conditionalUpdate(Object arg) { return arg; } + @Override public Object nullValue(Object arg1) { nullInvocations.incrementAndGet(); return null; } + @Override public Number nullInvocations() { return nullInvocations.get(); } + @Override public Long throwChecked(Object arg1) throws Exception { throw new UnsupportedOperationException(arg1.toString()); } + @Override public Long throwUnchecked(Object arg1) { throw new UnsupportedOperationException(); } // multi annotations + @Override @Caching(cacheable = { @Cacheable("primary"), @Cacheable("secondary") }) public Object multiCache(Object arg1) { return counter.getAndIncrement(); } + @Override @Caching(evict = { @CacheEvict("primary"), @CacheEvict(value = "secondary", key = "#a0"), @CacheEvict(value = "primary", key = "#p0 + 'A'") }) public Object multiEvict(Object arg1) { return counter.getAndIncrement(); } + @Override @Caching(cacheable = { @Cacheable(value = "primary", key = "#root.methodName") }, evict = { @CacheEvict("secondary") }) public Object multiCacheAndEvict(Object arg1) { return counter.getAndIncrement(); } + @Override @Caching(cacheable = { @Cacheable(value = "primary", condition = "#a0 == 3") }, evict = { @CacheEvict("secondary") }) public Object multiConditionalCacheAndEvict(Object arg1) { return counter.getAndIncrement(); } + @Override @Caching(put = { @CachePut("primary"), @CachePut("secondary") }) public Object multiUpdate(Object arg1) { return arg1; diff --git a/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java b/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java index fc46127cd47..b3a19df1897 100644 --- a/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java +++ b/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java @@ -33,83 +33,100 @@ public class DefaultCacheableService implements CacheableService { private final AtomicLong counter = new AtomicLong(); private final AtomicLong nullInvocations = new AtomicLong(); + @Override @Cacheable("default") public Long cache(Object arg1) { return counter.getAndIncrement(); } + @Override @CacheEvict("default") public void invalidate(Object arg1) { } + @Override @CacheEvict("default") public void evictWithException(Object arg1) { throw new RuntimeException("exception thrown - evict should NOT occur"); } + @Override @CacheEvict(value = "default", allEntries = true) public void evictAll(Object arg1) { } + @Override @CacheEvict(value = "default", beforeInvocation = true) public void evictEarly(Object arg1) { throw new RuntimeException("exception thrown - evict should still occur"); } + @Override @CacheEvict(value = "default", key = "#p0") public void evict(Object arg1, Object arg2) { } + @Override @CacheEvict(value = "default", key = "#p0", beforeInvocation = true) public void invalidateEarly(Object arg1, Object arg2) { throw new RuntimeException("exception thrown - evict should still occur"); } + @Override @Cacheable(value = "default", condition = "#classField == 3") public Long conditional(int classField) { return counter.getAndIncrement(); } + @Override @Cacheable(value = "default", key = "#p0") public Long key(Object arg1, Object arg2) { return counter.getAndIncrement(); } + @Override @Cacheable(value = "default", key = "#root.methodName") public Long name(Object arg1) { return counter.getAndIncrement(); } + @Override @Cacheable(value = "default", key = "#root.methodName + #root.method.name + #root.targetClass + #root.target") public Long rootVars(Object arg1) { return counter.getAndIncrement(); } + @Override @CachePut("default") public Long update(Object arg1) { return counter.getAndIncrement(); } + @Override @CachePut(value = "default", condition = "#arg.equals(3)") public Long conditionalUpdate(Object arg) { return Long.valueOf(arg.toString()); } + @Override @Cacheable("default") public Long nullValue(Object arg1) { nullInvocations.incrementAndGet(); return null; } + @Override public Number nullInvocations() { return nullInvocations.get(); } + @Override @Cacheable("default") public Long throwChecked(Object arg1) throws Exception { throw new Exception(arg1.toString()); } + @Override @Cacheable("default") public Long throwUnchecked(Object arg1) { throw new UnsupportedOperationException(arg1.toString()); @@ -117,26 +134,31 @@ public class DefaultCacheableService implements CacheableService { // multi annotations + @Override @Caching(cacheable = { @Cacheable("primary"), @Cacheable("secondary") }) public Long multiCache(Object arg1) { return counter.getAndIncrement(); } + @Override @Caching(evict = { @CacheEvict("primary"), @CacheEvict(value = "secondary", key = "#p0"), @CacheEvict(value = "primary", key = "#p0 + 'A'") }) public Long multiEvict(Object arg1) { return counter.getAndIncrement(); } + @Override @Caching(cacheable = { @Cacheable(value = "primary", key = "#root.methodName") }, evict = { @CacheEvict("secondary") }) public Long multiCacheAndEvict(Object arg1) { return counter.getAndIncrement(); } + @Override @Caching(cacheable = { @Cacheable(value = "primary", condition = "#p0 == 3") }, evict = { @CacheEvict("secondary") }) public Long multiConditionalCacheAndEvict(Object arg1) { return counter.getAndIncrement(); } + @Override @Caching(put = { @CachePut("primary"), @CachePut("secondary") }) public Long multiUpdate(Object arg1) { return Long.valueOf(arg1.toString()); diff --git a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java index 29114dd9678..3e9138fd5e2 100644 --- a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java +++ b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java @@ -115,6 +115,7 @@ public class EnableCachingTests extends AbstractAnnotationTests { @Configuration @EnableCaching static class EnableCachingConfig implements CachingConfigurer { + @Override @Bean public CacheManager cacheManager() { SimpleCacheManager cm = new SimpleCacheManager(); @@ -135,6 +136,7 @@ public class EnableCachingTests extends AbstractAnnotationTests { return new AnnotatedClassCacheableService(); } + @Override @Bean public KeyGenerator keyGenerator() { return new SomeKeyGenerator(); @@ -174,9 +176,11 @@ public class EnableCachingTests extends AbstractAnnotationTests { @Bean public CacheManager cm2() { return new NoOpCacheManager(); } + @Override public CacheManager cacheManager() { return cm1(); } + @Override public KeyGenerator keyGenerator() { return null; } diff --git a/spring-context/src/test/java/org/springframework/context/ACATester.java b/spring-context/src/test/java/org/springframework/context/ACATester.java index 3faf3ba364b..e2603726ccf 100644 --- a/spring-context/src/test/java/org/springframework/context/ACATester.java +++ b/spring-context/src/test/java/org/springframework/context/ACATester.java @@ -22,6 +22,7 @@ public class ACATester implements ApplicationContextAware { private ApplicationContext ac; + @Override public void setApplicationContext(ApplicationContext ctx) throws ApplicationContextException { // check reinitialization if (this.ac != null) { diff --git a/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java index a0493b62ec2..fe8201644ba 100644 --- a/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java @@ -39,10 +39,12 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe protected TestListener parentListener = new TestListener(); + @Override protected void setUp() throws Exception { this.applicationContext = createContext(); } + @Override protected BeanFactory getBeanFactory() { return applicationContext; } diff --git a/spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java b/spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java index f525d38fe16..8ec1c33a345 100644 --- a/spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java +++ b/spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java @@ -26,6 +26,7 @@ public class BeanThatBroadcasts implements ApplicationContextAware { public int receivedCount; + @Override public void setApplicationContext(ApplicationContext applicationContext) { this.applicationContext = applicationContext; if (applicationContext.getDisplayName().indexOf("listener") != -1) { diff --git a/spring-context/src/test/java/org/springframework/context/BeanThatListens.java b/spring-context/src/test/java/org/springframework/context/BeanThatListens.java index 3bda3d37230..9ca20496a31 100644 --- a/spring-context/src/test/java/org/springframework/context/BeanThatListens.java +++ b/spring-context/src/test/java/org/springframework/context/BeanThatListens.java @@ -43,6 +43,7 @@ public class BeanThatListens implements ApplicationListener { } + @Override public void onApplicationEvent(ApplicationEvent event) { eventCount++; if (beanThatBroadcasts != null) { diff --git a/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java index 720a7cd9b4b..68664e6a01b 100644 --- a/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java +++ b/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java @@ -30,18 +30,21 @@ public class LifecycleContextBean extends LifecycleBean implements ApplicationCo protected ApplicationContext owningContext; + @Override public void setBeanFactory(BeanFactory beanFactory) { super.setBeanFactory(beanFactory); if (this.owningContext != null) throw new RuntimeException("Factory called setBeanFactory after setApplicationContext"); } + @Override public void afterPropertiesSet() { super.afterPropertiesSet(); if (this.owningContext == null) throw new RuntimeException("Factory didn't call setAppliationContext before afterPropertiesSet on lifecycle bean"); } + @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { if (this.owningFactory == null) throw new RuntimeException("Factory called setApplicationContext before setBeanFactory"); diff --git a/spring-context/src/test/java/org/springframework/context/TestListener.java b/spring-context/src/test/java/org/springframework/context/TestListener.java index 834439484c9..c4d12a1881d 100644 --- a/spring-context/src/test/java/org/springframework/context/TestListener.java +++ b/spring-context/src/test/java/org/springframework/context/TestListener.java @@ -34,6 +34,7 @@ public class TestListener implements ApplicationListener { eventCount = 0; } + @Override public void onApplicationEvent(ApplicationEvent e) { ++eventCount; } diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java b/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java index 96750057f5c..e4d3dfbe147 100644 --- a/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java +++ b/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java @@ -47,6 +47,7 @@ public class ContextSingletonBeanFactoryLocatorTests extends SingletonBeanFactor new XmlBeanFactory(new ClassPathResource("/org/springframework/beans/factory/access/beans2.xml")); } + @Override @Test public void testBasicFunctionality() { ContextSingletonBeanFactoryLocator facLoc = new ContextSingletonBeanFactoryLocator( @@ -71,6 +72,7 @@ public class ContextSingletonBeanFactoryLocatorTests extends SingletonBeanFactor * 2nd and subsequent calls will actually get back same locator instance. This is not * really an issue, since the contained bean factories will still be loaded and released. */ + @Override @Test public void testGetInstance() { // Try with and without 'classpath*:' prefix, and with 'classpath:' prefix. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java index a829ee49f97..f82a42fc5c6 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java @@ -159,18 +159,22 @@ public class AnnotationConfigApplicationContextTests { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); context.register(AutowiredConfig.class); context.getBeanFactory().addBeanPostProcessor(new BeanPostProcessor() { + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) { return (bean instanceof TestBean ? null : bean); } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) { return bean; } }); context.getBeanFactory().addBeanPostProcessor(new BeanPostProcessor() { + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) { bean.getClass().getName(); return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) { bean.getClass().getName(); return bean; @@ -230,14 +234,17 @@ public class AnnotationConfigApplicationContextTests { static class UntypedFactoryBean implements FactoryBean { + @Override public Object getObject() { return null; } + @Override public Class getObjectType() { return null; } + @Override public boolean isSingleton() { return false; } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java index 87921285875..e225b5cfe99 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java @@ -151,6 +151,7 @@ public class AnnotationProcessorPerformanceTests { private static class ResourceAnnotatedTestBean extends TestBean { + @Override @Resource @Required public void setSpouse(ITestBean spouse) { super.setSpouse(spouse); @@ -160,6 +161,7 @@ public class AnnotationProcessorPerformanceTests { private static class AutowiredAnnotatedTestBean extends TestBean { + @Override @Autowired @Required public void setSpouse(ITestBean spouse) { super.setSpouse(spouse); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java index b4135bf6468..5029e1c7e6d 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java @@ -207,6 +207,7 @@ public class CommonAnnotationBeanPostProcessorTests { bf.registerResolvableDependency(BeanFactory.class, bf); bf.registerResolvableDependency(INestedTestBean.class, new ObjectFactory() { + @Override public Object getObject() throws BeansException { return new NestedTestBean(); } @@ -452,6 +453,7 @@ public class CommonAnnotationBeanPostProcessorTests { public static class InitDestroyBeanPostProcessor implements DestructionAwareBeanPostProcessor { + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { if (bean instanceof AnnotatedInitDestroyBean) { assertFalse(((AnnotatedInitDestroyBean) bean).initCalled); @@ -459,6 +461,7 @@ public class CommonAnnotationBeanPostProcessorTests { return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { if (bean instanceof AnnotatedInitDestroyBean) { assertTrue(((AnnotatedInitDestroyBean) bean).initCalled); @@ -466,6 +469,7 @@ public class CommonAnnotationBeanPostProcessorTests { return bean; } + @Override public void postProcessBeforeDestruction(Object bean, String beanName) throws BeansException { if (bean instanceof AnnotatedInitDestroyBean) { assertFalse(((AnnotatedInitDestroyBean) bean).destroyCalled); @@ -566,6 +570,7 @@ public class CommonAnnotationBeanPostProcessorTests { @Resource private BeanFactory beanFactory; + @Override @Resource public void setTestBean2(TestBean testBean2) { super.setTestBean2(testBean2); @@ -597,6 +602,7 @@ public class CommonAnnotationBeanPostProcessorTests { return testBean6; } + @Override @PostConstruct protected void init2() { if (this.testBean3 == null || this.testBean4 == null) { @@ -605,6 +611,7 @@ public class CommonAnnotationBeanPostProcessorTests { super.init2(); } + @Override @PreDestroy protected void destroy2() { super.destroy2(); @@ -627,6 +634,7 @@ public class CommonAnnotationBeanPostProcessorTests { @Resource private BeanFactory beanFactory; + @Override @EJB public void setTestBean2(TestBean testBean2) { super.setTestBean2(testBean2); @@ -650,6 +658,7 @@ public class CommonAnnotationBeanPostProcessorTests { return testBean4; } + @Override @PostConstruct protected void init2() { if (this.testBean3 == null || this.testBean4 == null) { @@ -658,6 +667,7 @@ public class CommonAnnotationBeanPostProcessorTests { super.init2(); } + @Override @PreDestroy protected void destroy2() { super.destroy2(); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java index 75bef42a0f8..b377f6b4375 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java @@ -147,6 +147,7 @@ public class ComponentScanParserTests { public static class CustomTypeFilter implements TypeFilter { + @Override public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) { return metadataReader.getClassMetadata().getClassName().contains("Custom"); } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java index d917b0d6086..3e672f556c4 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java @@ -75,6 +75,7 @@ public class ConfigurationClassAndBFPPTests { @Bean public BeanFactoryPostProcessor bfpp() { return new BeanFactoryPostProcessor() { + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { // no-op } @@ -90,6 +91,7 @@ public class ConfigurationClassAndBFPPTests { @Bean public static final BeanFactoryPostProcessor bfpp() { return new BeanFactoryPostProcessor() { + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { // no-op } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndAutowiringTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndAutowiringTests.java index 14d1932dca6..d79256a53ba 100755 --- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndAutowiringTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndAutowiringTests.java @@ -95,12 +95,15 @@ class DummyBean { class MyFactoryBean implements FactoryBean { + @Override public String getObject() throws Exception { return "foo"; } + @Override public Class getObjectType() { return String.class; } + @Override public boolean isSingleton() { return true; } @@ -115,15 +118,18 @@ class MyParameterizedFactoryBean implements FactoryBean { this.obj = obj; } + @Override public T getObject() throws Exception { return obj; } + @Override @SuppressWarnings("unchecked") public Class getObjectType() { return (Class)obj.getClass(); } + @Override public boolean isSingleton() { return true; } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java index b2c1db67d97..3fc42a1f147 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java @@ -63,14 +63,17 @@ class Bar { class FooFactoryBean implements FactoryBean { + @Override public Foo getObject() { return new Foo(); } + @Override public Class getObjectType() { return Foo.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java index d89deb4415c..f8613d29ace 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java @@ -140,6 +140,7 @@ public class DestroyMethodInferenceTests { static class WithInheritedCloseMethod implements Closeable { boolean closed = false; + @Override public void close() throws IOException { closed = true; } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java index df6b5fb8e96..fb0683ed279 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java @@ -70,6 +70,7 @@ public class EnableLoadTimeWeavingTests { @Configuration @EnableLoadTimeWeaving(aspectjWeaving=AspectJWeaving.DISABLED) static class EnableLTWConfig_withAjWeavingDisabled implements LoadTimeWeavingConfigurer { + @Override public LoadTimeWeaver getLoadTimeWeaver() { LoadTimeWeaver mockLTW = createMock(LoadTimeWeaver.class); // no expectations -> a class file transformer should NOT be added @@ -81,6 +82,7 @@ public class EnableLoadTimeWeavingTests { @Configuration @EnableLoadTimeWeaving(aspectjWeaving=AspectJWeaving.AUTODETECT) static class EnableLTWConfig_withAjWeavingAutodetect implements LoadTimeWeavingConfigurer { + @Override public LoadTimeWeaver getLoadTimeWeaver() { LoadTimeWeaver mockLTW = createMock(LoadTimeWeaver.class); // no expectations -> a class file transformer should NOT be added @@ -93,6 +95,7 @@ public class EnableLoadTimeWeavingTests { @Configuration @EnableLoadTimeWeaving(aspectjWeaving=AspectJWeaving.ENABLED) static class EnableLTWConfig_withAjWeavingEnabled implements LoadTimeWeavingConfigurer { + @Override public LoadTimeWeaver getLoadTimeWeaver() { LoadTimeWeaver mockLTW = createMock(LoadTimeWeaver.class); mockLTW.addTransformer(isA(ClassFileTransformer.class)); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java b/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java index 4546a22de08..a52d8cc5045 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java @@ -31,6 +31,7 @@ public class FooServiceDependentConverter implements Converter initMethods = new ArrayList(); final List destroyMethods = new ArrayList(); + @Override @PostConstruct public void afterPropertiesSet() throws Exception { this.initMethods.add("afterPropertiesSet"); } + @Override @PreDestroy public void destroy() throws Exception { this.destroyMethods.add("destroy"); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java index 50453f6b5d2..68dd81c5af2 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java @@ -85,14 +85,17 @@ public class Spr6602Tests { public static class BarFactory implements FactoryBean { + @Override public Bar getObject() throws Exception { return new Bar(); } + @Override public Class getObjectType() { return Bar.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java b/spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java index 1f77d726b9a..6bed19ab6ea 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java @@ -24,6 +24,7 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; */ public class TestBeanNameGenerator extends AnnotationBeanNameGenerator { + @Override public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) { String beanName = super.generateBeanName(definition, registry); return "testing." + beanName; diff --git a/spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java b/spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java index 5471d438af4..eef18312ba0 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java @@ -23,6 +23,7 @@ import org.springframework.beans.factory.config.BeanDefinition; */ public class TestScopeMetadataResolver implements ScopeMetadataResolver { + @Override public ScopeMetadata resolveScopeMetadata(BeanDefinition beanDefinition) { ScopeMetadata metadata = new ScopeMetadata(); metadata.setScopeName("myCustomScope"); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationBeanNameTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationBeanNameTests.java index 445397c384d..39c2654d0b1 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationBeanNameTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationBeanNameTests.java @@ -65,6 +65,7 @@ public class ConfigurationBeanNameTests { public void registerOuterConfig_withBeanNameGenerator() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); ctx.setBeanNameGenerator(new AnnotationBeanNameGenerator() { + @Override public String generateBeanName( BeanDefinition definition, BeanDefinitionRegistry registry) { return "custom-" + super.generateBeanName(definition, registry); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java index 1d21211ad79..d198b49180b 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java @@ -70,6 +70,7 @@ public class ConfigurationClassCglibCallbackDeregistrationTests { @Configuration static class DisposableConfig implements DisposableBean { boolean destroyed = false; + @Override public void destroy() throws Exception { this.destroyed = true; } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java index 8073f92b831..6e8f7c649ce 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java @@ -284,12 +284,14 @@ public class ConfigurationClassProcessingTests { public void setNameSuffix(String nameSuffix) { this.nameSuffix = nameSuffix; } + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) { if (bean instanceof ITestBean) { ((ITestBean) bean).setName(((ITestBean) bean).getName() + nameSuffix); } return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) { return bean; } @@ -302,6 +304,7 @@ public class ConfigurationClassProcessingTests { //@Bean public BeanFactoryPostProcessor beanFactoryPostProcessor() { return new BeanFactoryPostProcessor() { + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) { BeanDefinition bd = beanFactory.getBeanDefinition("beanPostProcessor"); bd.getPropertyValues().addPropertyValue("nameSuffix", "-processed-" + myProp); @@ -334,6 +337,7 @@ public class ConfigurationClassProcessingTests { super.setSpouse(spouse); } + @Override public void onApplicationEvent(ContextRefreshedEvent event) { this.refreshed = true; } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java index b0d617e9cf3..6be61e22c5e 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java @@ -379,6 +379,7 @@ public class ScopingTests { private Map beans = new HashMap(); + @Override public Object get(String name, ObjectFactory objectFactory) { if (createNewScope) { beans.clear(); @@ -396,18 +397,22 @@ public class ScopingTests { return beans.get(name); } + @Override public String getConversationId() { return null; } + @Override public void registerDestructionCallback(String name, Runnable callback) { // do nothing } + @Override public Object remove(String name) { return beans.remove(name); } + @Override public Object resolveContextualObject(String key) { return null; } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java index 9c8f2400035..910e71b9c96 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java @@ -67,6 +67,7 @@ class MyPostProcessor implements BeanFactoryPostProcessor { public MyPostProcessor(Dependency someDependency) { } + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { AbstractBeanDefinition bd = (AbstractBeanDefinition) beanFactory.getBeanDefinition("someDependency"); bd.setDescription("post processed by MyPostProcessor"); diff --git a/spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java b/spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java index 64f491bd4e9..1363f45d896 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java +++ b/spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java @@ -28,6 +28,7 @@ import example.scannable.FooDao; @Qualifier("testing") public class StubFooDao implements FooDao { + @Override public String findFoo(int id) { return "bar"; } diff --git a/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java b/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java index 67f07601774..6e1461dd361 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java +++ b/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java @@ -24,6 +24,7 @@ import example.scannable.FooDao; @MyRepository public class OtherFooDao implements FooDao { + @Override public String findFoo(int id) { return "other"; } diff --git a/spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java b/spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java index 5248cb2644a..654ffa9153f 100644 --- a/spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java +++ b/spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java @@ -23,6 +23,7 @@ import org.springframework.core.convert.converter.Converter; */ public class StringToBarConverter implements Converter { + @Override public Bar convert(String source) { return new Bar(source); } diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java index 24dec9ad54d..1811a789381 100644 --- a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java @@ -214,10 +214,12 @@ public class ApplicationContextEventTests { public final Set seenEvents = new HashSet(); + @Override public void onApplicationEvent(ApplicationEvent event) { this.seenEvents.add(event); } + @Override public int getOrder() { return 0; } @@ -230,6 +232,7 @@ public class ApplicationContextEventTests { public static abstract class MyOrderedListenerBase implements MyOrderedListenerIfc { + @Override public int getOrder() { return 1; } @@ -244,6 +247,7 @@ public class ApplicationContextEventTests { this.otherListener = otherListener; } + @Override public void onApplicationEvent(MyEvent event) { assertTrue(otherListener.seenEvents.contains(event)); } @@ -254,6 +258,7 @@ public class ApplicationContextEventTests { public static final Set seenEvents = new HashSet(); + @Override public void onApplicationEvent(ApplicationEvent event) { seenEvents.add(event); } diff --git a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java index 4e1f90468cf..3cf6771099a 100644 --- a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java @@ -90,6 +90,7 @@ public class EventPublicationInterceptorTests { final TestListener listener = new TestListener(); class TestContext extends StaticApplicationContext { + @Override protected void onRefresh() throws BeansException { addListener(listener); } @@ -140,14 +141,17 @@ public class EventPublicationInterceptorTests { public static class FactoryBeanTestListener extends TestListener implements FactoryBean { + @Override public Object getObject() throws Exception { return "test"; } + @Override public Class getObjectType() { return String.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java b/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java index b1bbb815acb..c6f95b24bba 100644 --- a/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java @@ -71,6 +71,7 @@ public class LifecycleEventTests extends TestCase { private int stoppedCount; + @Override public void onApplicationEvent(ApplicationEvent event) { if (event instanceof ContextStartedEvent) { this.context = ((ContextStartedEvent) event).getApplicationContext(); @@ -100,14 +101,17 @@ public class LifecycleEventTests extends TestCase { private boolean running; + @Override public boolean isRunning() { return this.running; } + @Override public void start() { this.running = true; } + @Override public void stop() { this.running = false; } diff --git a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java index cfd70979e98..16eccd8d33e 100644 --- a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java +++ b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java @@ -57,14 +57,18 @@ public class ApplicationContextExpressionTests { AnnotationConfigUtils.registerAnnotationConfigProcessors(ac); ac.getBeanFactory().registerScope("myScope", new Scope() { + @Override public Object get(String name, ObjectFactory objectFactory) { return objectFactory.getObject(); } + @Override public Object remove(String name) { return null; } + @Override public void registerDestructionCallback(String name, Runnable callback) { } + @Override public Object resolveContextualObject(String key) { if (key.equals("mySpecialAttr")) { return "42"; @@ -73,6 +77,7 @@ public class ApplicationContextExpressionTests { return null; } } + @Override public String getConversationId() { return null; } diff --git a/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java index 2e36dde141e..94d465bcdaf 100644 --- a/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java @@ -104,6 +104,7 @@ public class BeanFactoryPostProcessorTests { public boolean wasCalled = false; + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) { wasCalled = true; } diff --git a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java index 68ddae1f8c2..903ff415329 100644 --- a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java @@ -320,6 +320,7 @@ public final class ClassPathXmlApplicationContextTests { @Test public void testResourceAndInputStream() throws IOException { ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(RESOURCE_CONTEXT) { + @Override public Resource getResource(String location) { if (TEST_PROPERTIES.equals(location)) { return new ClassPathResource(TEST_PROPERTIES, ClassPathXmlApplicationContextTests.class); diff --git a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java index 34588e19a7a..9ee0025433f 100644 --- a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java @@ -54,14 +54,17 @@ public class ConversionServiceFactoryBeanTests { ConversionServiceFactoryBean factory = new ConversionServiceFactoryBean(); Set converters = new HashSet(); converters.add(new Converter() { + @Override public Foo convert(String source) { return new Foo(); } }); converters.add(new ConverterFactory() { + @Override public Converter getConverter(Class targetType) { return new Converter () { @SuppressWarnings("unchecked") + @Override public T convert(String source) { return (T) new Bar(); } @@ -69,9 +72,11 @@ public class ConversionServiceFactoryBeanTests { } }); converters.add(new GenericConverter() { + @Override public Set getConvertibleTypes() { return Collections.singleton(new ConvertiblePair(String.class, Baz.class)); } + @Override public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { return new Baz(); } diff --git a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java index a561e2cbf38..cc345c79e07 100644 --- a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java @@ -585,10 +585,12 @@ public class DefaultLifecycleProcessorTests { this.stoppedBeans = stoppedBeans; } + @Override public boolean isRunning() { return this.running; } + @Override public void start() { if (this.startedBeans != null) { this.startedBeans.add(this); @@ -596,6 +598,7 @@ public class DefaultLifecycleProcessorTests { this.running = true; } + @Override public void stop() { if (this.stoppedBeans != null) { this.stoppedBeans.add(this); @@ -627,10 +630,12 @@ public class DefaultLifecycleProcessorTests { this.shutdownDelay = shutdownDelay; } + @Override public int getPhase() { return this.phase; } + @Override public boolean isAutoStartup() { return this.autoStartup; } @@ -639,12 +644,14 @@ public class DefaultLifecycleProcessorTests { this.autoStartup = autoStartup; } + @Override public void stop(final Runnable callback) { // calling stop() before the delay to preserve // invocation order in the 'stoppedBeans' list stop(); final int delay = this.shutdownDelay; new Thread(new Runnable() { + @Override public void run() { try { Thread.sleep(delay); @@ -665,27 +672,33 @@ public class DefaultLifecycleProcessorTests { public boolean running = false; + @Override public boolean isAutoStartup() { return true; } + @Override public void stop(Runnable callback) { this.running = false; callback.run(); } + @Override public void start() { this.running = true; } + @Override public void stop() { this.running = false; } + @Override public boolean isRunning() { return this.running; } + @Override public int getPhase() { return 0; } @@ -698,39 +711,48 @@ public class DefaultLifecycleProcessorTests { DummySmartLifecycleBean bean = new DummySmartLifecycleBean(); + @Override public Object getObject() throws Exception { return this.bean; } + @Override public Class getObjectType() { return DummySmartLifecycleBean.class; } + @Override public boolean isSingleton() { return true; } + @Override public boolean isAutoStartup() { return true; } + @Override public void stop(Runnable callback) { this.running = false; callback.run(); } + @Override public void start() { this.running = true; } + @Override public void stop() { this.running = false; } + @Override public boolean isRunning() { return this.running; } + @Override public int getPhase() { return 0; } diff --git a/spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java b/spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java index a545e69e688..cd68925cc97 100644 --- a/spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java +++ b/spring-context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java @@ -10,18 +10,22 @@ import org.springframework.context.ApplicationListener; */ public class FactoryBeanAndApplicationListener implements FactoryBean, ApplicationListener { + @Override public String getObject() throws Exception { return ""; } + @Override public Class getObjectType() { return String.class; } + @Override public boolean isSingleton() { return true; } + @Override public void onApplicationEvent(ApplicationEvent event) { } diff --git a/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java b/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java index 44dcf38bd68..24e94a154b9 100644 --- a/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java +++ b/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java @@ -43,15 +43,18 @@ public class LifecycleTestBean implements Lifecycle { return stopOrder; } + @Override public boolean isRunning() { return this.running; } + @Override public void start() { this.startOrder = ++startCounter; this.running = true; } + @Override public void stop() { this.stopOrder = ++stopCounter; this.running = false; diff --git a/spring-context/src/test/java/org/springframework/context/support/Logic.java b/spring-context/src/test/java/org/springframework/context/support/Logic.java index 325ebc10a48..71d169120ec 100644 --- a/spring-context/src/test/java/org/springframework/context/support/Logic.java +++ b/spring-context/src/test/java/org/springframework/context/support/Logic.java @@ -34,6 +34,7 @@ public class Logic implements BeanNameAware { /* (non-Javadoc) * @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String) */ + @Override public void setBeanName(String name) { this.name = name; } diff --git a/spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java b/spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java index f5834e8e6f6..91ff6bd0229 100644 --- a/spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java +++ b/spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java @@ -25,6 +25,7 @@ import org.springframework.core.io.Resource; */ public class ResourceConverter implements Converter { + @Override public Resource convert(String source) { return new FileSystemResource(source + ".xml"); } diff --git a/spring-context/src/test/java/org/springframework/context/support/Service.java b/spring-context/src/test/java/org/springframework/context/support/Service.java index 8778978bd80..a0be957e75c 100644 --- a/spring-context/src/test/java/org/springframework/context/support/Service.java +++ b/spring-context/src/test/java/org/springframework/context/support/Service.java @@ -40,10 +40,12 @@ public class Service implements ApplicationContextAware, MessageSourceAware, Dis private boolean properlyDestroyed = false; + @Override public void setApplicationContext(ApplicationContext applicationContext) { this.applicationContext = applicationContext; } + @Override public void setMessageSource(MessageSource messageSource) { if (this.messageSource != null) { throw new IllegalArgumentException("MessageSource should not be set twice"); @@ -64,9 +66,11 @@ public class Service implements ApplicationContextAware, MessageSourceAware, Dis } + @Override public void destroy() { this.properlyDestroyed = true; Thread thread = new Thread() { + @Override public void run() { Assert.isTrue(applicationContext.getBean("messageSource") instanceof StaticMessageSource); try { diff --git a/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java b/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java index 01d95795fa5..42d89e92545 100644 --- a/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java +++ b/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java @@ -49,11 +49,13 @@ public class SimpleThreadScopeTest { public void getMultipleInstances() throws Exception { final TestBean[] beans = new TestBean[2]; Thread thread1 = new Thread(new Runnable() { + @Override public void run() { beans[0] = applicationContext.getBean("threadScopedObject", TestBean.class); } }); Thread thread2 = new Thread(new Runnable() { + @Override public void run() { beans[1] = applicationContext.getBean("threadScopedObject", TestBean.class); } diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java index 9ac74335896..fc211895acd 100644 --- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java @@ -43,6 +43,7 @@ public class StaticApplicationContextMulticasterTests extends AbstractApplicatio protected StaticApplicationContext sac; /** Run for each test */ + @Override protected ConfigurableApplicationContext createContext() throws Exception { StaticApplicationContext parent = new StaticApplicationContext(); Map m = new HashMap(); @@ -73,10 +74,12 @@ public class StaticApplicationContextMulticasterTests extends AbstractApplicatio } /** Overridden */ + @Override public void testCount() { assertCount(15); } + @Override public void testEvents() throws Exception { TestApplicationEventMulticaster.counter = 0; super.testEvents(); @@ -88,6 +91,7 @@ public class StaticApplicationContextMulticasterTests extends AbstractApplicatio private static int counter = 0; + @Override public void multicastEvent(ApplicationEvent event) { super.multicastEvent(event); counter++; diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java index 2dba7fc9eac..b6f936dd1aa 100644 --- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java @@ -39,6 +39,7 @@ public class StaticApplicationContextTests extends AbstractApplicationContextTes protected StaticApplicationContext sac; /** Run for each test */ + @Override protected ConfigurableApplicationContext createContext() throws Exception { StaticApplicationContext parent = new StaticApplicationContext(); Map m = new HashMap(); @@ -66,6 +67,7 @@ public class StaticApplicationContextTests extends AbstractApplicationContextTes } /** Overridden */ + @Override public void testCount() { assertCount(15); } diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java index 73d0cab6517..8469cbd64f2 100644 --- a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java @@ -49,11 +49,13 @@ public class StaticMessageSourceTests extends AbstractApplicationContextTests { protected StaticApplicationContext sac; /** Overridden */ + @Override public void testCount() { // These are only checked for current Ctx (not parent ctx) assertCount(15); } + @Override public void testMessageSource() throws NoSuchMessageException { // Do nothing here since super is looking for errorCodes we // do NOT have in the Context @@ -195,6 +197,7 @@ public class StaticMessageSourceTests extends AbstractApplicationContextTests { } /** Run for each test */ + @Override protected ConfigurableApplicationContext createContext() throws Exception { StaticApplicationContext parent = new StaticApplicationContext(); diff --git a/spring-context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java b/spring-context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java index 0fa4b0e392e..f51d024715b 100644 --- a/spring-context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java +++ b/spring-context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java @@ -28,6 +28,7 @@ public class TestProxyFactoryBean extends AbstractSingletonProxyFactoryBean impl return new NoOpAdvice(); } + @Override public void setBeanFactory(BeanFactory beanFactory) { } diff --git a/spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java b/spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java index acec31ff7c1..701f7518ee1 100644 --- a/spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java +++ b/spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java @@ -23,6 +23,7 @@ package org.springframework.core.task; */ public class NoOpRunnable implements Runnable { + @Override public void run() { // explicit no-op System.out.println("Running"); diff --git a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java index bcfc34c71b9..3dc63f5cde3 100644 --- a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java @@ -57,6 +57,7 @@ public class LocalSlsbInvokerInterceptorTests { final NamingException nex = new NamingException(); final String jndiName= "foobar"; JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) throws NamingException { assertTrue(jndiName.equals(name)); throw nex; @@ -174,6 +175,7 @@ public class LocalSlsbInvokerInterceptorTests { LocalSlsbInvokerInterceptor si = new LocalSlsbInvokerInterceptor(); si.setJndiTemplate(new JndiTemplate() { + @Override protected Context createInitialContext() throws NamingException { return mockCtx; } diff --git a/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java index c2c9e07aaaf..b053e3e0380 100644 --- a/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java @@ -52,6 +52,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests { replay(home); JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) throws NamingException { // parameterize assertTrue(name.equals("java:comp/env/" + jndiName)); @@ -85,6 +86,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests { replay(myEjb); JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) throws NamingException { // parameterize assertTrue(name.equals("java:comp/env/" + jndiName)); @@ -117,6 +119,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests { replay(home); JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) throws NamingException { // parameterize assertTrue(name.equals(jndiName)); @@ -158,6 +161,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests { replay(home); JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) throws NamingException { // parameterize assertTrue(name.equals("java:comp/env/" + jndiName)); diff --git a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java index a48935c47c2..cbf75b18310 100644 --- a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java @@ -63,6 +63,7 @@ public class SimpleRemoteSlsbInvokerInterceptorTests { SimpleRemoteSlsbInvokerInterceptor si = createInterceptor(); si.setJndiTemplate(new JndiTemplate() { + @Override protected Context createInitialContext() { return mockCtx; } @@ -121,6 +122,7 @@ public class SimpleRemoteSlsbInvokerInterceptorTests { final NamingException nex = new NamingException(); final String jndiName = "foobar"; JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) throws NamingException { assertTrue(jndiName.equals(name)); throw nex; diff --git a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java index 396d347b178..dca93a798e5 100644 --- a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java @@ -38,10 +38,12 @@ import org.springframework.remoting.RemoteAccessException; */ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRemoteSlsbInvokerInterceptorTests { + @Override protected SimpleRemoteSlsbInvokerInterceptor createInterceptor() { return new SimpleRemoteStatelessSessionProxyFactoryBean(); } + @Override protected Object configuredProxy(SimpleRemoteSlsbInvokerInterceptor si, Class ifc) throws NamingException { SimpleRemoteStatelessSessionProxyFactoryBean fb = (SimpleRemoteStatelessSessionProxyFactoryBean) si; fb.setBusinessInterface(ifc); @@ -64,6 +66,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem replay(home); JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) { // parameterize assertTrue(name.equals("java:comp/env/" + jndiName)); @@ -97,6 +100,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem replay(myEjb); JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) { // parameterize assertTrue(name.equals("java:comp/env/" + jndiName)); @@ -119,6 +123,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem verify(myEjb); } + @Override @Test public void testRemoteException() throws Exception { final RemoteException rex = new RemoteException(); @@ -136,6 +141,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem replay(home); JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) { // parameterize assertTrue(name.equals("java:comp/env/" + jndiName)); @@ -175,6 +181,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem replay(home); JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) { // parameterize assertTrue(name.equals(jndiName)); @@ -216,6 +223,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem replay(home); JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) { // parameterize assertTrue(name.equals(jndiName)); @@ -257,6 +265,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem replay(home); JndiTemplate jt = new JndiTemplate() { + @Override public Object lookup(String name) throws NamingException { // parameterize assertTrue(name.equals(jndiName)); diff --git a/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java b/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java index 9d60580e5d4..556d5a78bd4 100644 --- a/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java +++ b/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java @@ -48,6 +48,7 @@ public class NumberFormattingTests { public void setUp() { DefaultConversionService.addDefaultConverters(conversionService); conversionService.setEmbeddedValueResolver(new StringValueResolver() { + @Override public String resolveStringValue(String strVal) { if ("${pattern}".equals(strVal)) { return "#,##.00"; diff --git a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java index a5c07dbe80c..d501dafa400 100644 --- a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java @@ -149,10 +149,12 @@ public class FormattingConversionServiceFactoryBeanTests { private static class TestBeanFormatter implements Formatter { + @Override public String print(TestBean object, Locale locale) { return String.valueOf(object.getSpecialInt()); } + @Override public TestBean parse(String text, Locale locale) throws ParseException { TestBean object = new TestBean(); object.setSpecialInt(Integer.parseInt(text)); @@ -169,20 +171,25 @@ public class FormattingConversionServiceFactoryBeanTests { fieldTypes.add(Integer.class); } + @Override public Set> getFieldTypes() { return fieldTypes; } + @Override public Printer getPrinter(SpecialInt annotation, Class fieldType) { return new Printer() { + @Override public String print(Integer object, Locale locale) { return ":" + object.toString(); } }; } + @Override public Parser getParser(SpecialInt annotation, Class fieldType) { return new Parser() { + @Override public Integer parse(String text, Locale locale) throws ParseException { return Integer.parseInt(text.substring(1)); } @@ -192,6 +199,7 @@ public class FormattingConversionServiceFactoryBeanTests { private static class TestFormatterRegistrar implements FormatterRegistrar { + @Override public void registerFormatters(FormatterRegistry registry) { registry.addFormatter(new TestBeanFormatter()); } diff --git a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java index c620be5b741..6fcefd9d751 100644 --- a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java +++ b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java @@ -86,6 +86,7 @@ public class FormattingConversionServiceTests { @Test public void testFormatFieldForTypeWithPrinterParserWithCoercion() throws ParseException { formattingService.addConverter(new Converter() { + @Override public LocalDate convert(DateTime source) { return source.toLocalDate(); } @@ -170,11 +171,13 @@ public class FormattingConversionServiceTests { @SuppressWarnings("unchecked") private void doTestFormatFieldForAnnotation(Class modelClass, boolean directFieldAccess) throws Exception { formattingService.addConverter(new Converter() { + @Override public Long convert(Date source) { return source.getTime(); } }); formattingService.addConverter(new Converter() { + @Override public Date convert(DateTime source) { return source.toDate(); } @@ -277,17 +280,20 @@ public class FormattingConversionServiceTests { @Test public void testFormatFieldForAnnotationWithSubclassAsFieldType() throws Exception { formattingService.addFormatterForFieldAnnotation(new JodaDateTimeFormatAnnotationFormatterFactory() { + @Override public Printer getPrinter(org.springframework.format.annotation.DateTimeFormat annotation, Class fieldType) { assertEquals(MyDate.class, fieldType); return super.getPrinter(annotation, fieldType); } }); formattingService.addConverter(new Converter() { + @Override public Long convert(MyDate source) { return source.getTime(); } }); formattingService.addConverter(new Converter() { + @Override public Date convert(MyDate source) { return source; } @@ -364,10 +370,12 @@ public class FormattingConversionServiceTests { public static class NullReturningFormatter implements Formatter { + @Override public String print(Integer object, Locale locale) { return null; } + @Override public Integer parse(String text, Locale locale) throws ParseException { return null; } diff --git a/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java b/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java index 09644b02c0e..8abddb5ea30 100644 --- a/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java +++ b/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java @@ -46,6 +46,7 @@ public final class ReflectiveLoadTimeWeaverTests { JustAddTransformerClassLoader classLoader = new JustAddTransformerClassLoader(); ReflectiveLoadTimeWeaver weaver = new ReflectiveLoadTimeWeaver(classLoader); weaver.addTransformer(new ClassFileTransformer() { + @Override public byte[] transform(ClassLoader loader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) { return "CAFEDEAD".getBytes(); } @@ -97,6 +98,7 @@ public final class ReflectiveLoadTimeWeaverTests { private int numTimesGetThrowawayClassLoaderCalled = 0; + @Override public int getNumTimesGetThrowawayClassLoaderCalled() { return this.numTimesGetThrowawayClassLoaderCalled; } diff --git a/spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java b/spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java index bb94cbe364a..3f3580b37dd 100644 --- a/spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java @@ -31,10 +31,12 @@ public abstract class AbstractJmxTests extends AbstractMBeanServerTests { private ConfigurableApplicationContext ctx; + @Override protected final void onSetUp() throws Exception { ctx = loadContext(getApplicationContextPath()); } + @Override protected final void onTearDown() throws Exception { if (ctx != null) { ctx.close(); diff --git a/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java b/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java index c40b734119d..06122a2a02e 100644 --- a/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java @@ -45,6 +45,7 @@ public abstract class AbstractMBeanServerTests extends TestCase { protected MBeanServer server; + @Override public final void setUp() throws Exception { this.server = MBeanServerFactory.createMBeanServer(); try { @@ -63,6 +64,7 @@ public abstract class AbstractMBeanServerTests extends TestCase { return ctx; } + @Override protected void tearDown() throws Exception { releaseServer(); onTearDown(); diff --git a/spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java b/spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java index e73f6106c76..5268a8d6533 100644 --- a/spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java +++ b/spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java @@ -43,10 +43,12 @@ public class JmxTestBean implements IJmxTestBean { * @@org.springframework.jmx.export.metadata.ManagedAttribute * (description="The Age Attribute", currencyTimeLimit=15) */ + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -54,6 +56,7 @@ public class JmxTestBean implements IJmxTestBean { /** * @@org.springframework.jmx.export.metadata.ManagedOperation(currencyTimeLimit=30) */ + @Override public long myOperation() { return 1L; } @@ -63,6 +66,7 @@ public class JmxTestBean implements IJmxTestBean { * (description="The Name Attribute", currencyTimeLimit=20, * defaultValue="bar", persistPolicy="OnUpdate") */ + @Override public void setName(String name) throws Exception { if ("Juergen".equals(name)) { throw new IllegalArgumentException("Juergen"); @@ -80,6 +84,7 @@ public class JmxTestBean implements IJmxTestBean { * @@org.springframework.jmx.export.metadata.ManagedAttribute * (defaultValue="foo", persistPeriod=300) */ + @Override public String getName() { return name; } @@ -117,6 +122,7 @@ public class JmxTestBean implements IJmxTestBean { * @@org.springframework.jmx.export.metadata.ManagedOperationParameter(index=0, name="x", description="Left operand") * @@org.springframework.jmx.export.metadata.ManagedOperationParameter(index=1, name="y", description="Right operand") */ + @Override public int add(int x, int y) { return x + y; } @@ -124,6 +130,7 @@ public class JmxTestBean implements IJmxTestBean { /** * Test method that is not exposed by the MetadataAssembler. */ + @Override public void dontExposeMe() { throw new RuntimeException(); } diff --git a/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java b/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java index a6af50e1325..29d2c04037d 100644 --- a/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java @@ -50,6 +50,7 @@ public class MBeanClientInterceptorTests extends AbstractMBeanServerTests { protected boolean runTests = true; + @Override public void onSetUp() throws Exception { target = new JmxTestBean(); target.setAge(100); @@ -277,10 +278,12 @@ public class MBeanClientInterceptorTests extends AbstractMBeanServerTests { private static class ProxyTestAssembler extends AbstractReflectiveMBeanInfoAssembler { + @Override protected boolean includeReadAttribute(Method method, String beanKey) { return true; } + @Override protected boolean includeWriteAttribute(Method method, String beanKey) { if ("setAge".equals(method.getName())) { return false; @@ -288,6 +291,7 @@ public class MBeanClientInterceptorTests extends AbstractMBeanServerTests { return true; } + @Override protected boolean includeOperation(Method method, String beanKey) { if ("dontExposeMe".equals(method.getName())) { return false; diff --git a/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java b/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java index 77aefe6167c..b33a5793aa3 100644 --- a/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java +++ b/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java @@ -46,6 +46,7 @@ public class RemoteMBeanClientInterceptorTestsIgnore extends MBeanClientIntercep private JMXConnector connector; + @Override public void onSetUp() throws Exception { super.onSetUp(); this.connectorServer = JMXConnectorServerFactory.newJMXConnectorServer(getServiceUrl(), null, getServer()); @@ -61,11 +62,13 @@ public class RemoteMBeanClientInterceptorTestsIgnore extends MBeanClientIntercep return new JMXServiceURL(SERVICE_URL); } + @Override protected MBeanServerConnection getServerConnection() throws Exception { this.connector = JMXConnectorFactory.connect(getServiceUrl()); return this.connector.getMBeanServerConnection(); } + @Override public void tearDown() throws Exception { if (this.connector != null) { this.connector.close(); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java index d9aba5b4c07..67c8adc64b4 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java @@ -31,6 +31,7 @@ public class CustomEditorConfigurerTests extends AbstractJmxTests { private final SimpleDateFormat df = new SimpleDateFormat("yyyy/MM/dd"); + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/customConfigurer.xml"; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java index d95c6b4f28b..716fccfc7c5 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java @@ -67,6 +67,7 @@ public class MBeanExporterOperationsTests extends AbstractMBeanServerTests { MBeanExporter exporter = new MBeanExporter(); exporter.setServer(getServer()); exporter.setNamingStrategy(new ObjectNamingStrategy() { + @Override public ObjectName getObjectName(Object managedBean, String beanKey) { return objectNameTemplate; } @@ -92,6 +93,7 @@ public class MBeanExporterOperationsTests extends AbstractMBeanServerTests { exporter.setServer(getServer()); exporter.setEnsureUniqueRuntimeObjectNames(false); exporter.setNamingStrategy(new ObjectNamingStrategy() { + @Override public ObjectName getObjectName(Object managedBean, String beanKey) { return objectNameTemplate; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java index 85865af76fc..83011aec3bb 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java @@ -98,6 +98,7 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests { public void testRegisterNotificationListenerForNonExistentMBean() throws Exception { Map listeners = new HashMap(); NotificationListener dummyListener = new NotificationListener() { + @Override public void handleNotification(Notification notification, Object handback) { throw new UnsupportedOperationException(); } @@ -666,6 +667,7 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests { private boolean invoked = false; + @Override public ModelMBeanInfo getMBeanInfo(Object managedResource, String beanKey) throws JMException { invoked = true; return null; @@ -678,10 +680,12 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests { private List unregistered = new ArrayList(); + @Override public void mbeanRegistered(ObjectName objectName) { registered.add(objectName); } + @Override public void mbeanUnregistered(ObjectName objectName) { unregistered.add(objectName); } @@ -703,6 +707,7 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests { this.objectName = objectName; } + @Override public ObjectName getObjectName() throws MalformedObjectNameException { return this.objectName; } @@ -717,6 +722,7 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests { private String name; + @Override public String getName() { return name; } @@ -730,6 +736,7 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests { private List notifications = new ArrayList(); + @Override public void handleNotification(Notification notification, Object handback) { this.notifications.add(notification); } @@ -756,6 +763,7 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests { this.namedBean = namedBean; } + @Override public boolean includeBean(Class beanClass, String beanName) { return this.namedBean.equals(beanName); } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java index 3ab938d95d9..3eb6fe9baa1 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java @@ -158,6 +158,7 @@ public class NotificationListenerTests extends AbstractMBeanServerTests { NotificationListenerBean listenerBean = new NotificationListenerBean(); listenerBean.setNotificationListener(listener); listenerBean.setNotificationFilter(new NotificationFilter() { + @Override public boolean isNotificationEnabled(Notification notification) { if (notification instanceof AttributeChangeNotification) { AttributeChangeNotification changeNotification = (AttributeChangeNotification) notification; @@ -434,6 +435,7 @@ public class NotificationListenerTests extends AbstractMBeanServerTests { private Map attributeHandbacks = new HashMap(); + @Override public void handleNotification(Notification notification, Object handback) { if (notification instanceof AttributeChangeNotification) { AttributeChangeNotification attNotification = (AttributeChangeNotification) notification; @@ -473,6 +475,7 @@ public class NotificationListenerTests extends AbstractMBeanServerTests { this.objectName = objectName; } + @Override public ObjectName getObjectName() throws MalformedObjectNameException { return this.objectName; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java b/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java index 24d7f4b57d0..ef79c481c6b 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java @@ -119,6 +119,7 @@ public class NotificationPublisherTests extends AbstractMBeanServerTests { private Notification lastNotification; + @Override public void handleNotification(Notification notification, Object handback) { this.lastNotification = notification; this.count++; @@ -139,6 +140,7 @@ public class NotificationPublisherTests extends AbstractMBeanServerTests { private NotificationPublisher notificationPublisher; + @Override public void setNotificationPublisher(NotificationPublisher notificationPublisher) { this.notificationPublisher = notificationPublisher; } @@ -158,28 +160,34 @@ public class NotificationPublisherTests extends AbstractMBeanServerTests { public static class MyNotificationPublisherMBean extends NotificationBroadcasterSupport implements DynamicMBean { + @Override public Object getAttribute(String attribute) throws AttributeNotFoundException, MBeanException, ReflectionException { return null; } + @Override public void setAttribute(Attribute attribute) throws AttributeNotFoundException, InvalidAttributeValueException, MBeanException, ReflectionException { } + @Override public AttributeList getAttributes(String[] attributes) { return null; } + @Override public AttributeList setAttributes(AttributeList attributes) { return null; } + @Override public Object invoke(String actionName, Object params[], String signature[]) throws MBeanException, ReflectionException { return null; } + @Override public MBeanInfo getMBeanInfo() { return new MBeanInfo(MyNotificationPublisherMBean.class.getName(), "", new MBeanAttributeInfo[0], new MBeanConstructorInfo[0], new MBeanOperationInfo[0], new MBeanNotificationInfo[0]); @@ -192,6 +200,7 @@ public class NotificationPublisherTests extends AbstractMBeanServerTests { public static class MyNotificationPublisherStandardMBean extends NotificationBroadcasterSupport implements MyMBean { + @Override public void sendNotification() { sendNotification(new Notification("test", this, 1)); } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java index 96167d24ec7..ba052565270 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java @@ -26,6 +26,7 @@ import org.springframework.jmx.IJmxTestBean; */ public class PropertyPlaceholderConfigurerTests extends AbstractJmxTests { + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/propertyPlaceholderConfigurer.xml"; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java b/spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java index a52d6a7e78c..7ed0f6c7ec3 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java @@ -37,6 +37,7 @@ public class TestDynamicMBean implements DynamicMBean { } } + @Override public Object getAttribute(String attribute) { if ("Name".equals(attribute)) { return "Rob Harrop"; @@ -44,21 +45,26 @@ public class TestDynamicMBean implements DynamicMBean { return null; } + @Override public void setAttribute(Attribute attribute) { } + @Override public AttributeList getAttributes(String[] attributes) { return null; } + @Override public AttributeList setAttributes(AttributeList attributes) { return null; } + @Override public Object invoke(String actionName, Object[] params, String[] signature) { return null; } + @Override public MBeanInfo getMBeanInfo() { MBeanAttributeInfo attr = new MBeanAttributeInfo("name", "java.lang.String", "", true, false, false); return new MBeanInfo( diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java index 5f65e056f61..e75c9a7ad52 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java @@ -48,18 +48,22 @@ public class AnnotationMetadataAssemblerTests extends AbstractMetadataAssemblerT assertNotNull(op); } + @Override protected JmxAttributeSource getAttributeSource() { return new AnnotationJmxAttributeSource(); } + @Override protected String getObjectName() { return OBJECT_NAME; } + @Override protected IJmxTestBean createJmxTestBean() { return new AnnotationTestSubBean(); } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/annotation/annotations.xml"; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java index 97a3581954e..4d751020b6e 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java @@ -40,20 +40,24 @@ public class AnnotationTestBean implements IJmxTestBean { private boolean isSuperman; + @Override @ManagedAttribute(description = "The Age Attribute", currencyTimeLimit = 15) public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } + @Override @ManagedOperation(currencyTimeLimit = 30) public long myOperation() { return 1L; } + @Override @ManagedAttribute(description = "The Name Attribute", currencyTimeLimit = 20, defaultValue = "bar", @@ -62,6 +66,7 @@ public class AnnotationTestBean implements IJmxTestBean { this.name = name; } + @Override @ManagedAttribute(defaultValue = "foo", persistPeriod = 300) public String getName() { return name; @@ -85,6 +90,7 @@ public class AnnotationTestBean implements IJmxTestBean { return isSuperman; } + @Override @org.springframework.jmx.export.annotation.ManagedOperation(description = "Add Two Numbers Together") @ManagedOperationParameters({@ManagedOperationParameter(name="x", description="Left operand"), @ManagedOperationParameter(name="y", description="Right operand")}) @@ -95,6 +101,7 @@ public class AnnotationTestBean implements IJmxTestBean { /** * Test method that is not exposed by the MetadataAssembler. */ + @Override public void dontExposeMe() { throw new RuntimeException(); } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBeanFactory.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBeanFactory.java index 3e47e82bfd3..2dc4fa087b6 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBeanFactory.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBeanFactory.java @@ -30,14 +30,17 @@ public class AnnotationTestBeanFactory implements FactoryBean getObjectType() { return FactoryCreatedAnnotationTestBean.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java index 8bfbc77ac08..dc9f58375c2 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java @@ -38,17 +38,21 @@ public class AnnotationTestSubBean extends AnnotationTestBean implements IAnnota return super.getAge(); } + @Override public String getColour() { return this.colour; } + @Override public void setColour(String colour) { this.colour = colour; } + @Override public void fromInterface() { } + @Override public int getExpensiveToCalculate() { return Integer.MAX_VALUE; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java index d409d1e8e2c..675deb0ae3d 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java @@ -54,6 +54,7 @@ public class JmxUtilsAnnotationTests extends TestCase { public static class FooNotX implements FooNotMXBean { + @Override public String getName() { return "Rob Harrop"; } @@ -69,6 +70,7 @@ public class JmxUtilsAnnotationTests extends TestCase { public static class FooX implements FooIfc { + @Override public String getName() { return "Rob Harrop"; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java index 6aa94facb25..968b955a477 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java @@ -23,6 +23,7 @@ import org.springframework.jmx.export.metadata.JmxAttributeSource; */ public abstract class AbstractMetadataAssemblerAutodetectTests extends AbstractAutodetectTests { + @Override protected AutodetectCapableMBeanInfoAssembler getAssembler() { MetadataMBeanInfoAssembler assembler = new MetadataMBeanInfoAssembler(); assembler.setAttributeSource(getAttributeSource()); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java index 93735097c67..15e5812236b 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java @@ -204,12 +204,15 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble assertNull("Metric Category should not be populated", desc.getFieldValue("metricCategory")); } + @Override protected abstract String getObjectName(); + @Override protected int getExpectedAttributeCount() { return 6; } + @Override protected int getExpectedOperationCount() { return 9; } @@ -218,6 +221,7 @@ public abstract class AbstractMetadataAssemblerTests extends AbstractJmxAssemble return new JmxTestBean(); } + @Override protected MBeanInfoAssembler getAssembler() { MetadataMBeanInfoAssembler assembler = new MetadataMBeanInfoAssembler(); assembler.setAttributeSource(getAttributeSource()); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java index 4be8a6cc92f..27beb0b470f 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java @@ -26,18 +26,22 @@ public class InterfaceBasedMBeanInfoAssemblerCustomTests extends AbstractJmxAsse protected static final String OBJECT_NAME = "bean:name=testBean5"; + @Override protected String getObjectName() { return OBJECT_NAME; } + @Override protected int getExpectedOperationCount() { return 5; } + @Override protected int getExpectedAttributeCount() { return 2; } + @Override protected MBeanInfoAssembler getAssembler() { InterfaceBasedMBeanInfoAssembler assembler = new InterfaceBasedMBeanInfoAssembler(); assembler.setManagedInterfaces(new Class[] {ICustomJmxBean.class}); @@ -52,6 +56,7 @@ public class InterfaceBasedMBeanInfoAssemblerCustomTests extends AbstractJmxAsse assertFalse(attr.isWritable()); } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml"; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java index a0681cc398a..0ada6be5756 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java @@ -75,24 +75,29 @@ public class InterfaceBasedMBeanInfoAssemblerMappedTests extends AbstractJmxAsse assertNickName(attr); } + @Override protected String getObjectName() { return OBJECT_NAME; } + @Override protected int getExpectedOperationCount() { return 7; } + @Override protected int getExpectedAttributeCount() { return 3; } + @Override protected MBeanInfoAssembler getAssembler() throws Exception { return getWithMapping( "org.springframework.jmx.export.assembler.IAdditionalTestMethods, " + "org.springframework.jmx.export.assembler.ICustomJmxBean"); } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml"; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java index 6d8266b4aca..cfe72619900 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java @@ -21,22 +21,27 @@ package org.springframework.jmx.export.assembler; */ public class InterfaceBasedMBeanInfoAssemblerTests extends AbstractJmxAssemblerTests { + @Override protected String getObjectName() { return "bean:name=testBean4"; } + @Override protected int getExpectedOperationCount() { return 7; } + @Override protected int getExpectedAttributeCount() { return 2; } + @Override protected MBeanInfoAssembler getAssembler() { return new InterfaceBasedMBeanInfoAssembler(); } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/assembler/interfaceAssembler.xml"; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java index 73d4fb56f51..53629c55bb6 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java @@ -45,22 +45,27 @@ public class MethodExclusionMBeanInfoAssemblerComboTests extends AbstractJmxAsse assertTrue("Nick Name should be readable", attr.isReadable()); } + @Override protected String getObjectName() { return OBJECT_NAME; } + @Override protected int getExpectedOperationCount() { return 7; } + @Override protected int getExpectedAttributeCount() { return 3; } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/assembler/methodExclusionAssemblerCombo.xml"; } + @Override protected MBeanInfoAssembler getAssembler() throws Exception { MethodExclusionMBeanInfoAssembler assembler = new MethodExclusionMBeanInfoAssembler(); Properties props = new Properties(); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java index a3f11f9fef6..2015cbbece8 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java @@ -44,22 +44,27 @@ public class MethodExclusionMBeanInfoAssemblerMappedTests extends AbstractJmxAss assertTrue("Nick Name should be readable", attr.isReadable()); } + @Override protected String getObjectName() { return OBJECT_NAME; } + @Override protected int getExpectedOperationCount() { return 7; } + @Override protected int getExpectedAttributeCount() { return 3; } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/assembler/methodExclusionAssemblerMapped.xml"; } + @Override protected MBeanInfoAssembler getAssembler() throws Exception { MethodExclusionMBeanInfoAssembler assembler = new MethodExclusionMBeanInfoAssembler(); Properties props = new Properties(); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java index c19ef5969da..9cb85d799d1 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java @@ -45,22 +45,27 @@ public class MethodExclusionMBeanInfoAssemblerNotMappedTests extends AbstractJmx assertTrue("Nick Name should be readable", attr.isReadable()); } + @Override protected String getObjectName() { return OBJECT_NAME; } + @Override protected int getExpectedOperationCount() { return 11; } + @Override protected int getExpectedAttributeCount() { return 4; } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/assembler/methodExclusionAssemblerNotMapped.xml"; } + @Override protected MBeanInfoAssembler getAssembler() throws Exception { MethodExclusionMBeanInfoAssembler assembler = new MethodExclusionMBeanInfoAssembler(); Properties props = new Properties(); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java index 2370488f80c..e13a4ff2aff 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java @@ -33,22 +33,27 @@ public class MethodExclusionMBeanInfoAssemblerTests extends AbstractJmxAssembler private static final String OBJECT_NAME = "bean:name=testBean5"; + @Override protected String getObjectName() { return OBJECT_NAME; } + @Override protected int getExpectedOperationCount() { return 9; } + @Override protected int getExpectedAttributeCount() { return 4; } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/assembler/methodExclusionAssembler.xml"; } + @Override protected MBeanInfoAssembler getAssembler() { MethodExclusionMBeanInfoAssembler assembler = new MethodExclusionMBeanInfoAssembler(); assembler.setIgnoredMethods(new String[] {"dontExposeMe", "setSuperman"}); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java index 496c3d7c9fc..b7741897e70 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java @@ -54,22 +54,27 @@ public class MethodNameBasedMBeanInfoAssemblerMappedTests extends AbstractJmxAss assertNickName(attr); } + @Override protected String getObjectName() { return OBJECT_NAME; } + @Override protected int getExpectedOperationCount() { return 7; } + @Override protected int getExpectedAttributeCount() { return 3; } + @Override protected MBeanInfoAssembler getAssembler() throws Exception { return getWithMapping("getNickName,setNickName,add,myOperation,getName,setName,getAge"); } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml"; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java index 28cc9f5b535..1ae6c75130a 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java @@ -26,18 +26,22 @@ public class MethodNameBasedMBeanInfoAssemblerTests extends AbstractJmxAssembler protected static final String OBJECT_NAME = "bean:name=testBean5"; + @Override protected String getObjectName() { return OBJECT_NAME; } + @Override protected int getExpectedOperationCount() { return 5; } + @Override protected int getExpectedAttributeCount() { return 2; } + @Override protected MBeanInfoAssembler getAssembler() { MethodNameBasedMBeanInfoAssembler assembler = new MethodNameBasedMBeanInfoAssembler(); assembler.setManagedMethods(new String[] {"add", "myOperation", "getName", "setName", "getAge"}); @@ -52,6 +56,7 @@ public class MethodNameBasedMBeanInfoAssemblerTests extends AbstractJmxAssembler assertFalse(attr.isWritable()); } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/assembler/methodNameAssembler.xml"; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java index 91f97e0a1dd..5e0a4bf9849 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java @@ -26,22 +26,27 @@ public class ReflectiveAssemblerTests extends AbstractJmxAssemblerTests { protected static final String OBJECT_NAME = "bean:name=testBean1"; + @Override protected String getObjectName() { return OBJECT_NAME; } + @Override protected int getExpectedOperationCount() { return 11; } + @Override protected int getExpectedAttributeCount() { return 4; } + @Override protected MBeanInfoAssembler getAssembler() { return new SimpleReflectiveMBeanInfoAssembler(); } + @Override protected String getApplicationContextPath() { return "org/springframework/jmx/export/assembler/reflectiveAssembler.xml"; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java index c98f88489f8..28696ff1a16 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java @@ -23,18 +23,22 @@ public class KeyNamingStrategyTests extends AbstractNamingStrategyTests { private static final String OBJECT_NAME = "spring:name=test"; + @Override protected ObjectNamingStrategy getStrategy() throws Exception { return new KeyNamingStrategy(); } + @Override protected Object getManagedResource() { return new Object(); } + @Override protected String getKey() { return OBJECT_NAME; } + @Override protected String getCorrectObjectName() { return OBJECT_NAME; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java index 9772ff4ae46..4b0e1a39207 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java @@ -23,6 +23,7 @@ import org.springframework.core.io.ClassPathResource; */ public class PropertiesFileNamingStrategyTests extends PropertiesNamingStrategyTests { + @Override protected ObjectNamingStrategy getStrategy() throws Exception { KeyNamingStrategy strat = new KeyNamingStrategy(); strat.setMappingLocation(new ClassPathResource("jmx-names.properties", getClass())); diff --git a/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java index fefc10ffc88..4c474100a79 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java @@ -26,6 +26,7 @@ public class PropertiesNamingStrategyTests extends AbstractNamingStrategyTests { private static final String OBJECT_NAME = "bean:name=namingTest"; + @Override protected ObjectNamingStrategy getStrategy() throws Exception { KeyNamingStrategy strat = new KeyNamingStrategy(); Properties mappings = new Properties(); @@ -35,14 +36,17 @@ public class PropertiesNamingStrategyTests extends AbstractNamingStrategyTests { return strat; } + @Override protected Object getManagedResource() { return new Object(); } + @Override protected String getKey() { return "namingTest"; } + @Override protected String getCorrectObjectName() { return OBJECT_NAME; } diff --git a/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java b/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java index 6f9ab8e724a..cfffabaead9 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java @@ -113,10 +113,12 @@ public final class ModelMBeanNotificationPublisherTests { return this.actualNotification; } + @Override public void sendNotification(Notification notification) throws RuntimeOperationsException { this.actualNotification = notification; } + @Override public void sendAttributeChangeNotification(AttributeChangeNotification notification) throws RuntimeOperationsException { this.actualNotification = notification; } diff --git a/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java b/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java index b72082cef14..333d2e5f27c 100644 --- a/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java @@ -151,28 +151,35 @@ public class JmxUtilsTests extends TestCase { super(IJmxTestBean.class); } + @Override public int add(int x, int y) { return 0; } + @Override public long myOperation() { return 0; } + @Override public int getAge() { return 0; } + @Override public void setAge(int age) { } + @Override public void setName(String name) { } + @Override public String getName() { return null; } + @Override public void dontExposeMe() { } } @@ -186,6 +193,7 @@ public class JmxUtilsTests extends TestCase { public static class Foo implements FooMBean { + @Override public String getName() { return "Rob Harrop"; } @@ -200,6 +208,7 @@ public class JmxUtilsTests extends TestCase { public static class FooX implements FooMXBean { + @Override public String getName() { return "Rob Harrop"; } diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java index 5acfff76088..fbc8e6221ee 100644 --- a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java @@ -233,6 +233,7 @@ public class JndiObjectFactoryBeanTests { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); final TestBean tb = new TestBean(); jof.setJndiTemplate(new JndiTemplate() { + @Override public Object lookup(String name) { if ("foo".equals(name)) { tb.setName("tb"); @@ -259,6 +260,7 @@ public class JndiObjectFactoryBeanTests { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); final TestBean tb = new TestBean(); jof.setJndiTemplate(new JndiTemplate() { + @Override public Object lookup(String name) { if ("foo".equals(name)) { tb.setName("tb"); @@ -287,6 +289,7 @@ public class JndiObjectFactoryBeanTests { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); final TestBean tb = new TestBean(); jof.setJndiTemplate(new JndiTemplate() { + @Override public Object lookup(String name) { if ("foo".equals(name)) { tb.setName("tb"); @@ -386,6 +389,7 @@ public class JndiObjectFactoryBeanTests { expectLastCall().times(2); replay(mockCtx); jof.setJndiTemplate(new JndiTemplate() { + @Override protected Context createInitialContext() { return mockCtx; } diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java index 4d658bc2cf7..f4fbd094534 100644 --- a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java +++ b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java @@ -42,6 +42,7 @@ public class JndiTemplateTests { replay(context); JndiTemplate jt = new JndiTemplate() { + @Override protected Context createInitialContext() { return context; } @@ -62,6 +63,7 @@ public class JndiTemplateTests { replay(context); JndiTemplate jt = new JndiTemplate() { + @Override protected Context createInitialContext() { return context; } @@ -86,6 +88,7 @@ public class JndiTemplateTests { replay(context); JndiTemplate jt = new JndiTemplate() { + @Override protected Context createInitialContext() { return context; } @@ -111,6 +114,7 @@ public class JndiTemplateTests { replay(context); JndiTemplate jt = new JndiTemplate() { + @Override protected Context createInitialContext() { return context; } @@ -136,6 +140,7 @@ public class JndiTemplateTests { replay(context); JndiTemplate jt = new JndiTemplate() { + @Override protected Context createInitialContext() { return context; } @@ -155,6 +160,7 @@ public class JndiTemplateTests { replay(context); JndiTemplate jt = new JndiTemplate() { + @Override protected Context createInitialContext() { return context; } @@ -173,6 +179,7 @@ public class JndiTemplateTests { replay(context); JndiTemplate jt = new JndiTemplate() { + @Override protected Context createInitialContext() { return context; } diff --git a/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java b/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java index bc635f183da..3851c6bbee3 100644 --- a/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java +++ b/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java @@ -219,38 +219,47 @@ public class SimpleNamingContextTests { class StubDataSource implements DataSource { + @Override public Connection getConnection() throws SQLException { return null; } + @Override public Connection getConnection(String username, String password) throws SQLException { return null; } + @Override public PrintWriter getLogWriter() throws SQLException { return null; } + @Override public int getLoginTimeout() throws SQLException { return 0; } + @Override public void setLogWriter(PrintWriter arg0) throws SQLException { } + @Override public void setLoginTimeout(int arg0) throws SQLException { } + @Override public boolean isWrapperFor(Class arg0) throws SQLException { return false; } + @Override public T unwrap(Class arg0) throws SQLException { return null; } + @Override public Logger getParentLogger() { return null; } diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java index 10ae6d42837..9b3d10470da 100644 --- a/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java +++ b/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java @@ -70,6 +70,7 @@ public class ExpectedLookupTemplate extends JndiTemplate { * return the object provided in the constructor. If the name is * unexpected, a respective NamingException gets thrown. */ + @Override public Object lookup(String name) throws NamingException { Object object = this.jndiObjects.get(name); if (object == null) { diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java index c71d6e86810..5ab0d313777 100644 --- a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java +++ b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java @@ -91,6 +91,7 @@ public class SimpleNamingContext implements Context { // Actual implementations of Context methods follow + @Override public NamingEnumeration list(String root) throws NamingException { if (logger.isDebugEnabled()) { logger.debug("Listing name/class pairs under [" + root + "]"); @@ -98,6 +99,7 @@ public class SimpleNamingContext implements Context { return new NameClassPairEnumeration(this, root); } + @Override public NamingEnumeration listBindings(String root) throws NamingException { if (logger.isDebugEnabled()) { logger.debug("Listing bindings under [" + root + "]"); @@ -111,6 +113,7 @@ public class SimpleNamingContext implements Context { * Will be used by any standard InitialContext JNDI lookups. * @throws javax.naming.NameNotFoundException if the object could not be found */ + @Override public Object lookup(String lookupName) throws NameNotFoundException { String name = this.root + lookupName; if (logger.isDebugEnabled()) { @@ -136,6 +139,7 @@ public class SimpleNamingContext implements Context { return found; } + @Override public Object lookupLink(String name) throws NameNotFoundException { return lookup(name); } @@ -147,6 +151,7 @@ public class SimpleNamingContext implements Context { * Use SimpleNamingContextBuilder to set up JNDI bindings then. * @see org.springframework.mock.jndi.SimpleNamingContextBuilder#bind */ + @Override public void bind(String name, Object obj) { if (logger.isInfoEnabled()) { logger.info("Static JNDI binding: [" + this.root + name + "] = [" + obj + "]"); @@ -154,6 +159,7 @@ public class SimpleNamingContext implements Context { this.boundObjects.put(this.root + name, obj); } + @Override public void unbind(String name) { if (logger.isInfoEnabled()) { logger.info("Static JNDI remove: [" + this.root + name + "]"); @@ -161,16 +167,19 @@ public class SimpleNamingContext implements Context { this.boundObjects.remove(this.root + name); } + @Override public void rebind(String name, Object obj) { bind(name, obj); } + @Override public void rename(String oldName, String newName) throws NameNotFoundException { Object obj = lookup(oldName); unbind(oldName); bind(newName, obj); } + @Override public Context createSubcontext(String name) { String subcontextName = this.root + name; if (!subcontextName.endsWith("/")) { @@ -181,84 +190,104 @@ public class SimpleNamingContext implements Context { return subcontext; } + @Override public void destroySubcontext(String name) { unbind(name); } + @Override public String composeName(String name, String prefix) { return prefix + name; } + @Override public Hashtable getEnvironment() { return this.environment; } + @Override public Object addToEnvironment(String propName, Object propVal) { return this.environment.put(propName, propVal); } + @Override public Object removeFromEnvironment(String propName) { return this.environment.remove(propName); } + @Override public void close() { } // Unsupported methods follow: no support for javax.naming.Name + @Override public NamingEnumeration list(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public NamingEnumeration listBindings(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Object lookup(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Object lookupLink(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void bind(Name name, Object obj) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void unbind(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void rebind(Name name, Object obj) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void rename(Name oldName, Name newName) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Context createSubcontext(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void destroySubcontext(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public String getNameInNamespace() throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public NameParser getNameParser(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public NameParser getNameParser(String name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Name composeName(Name name, Name prefix) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } @@ -298,22 +327,27 @@ public class SimpleNamingContext implements Context { protected abstract T createObject(String strippedName, Object obj); + @Override public boolean hasMore() { return this.iterator.hasNext(); } + @Override public T next() { return this.iterator.next(); } + @Override public boolean hasMoreElements() { return this.iterator.hasNext(); } + @Override public T nextElement() { return this.iterator.next(); } + @Override public void close() { } } @@ -325,6 +359,7 @@ public class SimpleNamingContext implements Context { super(context, root); } + @Override protected NameClassPair createObject(String strippedName, Object obj) { return new NameClassPair(strippedName, obj.getClass().getName()); } @@ -337,6 +372,7 @@ public class SimpleNamingContext implements Context { super(context, root); } + @Override protected Binding createObject(String strippedName, Object obj) { return new Binding(strippedName, obj); } diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java index f21936897b3..32908a306aa 100644 --- a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java +++ b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java @@ -192,6 +192,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder * creating a new SimpleNamingContext instance. * @see SimpleNamingContext */ + @Override public InitialContextFactory createInitialContextFactory(Hashtable environment) { if (activated == null && environment != null) { Object icf = environment.get(Context.INITIAL_CONTEXT_FACTORY); @@ -225,6 +226,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder // Default case... return new InitialContextFactory() { + @Override @SuppressWarnings("unchecked") public Context getInitialContext(Hashtable environment) { return new SimpleNamingContext("", boundObjects, (Hashtable) environment); diff --git a/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java b/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java index dbb46d53859..c92f3d0aca0 100644 --- a/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java +++ b/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java @@ -322,18 +322,23 @@ public class RmiSupportTests extends TestCase { final Method setNameMethod = rb.getClass().getDeclaredMethod("setName", new Class[] {String.class}); MethodInvocation mi = new MethodInvocation() { + @Override public Method getMethod() { return setNameMethod; } + @Override public Object[] getArguments() { return new Object[] {"bla"}; } + @Override public Object proceed() throws Throwable { throw new UnsupportedOperationException(); } + @Override public Object getThis() { return rb; } + @Override public AccessibleObject getStaticPart() { return setNameMethod; } @@ -363,11 +368,14 @@ public class RmiSupportTests extends TestCase { public void testRmiInvokerWithSpecialLocalMethods() throws Exception { String serviceUrl = "rmi://localhost:1090/test"; RmiProxyFactoryBean factory = new RmiProxyFactoryBean() { + @Override protected Remote lookupStub() { return new RmiInvocationHandler() { + @Override public String getTargetInterfaceName() { return null; } + @Override public Object invoke(RemoteInvocation invocation) throws RemoteException { throw new RemoteException(); } @@ -400,6 +408,7 @@ public class RmiSupportTests extends TestCase { private int counter = 0; + @Override protected Remote lookupStub() { counter++; return new RemoteBean(); @@ -432,6 +441,7 @@ public class RmiSupportTests extends TestCase { private static String name; + @Override public void setName(String nam) throws RemoteException { if (nam != null && nam.endsWith("Exception")) { RemoteException rex = null; diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java index be6ef187d25..e52582125a1 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java @@ -116,16 +116,19 @@ public class AsyncAnnotationBeanPostProcessorTests { private final CountDownLatch latch = new CountDownLatch(1); + @Override public Thread getThread() { return this.thread; } + @Override @Async public void test() { this.thread = Thread.currentThread(); this.latch.countDown(); } + @Override public void await(long timeout) { try { this.latch.await(timeout, TimeUnit.MILLISECONDS); diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java index f5f0aca4357..a0985345de8 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java @@ -248,10 +248,12 @@ public class AsyncExecutionTests { public static class AsyncInterfaceBean implements AsyncInterface { + @Override public void doSomething(int i) { assertTrue(!Thread.currentThread().getName().equals(originalThreadName)); } + @Override public Future returnSomething(int i) { assertTrue(!Thread.currentThread().getName().equals(originalThreadName)); return new AsyncResult(Integer.toString(i)); @@ -273,14 +275,17 @@ public class AsyncExecutionTests { public static class AsyncMethodsInterfaceBean implements AsyncMethodsInterface { + @Override public void doNothing(int i) { assertTrue(Thread.currentThread().getName().equals(originalThreadName)); } + @Override public void doSomething(int i) { assertTrue(!Thread.currentThread().getName().equals(originalThreadName)); } + @Override public Future returnSomething(int i) { assertTrue(!Thread.currentThread().getName().equals(originalThreadName)); return new AsyncResult(Integer.toString(i)); @@ -290,6 +295,7 @@ public class AsyncExecutionTests { public static class AsyncMethodListener implements ApplicationListener { + @Override @Async public void onApplicationEvent(ApplicationEvent event) { listenerCalled++; @@ -305,6 +311,7 @@ public class AsyncExecutionTests { listenerConstructed++; } + @Override public void onApplicationEvent(ApplicationEvent event) { listenerCalled++; assertTrue(!Thread.currentThread().getName().equals(originalThreadName)); diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java index e96c31f7395..3b3329e0d95 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java @@ -247,6 +247,7 @@ public class EnableAsyncTests { return new AsyncBean(); } + @Override public Executor getAsyncExecutor() { ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); executor.setThreadNamePrefix("Custom-"); diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java index 9cab4804834..349c6ec3870 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java @@ -216,6 +216,7 @@ public class EnableSchedulingTests { return null; } + @Override public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { taskRegistrar.setScheduler(taskScheduler1()); } @@ -318,6 +319,7 @@ public class EnableSchedulingTests { return new ThreadAwareWorker(); } + @Override public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { taskRegistrar.setScheduler(taskScheduler2()); } @@ -378,6 +380,7 @@ public class EnableSchedulingTests { return scheduler; } + @Override public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { taskRegistrar.setScheduler(taskScheduler2()); } @@ -410,10 +413,12 @@ public class EnableSchedulingTests { return new ThreadPoolTaskScheduler(); } + @Override public void configureTasks(ScheduledTaskRegistrar taskRegistrar) { taskRegistrar.setScheduler(taskScheduler()); taskRegistrar.addFixedRateTask(new IntervalTask( new Runnable() { + @Override public void run() { worker().executedByThread = Thread.currentThread().getName(); } @@ -449,11 +454,13 @@ public class EnableSchedulingTests { scheduler.initialize(); scheduler.schedule( new Runnable() { + @Override public void run() { counter().incrementAndGet(); } }, new Trigger() { + @Override public Date nextExecutionTime(TriggerContext triggerContext) { return new Date(new Date().getTime()+10); } diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java index 0b0f791cc54..08825992187 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java @@ -65,6 +65,7 @@ public class ScheduledExecutorFactoryBeanTests { mockScheduledExecutorService.replay(); ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() { + @Override protected ScheduledExecutorService createExecutor(int poolSize, ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { return executor; } @@ -88,6 +89,7 @@ public class ScheduledExecutorFactoryBeanTests { mockScheduledExecutorService.replay(); ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() { + @Override protected ScheduledExecutorService createExecutor(int poolSize, ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { return executor; } @@ -233,6 +235,7 @@ public class ScheduledExecutorFactoryBeanTests { @SuppressWarnings("serial") public void testSettingThreadFactoryToNullForcesUseOfDefaultButIsOtherwiseCool() throws Exception { ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() { + @Override protected ScheduledExecutorService createExecutor(int poolSize, ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { assertNotNull("Bah; the setThreadFactory(..) method must use a default ThreadFactory if a null arg is passed in."); return super.createExecutor(poolSize, threadFactory, rejectedExecutionHandler); @@ -250,6 +253,7 @@ public class ScheduledExecutorFactoryBeanTests { @SuppressWarnings("serial") public void testSettingRejectedExecutionHandlerToNullForcesUseOfDefaultButIsOtherwiseCool() throws Exception { ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() { + @Override protected ScheduledExecutorService createExecutor(int poolSize, ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) { assertNotNull("Bah; the setRejectedExecutionHandler(..) method must use a default RejectedExecutionHandler if a null arg is passed in."); return super.createExecutor(poolSize, threadFactory, rejectedExecutionHandler); diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java index 7d3b05f6319..c17d9f27faa 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java @@ -239,6 +239,7 @@ public class ThreadPoolTaskSchedulerTests { this.latch = new CountDownLatch(expectedRunCount); } + @Override public void run() { lastThread = Thread.currentThread(); if (actualRunCount.incrementAndGet() > expectedRunCount) { @@ -259,6 +260,7 @@ public class ThreadPoolTaskSchedulerTests { this.expectedRunCount = expectedRunCount; } + @Override public String call() throws Exception { if (actualRunCount.incrementAndGet() > expectedRunCount) { throw new RuntimeException("intentional test failure"); @@ -278,6 +280,7 @@ public class ThreadPoolTaskSchedulerTests { this.latch = new CountDownLatch(expectedErrorCount); } + @Override public void handleError(Throwable t) { this.lastError = t; this.latch.countDown(); @@ -295,6 +298,7 @@ public class ThreadPoolTaskSchedulerTests { this.maxRunCount = maxRunCount; } + @Override public Date nextExecutionTime(TriggerContext triggerContext) { if (this.actualRunCount.incrementAndGet() > this.maxRunCount) { return null; diff --git a/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java b/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java index 3425f60db59..6c32a85bd08 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java @@ -56,6 +56,7 @@ public class ExecutorBeanDefinitionParserTests { assertEquals(60, getKeepAliveSeconds(executor)); assertEquals(false, getAllowCoreThreadTimeOut(executor)); FutureTask task = new FutureTask(new Callable() { + @Override public String call() throws Exception { return "foo"; } diff --git a/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java b/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java index 921a5c4e117..697c747d337 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTasksBeanDefinitionParserTests.java @@ -123,6 +123,7 @@ public class ScheduledTasksBeanDefinitionParserTests { static class TestTrigger implements Trigger { + @Override public Date nextExecutionTime(TriggerContext triggerContext) { return null; } diff --git a/spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java b/spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java index c0faca5e685..8e045073255 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java @@ -254,14 +254,17 @@ public class PeriodicTriggerTests { this.completion = completion; } + @Override public Date lastActualExecutionTime() { return this.actual; } + @Override public Date lastCompletionTime() { return this.completion; } + @Override public Date lastScheduledExecutionTime() { return this.scheduled; } diff --git a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java index 2659b23576b..5d210b344ae 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java @@ -50,27 +50,32 @@ public class TimerSupportTests extends TestCase { final List success = new ArrayList(3); final Timer timer = new Timer(true) { + @Override public void schedule(TimerTask task, long delay, long period) { if (task == timerTask0 && delay == 0 && period == 10) { success.add(Boolean.TRUE); } } + @Override public void scheduleAtFixedRate(TimerTask task, long delay, long period) { if (task == timerTask1 && delay == 10 && period == 20) { success.add(Boolean.TRUE); } } + @Override public void schedule(TimerTask task, long delay) { if (task instanceof DelegatingTimerTask && delay == 20) { success.add(Boolean.TRUE); } } + @Override public void cancel() { success.add(Boolean.TRUE); } }; TimerFactoryBean timerFactoryBean = new TimerFactoryBean() { + @Override protected Timer createTimer(String name, boolean daemon) { return timer; } @@ -104,6 +109,7 @@ public class TimerSupportTests extends TestCase { private int counter = 0; + @Override public void run() { counter++; } @@ -114,6 +120,7 @@ public class TimerSupportTests extends TestCase { private int counter = 0; + @Override public void run() { counter++; } diff --git a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java index 0655210a429..4632e4852c7 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java @@ -96,6 +96,7 @@ public final class TimerTaskExecutorTests { TimerTaskExecutor executor = new TimerTaskExecutor() { + @Override protected Timer createTimer() { return timer; } @@ -129,6 +130,7 @@ public final class TimerTaskExecutorTests { return this.createTimerWasCalled; } + @Override protected Timer createTimer() { this.createTimerWasCalled = true; return super.createTimer(); @@ -146,6 +148,7 @@ public final class TimerTaskExecutorTests { } + @Override public void cancel() { this.cancelWasCalled = true; super.cancel(); @@ -166,6 +169,7 @@ public final class TimerTaskExecutorTests { } + @Override public void run() { this.runWasCalled = true; synchronized (monitor) { @@ -176,6 +180,7 @@ public final class TimerTaskExecutorTests { private static final class NoOpRunnable implements Runnable { + @Override public void run() { // explicit no-op } diff --git a/spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java b/spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java index 4a542c0c6e4..f00e5148039 100644 --- a/spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java +++ b/spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java @@ -21,14 +21,17 @@ package org.springframework.scripting.config; */ public class OtherTestBean implements ITestBean { + @Override public ITestBean getOtherBean() { return null; } + @Override public boolean isInitialized() { return false; } + @Override public boolean isDestroyed() { return false; } diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java b/spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java index 6aab4f5df39..4f55dc01f8a 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java @@ -26,10 +26,12 @@ public class ConcreteMessenger implements ConfigurableMessenger { private String message; + @Override public String getMessage() { return message; } + @Override public void setMessage(String message) { this.message = message; } diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java index 763827a05a0..f142c6bcc18 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java @@ -478,8 +478,10 @@ public class GroovyScriptFactoryTests { public static class TestCustomizer implements GroovyObjectCustomizer { + @Override public void customize(GroovyObject goo) { DelegatingMetaClass dmc = new DelegatingMetaClass(goo.getMetaClass()) { + @Override public Object invokeMethod(Object arg0, String mName, Object[] arg2) { if (mName.indexOf("Missing") != -1) { throw new IllegalStateException("Gotcha"); diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java b/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java index a7066c828c0..28330777f3f 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/LogUserAdvice.java @@ -11,6 +11,7 @@ public class LogUserAdvice implements MethodBeforeAdvice, ThrowsAdvice { private int countThrows = 0; + @Override public void before(Method method, Object[] objects, Object o) throws Throwable { countBefore++; System.out.println("Method:"+method.getName()); diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java b/spring-context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java index 749fc42fdef..ed90507212d 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/TestServiceImpl.java @@ -2,6 +2,7 @@ package org.springframework.scripting.groovy; @Log public class TestServiceImpl implements TestService{ + @Override public String sayHello() { throw new TestException("TestServiceImpl"); } diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java index cc7e1ce392f..f2899f520e8 100644 --- a/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java @@ -278,6 +278,7 @@ public class JRubyScriptFactoryTests extends TestCase { public int count; + @Override public String getContent() { this.count++; return "Hello World!"; diff --git a/spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java b/spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java index 3a4ffb70436..d67f8d47b75 100644 --- a/spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java +++ b/spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java @@ -25,10 +25,12 @@ public final class StubMessenger implements ConfigurableMessenger { private String message = "I used to be smart... now I'm just stupid."; + @Override public void setMessage(String message) { this.message = message; } + @Override public String getMessage() { return message; } diff --git a/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java index 336fe78e678..30835d1dff6 100644 --- a/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java +++ b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java @@ -278,6 +278,7 @@ public final class ModelMapTests { getClass().getClassLoader(), new Class[] {Map.class}, new InvocationHandler() { + @Override public Object invoke(Object proxy, Method method, Object[] args) { return "proxy"; } diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java index b1ba9804d28..7d00f311843 100644 --- a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java +++ b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java @@ -115,9 +115,11 @@ public class DataBinderFieldAccessTests extends TestCase { DataBinder binder = new DataBinder(rod, "person"); binder.initDirectFieldAccess(); binder.registerCustomEditor(TestBean.class, "spouse", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean(text, 0)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java index e85cf9a6234..ac5b020c9d7 100644 --- a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java +++ b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java @@ -254,17 +254,21 @@ public class DataBinderTests extends TestCase { TestBean rod = new TestBean(); DataBinder binder = new DataBinder(rod, "person"); binder.registerCustomEditor(String.class, "touchy", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("prefix_" + text); } + @Override public String getAsText() { return getValue().toString().substring(7); } }); binder.registerCustomEditor(TestBean.class, "spouse", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean(text, 0)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } @@ -381,9 +385,11 @@ public class DataBinderTests extends TestCase { FormattingConversionService conversionService = new FormattingConversionService(); DefaultConversionService.addDefaultConverters(conversionService); conversionService.addFormatterForFieldType(String.class, new Formatter() { + @Override public String parse(String text, Locale locale) throws ParseException { throw new ParseException(text, 0); } + @Override public String print(String object, Locale locale) { return object; } @@ -669,6 +675,7 @@ public class DataBinderTests extends TestCase { DataBinder binder = new DataBinder(tb, "person"); binder.registerCustomEditor(ITestBean.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean()); } @@ -689,9 +696,11 @@ public class DataBinderTests extends TestCase { DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(String.class, "name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("prefix" + text); } + @Override public String getAsText() { return ((String) getValue()).substring(6); } @@ -725,9 +734,11 @@ public class DataBinderTests extends TestCase { DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(int.class, "age", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new Integer(99)); } + @Override public String getAsText() { return "argh"; } @@ -746,9 +757,11 @@ public class DataBinderTests extends TestCase { DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(String.class, null, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("prefix" + text); } + @Override public String getAsText() { return ((String) getValue()).substring(6); } @@ -775,6 +788,7 @@ public class DataBinderTests extends TestCase { DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(String.class, null, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { if (getValue() == null || !text.equalsIgnoreCase(getValue().toString())) { setValue(text); @@ -1053,6 +1067,7 @@ public class DataBinderTests extends TestCase { IndexedTestBean tb = new IndexedTestBean(); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(Set.class, new CustomCollectionEditor(TreeSet.class) { + @Override protected Object convertElement(Object element) { return new Integer(element.toString()); } @@ -1091,6 +1106,7 @@ public class DataBinderTests extends TestCase { IndexedTestBean tb = new IndexedTestBean(); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(String.class, "array.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("array" + text); } @@ -1130,6 +1146,7 @@ public class DataBinderTests extends TestCase { tb.getArray()[1].setNestedIndexedBean(new IndexedTestBean()); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(String.class, "array.nestedIndexedBean.list.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("list" + text); } @@ -1166,9 +1183,11 @@ public class DataBinderTests extends TestCase { tb.getArray()[1].setNestedIndexedBean(new IndexedTestBean()); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(String.class, "array.nestedIndexedBean.list.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("list" + text); } + @Override public String getAsText() { return ((String) getValue()).substring(4); } @@ -1189,9 +1208,11 @@ public class DataBinderTests extends TestCase { tb.getArray()[1].setNestedIndexedBean(new IndexedTestBean()); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(String.class, "array[0].nestedIndexedBean.list.name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("list" + text); } + @Override public String getAsText() { return ((String) getValue()).substring(4); } @@ -1212,9 +1233,11 @@ public class DataBinderTests extends TestCase { tb.getArray()[1].setNestedIndexedBean(new IndexedTestBean()); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(String.class, "array.nestedIndexedBean.list[0].name", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("list" + text); } + @Override public String getAsText() { return ((String) getValue()).substring(4); } @@ -1233,11 +1256,13 @@ public class DataBinderTests extends TestCase { IndexedTestBean tb = new IndexedTestBean(); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(TestBean.class, "array", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { DerivedTestBean tb = new DerivedTestBean(); tb.setName("array" + text); setValue(tb); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } @@ -1283,11 +1308,13 @@ public class DataBinderTests extends TestCase { IndexedTestBean tb = new IndexedTestBean(); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(TestBean.class, "map[key0]", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { DerivedTestBean tb = new DerivedTestBean(); tb.setName("array" + text); setValue(tb); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } @@ -1311,11 +1338,13 @@ public class DataBinderTests extends TestCase { IndexedTestBean tb = new IndexedTestBean(); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(TestBean.class, "map", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { DerivedTestBean tb = new DerivedTestBean(); tb.setName("array" + text); setValue(tb); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } @@ -1339,11 +1368,13 @@ public class DataBinderTests extends TestCase { IndexedTestBean tb = new IndexedTestBean(); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(TestBean.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { DerivedTestBean tb = new DerivedTestBean(); tb.setName("array" + text); setValue(tb); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } @@ -1370,6 +1401,7 @@ public class DataBinderTests extends TestCase { TestBean tb = new TestBean(); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(String[].class, "stringArray", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(StringUtils.delimitedListToStringArray(text, "-")); } @@ -1387,6 +1419,7 @@ public class DataBinderTests extends TestCase { TestBean tb = new TestBean(); DataBinder binder = new DataBinder(tb, "tb"); binder.registerCustomEditor(String.class, "stringArray", new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue("X" + text); } @@ -1647,10 +1680,12 @@ public class DataBinderTests extends TestCase { private static class TestBeanValidator implements Validator { + @Override public boolean supports(Class clazz) { return TestBean.class.isAssignableFrom(clazz); } + @Override public void validate(Object obj, Errors errors) { TestBean tb = (TestBean) obj; if (tb.getAge() < 32) { @@ -1674,10 +1709,12 @@ public class DataBinderTests extends TestCase { private static class SpouseValidator implements Validator { + @Override public boolean supports(Class clazz) { return TestBean.class.isAssignableFrom(clazz); } + @Override public void validate(Object obj, Errors errors) { TestBean tb = (TestBean) obj; if (tb == null || "XXX".equals(tb.getName())) { @@ -1703,6 +1740,7 @@ public class DataBinderTests extends TestCase { return list; } + @Override public E get(int index) { if (index >= list.size()) { for (int i = list.size(); i < index; i++) { @@ -1716,50 +1754,62 @@ public class DataBinderTests extends TestCase { } } + @Override public int size() { return list.size(); } + @Override public boolean add(E o) { return list.add(o); } + @Override public void add(int index, E element) { list.add(index, element); } + @Override public boolean addAll(int index, Collection c) { return list.addAll(index, c); } + @Override public void clear() { list.clear(); } + @Override public int indexOf(Object o) { return list.indexOf(o); } + @Override public Iterator iterator() { return list.iterator(); } + @Override public int lastIndexOf(Object o) { return list.lastIndexOf(o); } + @Override public ListIterator listIterator() { return list.listIterator(); } + @Override public ListIterator listIterator(int index) { return list.listIterator(index); } + @Override public E remove(int index) { return list.remove(index); } + @Override public E set(int index, E element) { return list.set(index, element); } diff --git a/spring-context/src/test/java/org/springframework/validation/DefaultMessageCodesResolverTests.java b/spring-context/src/test/java/org/springframework/validation/DefaultMessageCodesResolverTests.java index db86c2384d0..d5e094a2e1f 100644 --- a/spring-context/src/test/java/org/springframework/validation/DefaultMessageCodesResolverTests.java +++ b/spring-context/src/test/java/org/springframework/validation/DefaultMessageCodesResolverTests.java @@ -146,6 +146,7 @@ public class DefaultMessageCodesResolverTests { @Test public void shouldSupportCustomFormat() throws Exception { resolver.setMessageCodeFormatter(new MessageCodeFormatter() { + @Override public String format(String errorCode, String objectName, String field) { return DefaultMessageCodesResolver.Format.toDelimitedString( "CUSTOM-" + errorCode, objectName, field); diff --git a/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java b/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java index 4ab4f448f4c..48a9b9bfe9b 100644 --- a/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java +++ b/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java @@ -161,10 +161,12 @@ public class ValidationUtilsTests { private static class EmptyValidator implements Validator { + @Override public boolean supports(Class clazz) { return TestBean.class.isAssignableFrom(clazz); } + @Override public void validate(Object obj, Errors errors) { ValidationUtils.rejectIfEmpty(errors, "name", "EMPTY", "You must enter a name!"); } @@ -173,10 +175,12 @@ public class ValidationUtilsTests { private static class EmptyOrWhitespaceValidator implements Validator { + @Override public boolean supports(Class clazz) { return TestBean.class.isAssignableFrom(clazz); } + @Override public void validate(Object obj, Errors errors) { ValidationUtils.rejectIfEmptyOrWhitespace(errors, "name", "EMPTY_OR_WHITESPACE", "You must enter a name!"); } diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java index ce29597e0c7..43ac003895e 100644 --- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java +++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java @@ -84,6 +84,7 @@ public class MethodValidationTests { @MyStereotype public static class MyValidBean implements MyValidInterface { + @Override public Object myValidMethod(String arg1, int arg2) { return (arg2 == 0 ? null : "value"); } diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java index 41f500d93ef..5c2dad22a4b 100644 --- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java @@ -273,9 +273,11 @@ public class ValidatorFactoryTests { public static class NameAddressValidator implements ConstraintValidator { + @Override public void initialize(NameAddressValid constraintAnnotation) { } + @Override public boolean isValid(ValidPerson value, ConstraintValidatorContext constraintValidatorContext) { return (value.name == null || !value.address.street.contains(value.name)); } diff --git a/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java b/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java index 2e9aaa5a15b..fe373ecc7e8 100644 --- a/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java +++ b/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java @@ -28,6 +28,7 @@ import org.springframework.aop.AfterReturningAdvice; @SuppressWarnings("serial") public class CountingAfterReturningAdvice extends MethodCounter implements AfterReturningAdvice { + @Override public void afterReturning(Object o, Method m, Object[] args, Object target) throws Throwable { count(m); } diff --git a/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java b/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java index 3dc49faf24f..89fc45aeb5e 100644 --- a/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java +++ b/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java @@ -28,6 +28,7 @@ import org.springframework.aop.MethodBeforeAdvice; @SuppressWarnings("serial") public class CountingBeforeAdvice extends MethodCounter implements MethodBeforeAdvice { + @Override public void before(Method m, Object[] args, Object target) throws Throwable { count(m); } diff --git a/spring-context/src/test/java/test/aspect/PerTargetAspect.java b/spring-context/src/test/java/test/aspect/PerTargetAspect.java index 47fb82e40bc..b3d562e65fa 100644 --- a/spring-context/src/test/java/test/aspect/PerTargetAspect.java +++ b/spring-context/src/test/java/test/aspect/PerTargetAspect.java @@ -25,6 +25,7 @@ public class PerTargetAspect implements Ordered { ++count; } + @Override public int getOrder() { return this.order; } diff --git a/spring-context/src/test/java/test/beans/CustomScope.java b/spring-context/src/test/java/test/beans/CustomScope.java index b047ae29c0c..2f63f3cbfe5 100644 --- a/spring-context/src/test/java/test/beans/CustomScope.java +++ b/spring-context/src/test/java/test/beans/CustomScope.java @@ -33,6 +33,7 @@ public class CustomScope implements Scope { private Map beans = new HashMap(); + @Override public Object get(String name, ObjectFactory objectFactory) { if (createNewScope) { beans.clear(); @@ -50,18 +51,22 @@ public class CustomScope implements Scope { return beans.get(name); } + @Override public String getConversationId() { return null; } + @Override public void registerDestructionCallback(String name, Runnable callback) { // do nothing } + @Override public Object remove(String name) { return beans.remove(name); } + @Override public Object resolveContextualObject(String key) { return null; } diff --git a/spring-context/src/test/java/test/beans/NestedTestBean.java b/spring-context/src/test/java/test/beans/NestedTestBean.java index 2a37c6b8c1c..70736e816e7 100644 --- a/spring-context/src/test/java/test/beans/NestedTestBean.java +++ b/spring-context/src/test/java/test/beans/NestedTestBean.java @@ -36,6 +36,7 @@ public class NestedTestBean implements INestedTestBean { this.company = ((company != null) ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-context/src/test/java/test/beans/TestBean.java b/spring-context/src/test/java/test/beans/TestBean.java index c528573e4df..4e6489e168c 100644 --- a/spring-context/src/test/java/test/beans/TestBean.java +++ b/spring-context/src/test/java/test/beans/TestBean.java @@ -120,6 +120,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -128,6 +129,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -144,10 +146,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -160,10 +164,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.sex = sex; } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -176,10 +182,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return spouse; } + @Override public void setSpouse(ITestBean spouse) { this.spouse = spouse; } @@ -280,10 +288,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -320,6 +330,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -347,12 +358,14 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } @@ -360,6 +373,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -367,9 +381,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -401,6 +417,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if ((this.name != null) && (other instanceof TestBean)) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-context/src/test/java/test/interceptor/NopInterceptor.java b/spring-context/src/test/java/test/interceptor/NopInterceptor.java index 79158e74ea4..ccda8189944 100644 --- a/spring-context/src/test/java/test/interceptor/NopInterceptor.java +++ b/spring-context/src/test/java/test/interceptor/NopInterceptor.java @@ -32,6 +32,7 @@ public class NopInterceptor implements MethodInterceptor { /** * @see org.aopalliance.intercept.MethodInterceptor#invoke(MethodInvocation) */ + @Override public Object invoke(MethodInvocation invocation) throws Throwable { increment(); return invocation.proceed(); diff --git a/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java b/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java index 3b8350e4c83..cec29e27498 100644 --- a/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java +++ b/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java @@ -35,10 +35,12 @@ public class SerializableNopInterceptor extends NopInterceptor implements Serial */ private int count; + @Override public int getCount() { return this.count; } + @Override protected void increment() { ++count; } diff --git a/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java b/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java index 83761c2d3c2..038d1cc6af1 100644 --- a/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java +++ b/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java @@ -37,6 +37,7 @@ public class TimestampIntroductionInterceptor extends DelegatingIntroductionInte this.ts = ts; } + @Override public long getTimeStamp() { return ts; } diff --git a/spring-context/src/test/java/test/mixin/DefaultLockable.java b/spring-context/src/test/java/test/mixin/DefaultLockable.java index 2510395bf6c..ec739f29eed 100644 --- a/spring-context/src/test/java/test/mixin/DefaultLockable.java +++ b/spring-context/src/test/java/test/mixin/DefaultLockable.java @@ -26,14 +26,17 @@ public class DefaultLockable implements Lockable { private boolean locked; + @Override public void lock() { this.locked = true; } + @Override public void unlock() { this.locked = false; } + @Override public boolean locked() { return this.locked; } diff --git a/spring-context/src/test/java/test/mixin/LockMixin.java b/spring-context/src/test/java/test/mixin/LockMixin.java index b038bff1fdc..5894f97a9be 100644 --- a/spring-context/src/test/java/test/mixin/LockMixin.java +++ b/spring-context/src/test/java/test/mixin/LockMixin.java @@ -34,10 +34,12 @@ public class LockMixin extends DelegatingIntroductionInterceptor implements Lock /** This field demonstrates additional state in the mixin */ private boolean locked; + @Override public void lock() { this.locked = true; } + @Override public void unlock() { this.locked = false; } @@ -45,6 +47,7 @@ public class LockMixin extends DelegatingIntroductionInterceptor implements Lock /** * @see test.mixin.AopProxyTests.Lockable#locked() */ + @Override public boolean locked() { return this.locked; } @@ -56,6 +59,7 @@ public class LockMixin extends DelegatingIntroductionInterceptor implements Lock * Lockable(this) then target behaviour. * @see org.aopalliance.MethodInterceptor#invoke(org.aopalliance.MethodInvocation) */ + @Override public Object invoke(MethodInvocation invocation) throws Throwable { if (locked() && invocation.getMethod().getName().indexOf("set") == 0) throw new LockedException(); diff --git a/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java index c4681d4f4ca..497400a7afd 100644 --- a/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -48,12 +48,14 @@ public class DerivedTestBean extends TestBean implements Serializable { } + @Override public void setBeanName(String beanName) { if (this.beanName == null || beanName == null) { this.beanName = beanName; } } + @Override public String getBeanName() { return beanName; } @@ -72,10 +74,12 @@ public class DerivedTestBean extends TestBean implements Serializable { } + @Override public void destroy() { this.destroyed = true; } + @Override public boolean wasDestroyed() { return destroyed; } diff --git a/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-core/src/test/java/org/springframework/beans/TestBean.java b/spring-core/src/test/java/org/springframework/beans/TestBean.java index 2e08e2c034d..3fef4caba0f 100644 --- a/spring-core/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-core/src/test/java/org/springframework/beans/TestBean.java @@ -148,10 +148,12 @@ public class TestBean implements ITestBean, IOther, Comparable { return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -167,10 +169,12 @@ public class TestBean implements ITestBean, IOther, Comparable { } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -183,14 +187,17 @@ public class TestBean implements ITestBean, IOther, Comparable { this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -217,10 +224,12 @@ public class TestBean implements ITestBean, IOther, Comparable { this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -289,6 +298,7 @@ public class TestBean implements ITestBean, IOther, Comparable { this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -297,6 +307,7 @@ public class TestBean implements ITestBean, IOther, Comparable { this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -329,6 +340,7 @@ public class TestBean implements ITestBean, IOther, Comparable { this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -357,18 +369,21 @@ public class TestBean implements ITestBean, IOther, Comparable { /** * @see ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -376,9 +391,11 @@ public class TestBean implements ITestBean, IOther, Comparable { /** * @see IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -408,6 +425,7 @@ public class TestBean implements ITestBean, IOther, Comparable { return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java b/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java index 03a192119d0..e14e03181e5 100644 --- a/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java +++ b/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java @@ -32,6 +32,7 @@ public class AttributeAccessorSupportTests extends TestCase { private AttributeAccessor attributeAccessor; + @Override @SuppressWarnings("serial") protected void setUp() throws Exception { this.attributeAccessor = new AttributeAccessorSupport() { @@ -64,6 +65,7 @@ public class AttributeAccessorSupportTests extends TestCase { assertTrue(Arrays.binarySearch(attributeNames, NAME) > -1); assertTrue(Arrays.binarySearch(attributeNames, "abc") > -1); } + @Override protected void tearDown() throws Exception { this.attributeAccessor.removeAttribute(NAME); } diff --git a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java index 98c4a543148..d1f09e0576f 100644 --- a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java +++ b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java @@ -356,9 +356,11 @@ public class BridgeMethodResolverTests { public void someMethod(Integer theArg, Object otherArg) { } + @Override public void someMethod(String theArg, Object otherArg) { } + @Override public void someVarargMethod(String theArg, Object... otherArgs) { } } @@ -383,6 +385,7 @@ public class BridgeMethodResolverTests { public static class MyBar extends InterBar { + @Override public void someMethod(String theArg, Object otherArg) { } @@ -399,6 +402,7 @@ public class BridgeMethodResolverTests { public abstract class AbstractDateAdder implements Adder { + @Override public abstract void add(Date date); } @@ -430,6 +434,7 @@ public class BridgeMethodResolverTests { public class ExtendsReallyDeepNow extends ReallyDeepNow { + @Override void someMethod(Integer s, String t, Long r) { throw new UnsupportedOperationException(); } @@ -448,10 +453,12 @@ public class BridgeMethodResolverTests { public class MyBoo implements Boo { + @Override public void foo(String e) { throw new UnsupportedOperationException(); } + @Override public void foo(Integer t) { throw new UnsupportedOperationException(); } @@ -478,12 +485,14 @@ public class BridgeMethodResolverTests { public interface SettingsDao extends Dao { + @Override T load(); } public interface ConcreteSettingsDao extends SettingsDao { + @Override String loadFromParent(); } @@ -500,6 +509,7 @@ public class BridgeMethodResolverTests { } //@Transactional(readOnly = true) + @Override public S loadFromParent() { return otherObject; } @@ -513,6 +523,7 @@ public class BridgeMethodResolverTests { } //@Transactional(readOnly = true) + @Override public ConcreteSettings load() { return super.object; } @@ -527,6 +538,7 @@ public class BridgeMethodResolverTests { private static class AbstractBounded implements Bounded { + @Override public boolean boundedOperation(E myE) { return true; } @@ -535,6 +547,7 @@ public class BridgeMethodResolverTests { private static class SerializableBounded extends AbstractBounded { + @Override public boolean boundedOperation(E myE) { return false; } @@ -549,6 +562,7 @@ public class BridgeMethodResolverTests { private static class StringGenericParameter implements GenericParameter { + @Override public String getFor(Class cls) { return "foo"; } @@ -561,94 +575,117 @@ public class BridgeMethodResolverTests { private static class StringList implements List { + @Override public int size() { throw new UnsupportedOperationException(); } + @Override public boolean isEmpty() { throw new UnsupportedOperationException(); } + @Override public boolean contains(Object o) { throw new UnsupportedOperationException(); } + @Override public Iterator iterator() { throw new UnsupportedOperationException(); } + @Override public Object[] toArray() { throw new UnsupportedOperationException(); } + @Override public T[] toArray(T[] a) { throw new UnsupportedOperationException(); } + @Override public boolean add(String o) { throw new UnsupportedOperationException(); } + @Override public boolean remove(Object o) { throw new UnsupportedOperationException(); } + @Override public boolean containsAll(Collection c) { throw new UnsupportedOperationException(); } + @Override public boolean addAll(Collection c) { throw new UnsupportedOperationException(); } + @Override public boolean addAll(int index, Collection c) { throw new UnsupportedOperationException(); } + @Override public boolean removeAll(Collection c) { throw new UnsupportedOperationException(); } + @Override public boolean retainAll(Collection c) { throw new UnsupportedOperationException(); } + @Override public void clear() { throw new UnsupportedOperationException(); } + @Override public String get(int index) { throw new UnsupportedOperationException(); } + @Override public String set(int index, String element) { throw new UnsupportedOperationException(); } + @Override public void add(int index, String element) { throw new UnsupportedOperationException(); } + @Override public String remove(int index) { throw new UnsupportedOperationException(); } + @Override public int indexOf(Object o) { throw new UnsupportedOperationException(); } + @Override public int lastIndexOf(Object o) { throw new UnsupportedOperationException(); } + @Override public ListIterator listIterator() { throw new UnsupportedOperationException(); } + @Override public ListIterator listIterator(int index) { throw new UnsupportedOperationException(); } + @Override public List subList(int fromIndex, int toIndex) { throw new UnsupportedOperationException(); } @@ -665,6 +702,7 @@ public class BridgeMethodResolverTests { private int priority; + @Override public int getPriority() { return priority; } @@ -743,6 +781,7 @@ public class BridgeMethodResolverTests { */ public abstract Receiver getInstance(); + @Override public void setChannel(Channel channel) { this.channel = channel; } @@ -753,10 +792,12 @@ public class BridgeMethodResolverTests { this.beanName = name; } + @Override public void subscribe() { } + @Override public void unsubscribe() { } @@ -800,6 +841,7 @@ public class BridgeMethodResolverTests { super(NewMessageEvent.class); } + @Override public void receive(MessageEvent event) { throw new UnsupportedOperationException("should not be called, use subclassed events"); } @@ -861,6 +903,7 @@ public class BridgeMethodResolverTests { public void setRepos(R... reps) { } + @Override public SimpleGenericRepository getFor(Class entityType) { return null; } @@ -896,40 +939,50 @@ public class BridgeMethodResolverTests { public void setPersistentClass(Class c) { } + @Override public Class getPersistentClass() { return null; } + @Override public T findById(ID id, boolean lock) { return null; } + @Override public List findAll() { return null; } + @Override public List findByExample(T exampleInstance) { return null; } + @Override public List findByQuery() { return null; } + @Override public T saveOrUpdate(T entity) { return null; } + @Override public void delete(T entity) { } + @Override public T refresh(T entity) { return null; } + @Override public void delete(ID id) { } + @Override public void delete(Collection entities) { } } @@ -937,9 +990,11 @@ public class BridgeMethodResolverTests { public class HibernateRepositoryRegistry extends SettableRepositoryRegistry> { + @Override public void injectInto(GenericHibernateRepository rep) { } + @Override public GenericHibernateRepository getFor(Class entityType) { return null; } @@ -958,6 +1013,7 @@ public class BridgeMethodResolverTests { public class MyHomer, L extends T> implements Homer { + @Override public void foo(L t) { throw new UnsupportedOperationException(); } @@ -966,6 +1022,7 @@ public class BridgeMethodResolverTests { public class YourHomer, L extends T> extends MyHomer { + @Override public void foo(L t) { throw new UnsupportedOperationException(); } @@ -984,6 +1041,7 @@ public class BridgeMethodResolverTests { public class GenericSqlMapDao implements ConvenienceGenericDao { + @Override public void saveOrUpdate(T t) { throw new UnsupportedOperationException(); } @@ -992,6 +1050,7 @@ public class BridgeMethodResolverTests { public class GenericSqlMapIntegerDao extends GenericSqlMapDao { + @Override public void saveOrUpdate(T t) { } } @@ -1027,9 +1086,11 @@ public class BridgeMethodResolverTests { public class UserDaoImpl extends AbstractDao implements UserDao { + @Override public void save(Permission perm) { } + @Override public void saveVararg(User user, Object... args) { } } @@ -1053,9 +1114,11 @@ public class BridgeMethodResolverTests { public class BusinessDao extends BusinessGenericDao, Long> { + @Override public void save(Business business) { } + @Override public Business get(Long id) { return null; } @@ -1110,6 +1173,7 @@ public class BridgeMethodResolverTests { throw new UnsupportedOperationException(); } + @Override public void receive(MegaMessageEvent event) { throw new UnsupportedOperationException(); } @@ -1136,6 +1200,7 @@ public class BridgeMethodResolverTests { private static abstract class AbstractImplementsInterface implements IGenericInterface { + @Override public void doSomething(D domainObject, T value) { } @@ -1175,10 +1240,12 @@ public class BridgeMethodResolverTests { private static class DomainObject extends AbstractDomainObject { + @Override public byte[] method1(ParameterType p) { return super.method1(p); } + @Override public void method2(ParameterType p, byte[] r) { super.method2(p, r); } @@ -1215,6 +1282,7 @@ public class BridgeMethodResolverTests { public static class ExternalMessageProvider> implements IExternalMessageProvider { + @Override public Collection findBy(T conditions) { return null; } @@ -1235,6 +1303,7 @@ public class BridgeMethodResolverTests { public static class TestEmailProvider extends EmailMessageProvider { + @Override public Collection findBy(EmailSearchConditions conditions) { return null; } diff --git a/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java b/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java index ea011aa984d..8f354e82530 100644 --- a/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java +++ b/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java @@ -30,6 +30,7 @@ public class DefaultControlFlowTests extends AbstractControlFlowTests { public void testThisClassPlease() { } + @Override protected ControlFlow createControlFlow() { return ControlFlowFactory.createControlFlow(); } diff --git a/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java index d86ed5ebb65..1d0b3f75105 100644 --- a/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java +++ b/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java @@ -36,6 +36,7 @@ import org.springframework.core.io.Resource; */ public class GenericCollectionTypeResolverTests extends AbstractGenericsTests { + @Override protected void setUp() throws Exception { this.targetClass = Foo.class; this.methods = new String[] {"a", "b", "b2", "b3", "c", "d", "d2", "d3", "e", "e2", "e3"}; @@ -44,6 +45,7 @@ public class GenericCollectionTypeResolverTests extends AbstractGenericsTests { Integer.class, Integer.class, Integer.class, Integer.class, Integer.class}; } + @Override protected Type getType(Method method) { return GenericCollectionTypeResolver.getMapValueReturnType(method); } diff --git a/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java b/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java index 281141361ea..8acc0645d35 100644 --- a/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java +++ b/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java @@ -30,6 +30,7 @@ public class Jdk14ControlFlowTests extends AbstractControlFlowTests { public void testThisClassPlease() { } + @Override protected ControlFlow createControlFlow() { return ControlFlowFactory.createControlFlow(); } diff --git a/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java b/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java index 9c9d515bab6..602000ac7ce 100644 --- a/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java +++ b/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java @@ -30,6 +30,7 @@ public final class OrderComparatorTests extends TestCase { private Comparator comparator; + @Override protected void setUp() throws Exception { this.comparator = new OrderComparator(); } @@ -64,6 +65,7 @@ public final class OrderComparatorTests extends TestCase { this.order = order; } + @Override public int getOrder() { return this.order; } diff --git a/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java index b5480482e4b..3cf0875625a 100644 --- a/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java +++ b/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java @@ -31,18 +31,22 @@ public class PrioritizedParameterNameDiscovererTests extends TestCase { private static final String[] SOMETHING_ELSE = new String[] { "something", "else" }; ParameterNameDiscoverer returnsFooBar = new ParameterNameDiscoverer() { + @Override public String[] getParameterNames(Method m) { return FOO_BAR; } + @Override public String[] getParameterNames(Constructor ctor) { return FOO_BAR; } }; ParameterNameDiscoverer returnsSomethingElse = new ParameterNameDiscoverer() { + @Override public String[] getParameterNames(Method m) { return SOMETHING_ELSE; } + @Override public String[] getParameterNames(Constructor ctor) { return SOMETHING_ELSE; } diff --git a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java index b02c6c3aaa1..0c5d88f3343 100644 --- a/spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java @@ -258,6 +258,7 @@ public class AnnotationUtilsTests { } + @Override public void fromInterfaceImplementedByRoot() { } @@ -290,6 +291,7 @@ public class AnnotationUtilsTests { public static class SimpleFoo extends Foo { + @Override @Transactional public void something(final String arg) { @@ -339,12 +341,14 @@ public class AnnotationUtilsTests { public static class ImplementsInterfaceWithAnnotatedMethod implements InterfaceWithAnnotatedMethod { + @Override public void foo() { } } public static class SubOfImplementsInterfaceWithAnnotatedMethod extends ImplementsInterfaceWithAnnotatedMethod { + @Override public void foo() { } } @@ -354,6 +358,7 @@ public class AnnotationUtilsTests { public static class SubOfAbstractImplementsInterfaceWithAnnotatedMethod extends AbstractDoesNotImplementInterfaceWithAnnotatedMethod { + @Override public void foo() { } } diff --git a/spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java b/spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java index 21d87d9b15e..90e2bf893b6 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java @@ -255,34 +255,42 @@ public class TypeDescriptorTests { public class IntegerType implements GenericType { + @Override public Integer getProperty() { return null; } + @Override public void setProperty(Integer t) { } + @Override public List getListProperty() { return null; } + @Override public void setListProperty(List t) { } } public class NumberType implements GenericType { + @Override public Integer getProperty() { return null; } + @Override public void setProperty(Number t) { } + @Override public List getListProperty() { return null; } + @Override public void setListProperty(List t) { } } diff --git a/spring-core/src/test/java/org/springframework/core/convert/converter/ConvertingComparatorTests.java b/spring-core/src/test/java/org/springframework/core/convert/converter/ConvertingComparatorTests.java index 500fd9c0e51..4cadfe7406f 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/converter/ConvertingComparatorTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/converter/ConvertingComparatorTests.java @@ -120,6 +120,7 @@ public class ConvertingComparatorTests { private static class StringToInteger implements Converter { + @Override public Integer convert(String source) { return new Integer(source); } @@ -131,6 +132,7 @@ public class ConvertingComparatorTests { private boolean called; + @Override public int compare(Integer o1, Integer o2) { assertThat(o1, instanceOf(Integer.class)); assertThat(o2, instanceOf(Integer.class)); diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java index 6c16ee75a35..96f3fc71df9 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java @@ -223,50 +223,62 @@ public class CollectionToCollectionConverterTests { public static abstract class BaseResource implements Resource { + @Override public InputStream getInputStream() throws IOException { return null; } + @Override public boolean exists() { return false; } + @Override public boolean isReadable() { return false; } + @Override public boolean isOpen() { return false; } + @Override public URL getURL() throws IOException { return null; } + @Override public URI getURI() throws IOException { return null; } + @Override public File getFile() throws IOException { return null; } + @Override public long contentLength() throws IOException { return 0; } + @Override public long lastModified() throws IOException { return 0; } + @Override public Resource createRelative(String relativePath) throws IOException { return null; } + @Override public String getFilename() { return null; } + @Override public String getDescription() { return null; } diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java index c0495b52137..38f3c835e50 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java @@ -307,6 +307,7 @@ public class DefaultConversionTests { } public class ColorConverter implements Converter { + @Override public Color convert(String source) { if (!source.startsWith("#")) source = "#" + source; return Color.decode(source); } } diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java index b5ede248edf..41333498ba9 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java @@ -143,6 +143,7 @@ public class GenericConversionServiceTests { public void addConverterNoSourceTargetClassInfoAvailable() { try { conversionService.addConverter(new Converter() { + @Override public Object convert(Object source) { return source; } @@ -201,6 +202,7 @@ public class GenericConversionServiceTests { @Test public void convertSuperSourceType() { conversionService.addConverter(new Converter() { + @Override public Integer convert(CharSequence source) { return Integer.valueOf(source.toString()); } @@ -218,6 +220,7 @@ public class GenericConversionServiceTests { } public class ColorConverter implements Converter { + @Override public Color convert(String source) { if (!source.startsWith("#")) source = "#" + source; return Color.decode(source); } } @@ -503,6 +506,7 @@ public class GenericConversionServiceTests { private static class MyBaseInterfaceConverter implements Converter { + @Override public String convert(MyBaseInterface source) { return "RESULT"; } @@ -511,6 +515,7 @@ public class GenericConversionServiceTests { private static class MyStringArrayToResourceArrayConverter implements Converter { + @Override public Resource[] convert(String[] source) { Resource[] result = new Resource[source.length]; for (int i = 0; i < source.length; i++) { @@ -523,6 +528,7 @@ public class GenericConversionServiceTests { private static class MyStringArrayToIntegerArrayConverter implements Converter { + @Override public Integer[] convert(String[] source) { Integer[] result = new Integer[source.length]; for (int i = 0; i < source.length; i++) { @@ -535,6 +541,7 @@ public class GenericConversionServiceTests { private static class MyStringToIntegerArrayConverter implements Converter { + @Override public Integer[] convert(String source) { String[] srcArray = StringUtils.commaDelimitedListToStringArray(source); Integer[] result = new Integer[srcArray.length]; @@ -673,10 +680,12 @@ public class GenericConversionServiceTests { GenericConversionService conversionService = new GenericConversionService(); GenericConverter converter = new GenericConverter() { + @Override public Set getConvertibleTypes() { return null; } + @Override public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { return null; @@ -716,6 +725,7 @@ public class GenericConversionServiceTests { public void convertCannotOptimizeArray() throws Exception { GenericConversionService conversionService = new GenericConversionService(); conversionService.addConverter(new Converter() { + @Override public Byte convert(Byte source) { return (byte) (source + 1); } @@ -764,11 +774,13 @@ public class GenericConversionServiceTests { private int matchAttempts = 0; + @Override public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) { matchAttempts++; return false; } + @Override public Color convert(String source) { throw new IllegalStateException(); } @@ -783,15 +795,18 @@ public class GenericConversionServiceTests { private List sourceTypes = new ArrayList(); + @Override public Set getConvertibleTypes() { return null; } + @Override public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) { sourceTypes.add(sourceType); return false; } + @Override public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor targetType) { return null; @@ -809,11 +824,13 @@ public class GenericConversionServiceTests { private int matchAttempts = 0; + @Override public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) { matchAttempts++; return true; } + @Override @SuppressWarnings("unchecked") public Converter getConverter(Class targetType) { return (Converter) converter; @@ -834,6 +851,7 @@ public class GenericConversionServiceTests { public static enum MyEnum implements MyEnumInterface { A { + @Override public String getCode() { return "1"; } @@ -842,6 +860,7 @@ public class GenericConversionServiceTests { private static class MyEnumInterfaceToStringConverter implements Converter { + @Override public String convert(T source) { return source.getCode(); } diff --git a/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java b/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java index f3d6258fbb7..c9f0eae2a50 100644 --- a/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java +++ b/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java @@ -136,6 +136,7 @@ public class LabeledEnumTests extends TestCase { public static final Dog GOLDEN_RETRIEVER = new Dog(11, null) { + @Override public String getLabel() { return "Golden Retriever"; } @@ -143,6 +144,7 @@ public class LabeledEnumTests extends TestCase { // Overriding getType() is no longer necessary as of Spring 2.5; // however, this is left here to provide valid testing for // backwards compatibility. + @Override public Class getType() { return Dog.class; } @@ -165,12 +167,14 @@ public class LabeledEnumTests extends TestCase { private static abstract class ValuedEnum extends StaticLabeledEnum { public static final ValuedEnum ONE = new ValuedEnum(1, "one") { + @Override public int getValue() { return 1; } }; public static final ValuedEnum TWO = new ValuedEnum(2, "two") { + @Override public int getValue() { return 2; } diff --git a/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java b/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java index 469795437cb..2da1da51647 100644 --- a/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java +++ b/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java @@ -186,9 +186,11 @@ public class ResourceTests { final String name = "test-resource"; Resource resource = new AbstractResource() { + @Override public String getDescription() { return name; } + @Override public InputStream getInputStream() { return null; } @@ -222,9 +224,11 @@ public class ResourceTests { @Test public void testContentLength() throws IOException { AbstractResource resource = new AbstractResource() { + @Override public InputStream getInputStream() throws IOException { return new ByteArrayInputStream(new byte[] { 'a', 'b', 'c' }); } + @Override public String getDescription() { return null; } @@ -235,9 +239,11 @@ public class ResourceTests { @Test(expected=IllegalStateException.class) public void testContentLength_withNullInputStream() throws IOException { AbstractResource resource = new AbstractResource() { + @Override public InputStream getInputStream() throws IOException { return null; } + @Override public String getDescription() { return null; } diff --git a/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory1.java b/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory1.java index d1b6fa034df..11dd7ebf486 100644 --- a/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory1.java +++ b/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory1.java @@ -26,6 +26,7 @@ import org.springframework.core.annotation.Order; @Order(1) public class MyDummyFactory1 implements DummyFactory { + @Override public String getString() { return "Foo"; } diff --git a/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory2.java b/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory2.java index 4872d0053ee..5105c6b47ea 100644 --- a/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory2.java +++ b/spring-core/src/test/java/org/springframework/core/io/support/MyDummyFactory2.java @@ -26,6 +26,7 @@ import org.springframework.core.annotation.Order; @Order(2) public class MyDummyFactory2 implements DummyFactory { + @Override public String getString() { return "Bar"; } diff --git a/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java b/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java index f8db4e7fd9e..576ab738149 100644 --- a/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java +++ b/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java @@ -33,6 +33,7 @@ public class ToStringCreatorTests extends TestCase { private SomeObject s1, s2, s3; + @Override protected void setUp() throws Exception { s1 = new SomeObject() { public String toString() { diff --git a/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java b/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java index 78ced2402f0..b7a6d5c3819 100644 --- a/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java +++ b/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java @@ -56,6 +56,7 @@ public final class SimpleAsyncTaskExecutorTests extends TestCase { public void testThreadFactoryOverridesDefaults() throws Exception { final Object monitor = new Object(); SimpleAsyncTaskExecutor executor = new SimpleAsyncTaskExecutor(new ThreadFactory() { + @Override public Thread newThread(Runnable r) { return new Thread(r, "test"); } @@ -88,6 +89,7 @@ public final class SimpleAsyncTaskExecutorTests extends TestCase { private static final class NoOpRunnable implements Runnable { + @Override public void run() { // no-op } @@ -102,6 +104,7 @@ public final class SimpleAsyncTaskExecutorTests extends TestCase { this.monitor = monitor; } + @Override public final void run() { synchronized (this.monitor) { try { @@ -129,6 +132,7 @@ public final class SimpleAsyncTaskExecutorTests extends TestCase { return this.threadName; } + @Override protected void doRun() { this.threadName = Thread.currentThread().getName(); } diff --git a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java index d7bdd36e41b..b82a952c267 100644 --- a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java +++ b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java @@ -85,6 +85,7 @@ public class AutoPopulatingListTests extends TestCase { private static class MockElementFactory implements AutoPopulatingList.ElementFactory { + @Override public Object createElement(int index) { TestBean bean = new TestBean(); bean.setAge(index); diff --git a/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java b/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java index 57a2998e0bb..fe70ac344d5 100644 --- a/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java +++ b/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java @@ -99,6 +99,7 @@ public class CachingMapDecoratorTests extends TestCase { private boolean createCalled; + @Override protected String create(String key) { createCalled = true; return (key != null ? "expensive value to cache" : null); diff --git a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java index 8b7fdff79ae..96146d31a84 100644 --- a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java @@ -41,6 +41,7 @@ import org.springframework.beans.TestBean; */ public class ClassUtilsTests extends TestCase { + @Override public void setUp() { InnerClass.noArgCalled = false; InnerClass.argCalled = false; diff --git a/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java b/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java index 5d35e6c0599..f9a6d1070ef 100644 --- a/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java +++ b/spring-core/src/test/java/org/springframework/util/ConcurrentReferenceHashMapTests.java @@ -490,6 +490,7 @@ public class ConcurrentReferenceHashMapTests { StopWatch mapTime = timeMultiThreaded("SynchronizedMap", synchronizedMap, new ValueFactory>() { + @Override public WeakReference newValue(int v) { return new WeakReference(String.valueOf(v)); } @@ -500,6 +501,7 @@ public class ConcurrentReferenceHashMapTests { StopWatch cacheTime = timeMultiThreaded("WeakConcurrentCache", this.map, new ValueFactory() { + @Override public String newValue(int v) { return String.valueOf(v); } @@ -650,18 +652,22 @@ public class ConcurrentReferenceHashMapTests { this.queue = queue; } + @Override public Entry get() { return this.entry; } + @Override public int getHash() { return this.hash; } + @Override public Reference getNext() { return this.next; } + @Override public void release() { this.queue.add(this); this.entry = null; diff --git a/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java b/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java index 5eaa203ef5a..94e790d97ed 100644 --- a/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java @@ -73,6 +73,7 @@ public class FileSystemUtilsTests extends TestCase { assertTrue(!src.exists()); } + @Override protected void tearDown() throws Exception { File tmp = new File("./tmp"); if (tmp.exists()) { diff --git a/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java b/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java index bb9e5700fee..356fad6b53e 100644 --- a/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java +++ b/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java @@ -227,6 +227,7 @@ public class MethodInvokerTests extends TestCase { private static class Purchaser implements Greetable { + @Override public String getGreeting() { return "hello"; } @@ -235,6 +236,7 @@ public class MethodInvokerTests extends TestCase { private static class Shopper extends Purchaser implements Person { + @Override public String getGreeting() { return "may I help you?"; } @@ -243,6 +245,7 @@ public class MethodInvokerTests extends TestCase { private static class Salesman implements Person { + @Override public String getGreeting() { return "how are sales?"; } @@ -251,6 +254,7 @@ public class MethodInvokerTests extends TestCase { private static class Customer extends Shopper { + @Override public String getGreeting() { return "good day"; } @@ -265,6 +269,7 @@ public class MethodInvokerTests extends TestCase { this.name = name; } + @Override public String getGreeting() { return "welcome back " + name ; } @@ -277,6 +282,7 @@ public class MethodInvokerTests extends TestCase { super(name); } + @Override public String getGreeting() { return "whassup dude?"; } diff --git a/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java b/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java index 13e662d381d..be48ab08ff9 100644 --- a/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java +++ b/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java @@ -34,6 +34,7 @@ public class MockLog4jAppender extends AppenderSkeleton { /* (non-Javadoc) * @see org.apache.log4j.AppenderSkeleton#append(org.apache.log4j.spi.LoggingEvent) */ + @Override protected void append(LoggingEvent evt) { //System.out.println("Adding " + evt.getMessage()); loggingStrings.add(evt.getMessage()); @@ -42,6 +43,7 @@ public class MockLog4jAppender extends AppenderSkeleton { /* (non-Javadoc) * @see org.apache.log4j.Appender#close() */ + @Override public void close() { closeCalled = true; } @@ -49,6 +51,7 @@ public class MockLog4jAppender extends AppenderSkeleton { /* (non-Javadoc) * @see org.apache.log4j.Appender#requiresLayout() */ + @Override public boolean requiresLayout() { return false; } diff --git a/spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java b/spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java index d353cb9e0a9..20bb969c6e2 100644 --- a/spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java +++ b/spring-core/src/test/java/org/springframework/util/PropertyPlaceholderHelperTests.java @@ -82,6 +82,7 @@ public class PropertyPlaceholderHelperTests { assertEquals("foo=bar", this.helper.replacePlaceholders(text, new PropertyPlaceholderHelper.PlaceholderResolver() { + @Override public String resolvePlaceholder(String placeholderName) { if ("foo".equals(placeholderName)) { return "bar"; diff --git a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java index 20d69e05b41..512b9af9930 100644 --- a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java @@ -212,6 +212,7 @@ public class ReflectionUtilsTests { public void doWithProtectedMethods() { ListSavingMethodCallback mc = new ListSavingMethodCallback(); ReflectionUtils.doWithMethods(TestBean.class, mc, new ReflectionUtils.MethodFilter() { + @Override public boolean matches(Method m) { return Modifier.isProtected(m.getModifiers()); } @@ -353,6 +354,7 @@ public class ReflectionUtilsTests { private List methods = new LinkedList(); + @Override public void doWith(Method m) throws IllegalArgumentException, IllegalAccessException { this.methodNames.add(m.getName()); this.methods.add(m); diff --git a/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java index 923c9fe5acb..7e47d99f5b2 100644 --- a/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java @@ -63,6 +63,7 @@ public class ResourceUtilsTests extends TestCase { */ private static class DummyURLStreamHandler extends URLStreamHandler { + @Override protected URLConnection openConnection(URL url) throws IOException { throw new UnsupportedOperationException(); } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java index bbf14c12272..516e7ce66ea 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java @@ -173,6 +173,7 @@ public class ConstructorInvocationTests extends ExpressionTestCase { static class DummyConstructorResolver implements ConstructorResolver { + @Override public ConstructorExecutor resolve(EvaluationContext context, String typeName, List argumentTypes) throws AccessException { throw new UnsupportedOperationException("Auto-generated method stub"); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java index 56e26f30da5..aeb991ab553 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java @@ -608,6 +608,7 @@ public class EvaluationTests extends ExpressionTestCase { static class CustomMethodResolver implements MethodResolver { + @Override public MethodExecutor resolve(EvaluationContext context, Object targetObject, String name, List argumentTypes) throws AccessException { @@ -617,6 +618,7 @@ public class EvaluationTests extends ExpressionTestCase { static class CustomMethodFilter implements MethodFilter { + @Override public List filter(List methods) { return null; } @@ -1373,6 +1375,7 @@ public class EvaluationTests extends ExpressionTestCase { static class MyBeanResolver implements BeanResolver { + @Override public Object resolve(EvaluationContext context, String beanName) throws AccessException { if (beanName.equals("foo") || beanName.equals("bar")) { diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java index b225aa66df2..ca8a5db5191 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java @@ -256,22 +256,27 @@ public class ExpressionLanguageScenarioTests extends ExpressionTestCase { /** * Null means you might be able to read any property, if an earlier property resolver hasn't beaten you to it */ + @Override public Class[] getSpecificTargetClasses() { return null; } + @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { return propertyMap.containsKey(name); } + @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { return new TypedValue(propertyMap.get(name)); } + @Override public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException { return false; } + @Override public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { } @@ -295,22 +300,27 @@ public class ExpressionLanguageScenarioTests extends ExpressionTestCase { /** * Null means you might be able to read any property, if an earlier property resolver hasn't beaten you to it */ + @Override public Class[] getSpecificTargetClasses() { return null; } + @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { return propertyMap.containsKey(name); } + @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { return new TypedValue(propertyMap.get(name)); } + @Override public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException { return false; } + @Override public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java index 9f4d22b363c..a9b24b1b382 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java @@ -182,10 +182,12 @@ public class ExpressionTestsUsingCoreConversionService extends ExpressionTestCas private final ConversionService service = new DefaultConversionService(); + @Override public boolean canConvert(TypeDescriptor sourceType, TypeDescriptor targetType) { return this.service.canConvert(sourceType, targetType); } + @Override public Object convertValue(Object value, TypeDescriptor sourceType, TypeDescriptor targetType) throws EvaluationException { return this.service.convert(value, sourceType, targetType); } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java index f94503828b6..aebe1584683 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java @@ -62,24 +62,29 @@ public class IndexingTests { public static class MapAccessor implements PropertyAccessor { + @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { return (((Map) target).containsKey(name)); } + @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { return new TypedValue(((Map) target).get(name)); } + @Override public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException { return true; } + @Override @SuppressWarnings("unchecked") public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { ((Map) target).put(name, newValue); } + @Override public Class[] getSpecificTargetClasses() { return new Class[] { Map.class }; } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java index 215e7036718..d95227dffb6 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java @@ -149,24 +149,29 @@ public class MapAccessTests extends ExpressionTestCase { public static class MapAccessor implements PropertyAccessor { + @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { return (((Map) target).containsKey(name)); } + @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { return new TypedValue(((Map) target).get(name)); } + @Override public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException { return true; } + @Override @SuppressWarnings("unchecked") public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { ((Map) target).put(name, newValue); } + @Override public Class[] getSpecificTargetClasses() { return new Class[] { Map.class }; } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java index 56555b209d9..682dfe525ec 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java @@ -274,6 +274,7 @@ public class MethodInvocationTests extends ExpressionTestCase { return false; } + @Override public List filter(List methods) { filterCalled = true; List forRemoval = new ArrayList(); @@ -329,6 +330,7 @@ public class MethodInvocationTests extends ExpressionTestCase { static class DummyMethodResolver implements MethodResolver { + @Override public MethodExecutor resolve(EvaluationContext context, Object targetObject, String name, List argumentTypes) throws AccessException { throw new UnsupportedOperationException("Auto-generated method stub"); @@ -379,6 +381,7 @@ public class MethodInvocationTests extends ExpressionTestCase { byte[] bytes = new byte[100]; StandardEvaluationContext context = new StandardEvaluationContext(bytes); context.setBeanResolver(new BeanResolver() { + @Override public Object resolve(EvaluationContext context, String beanName) throws AccessException { if ("service".equals(beanName)) { diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java index 66aa85fb892..604016eb991 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java @@ -34,6 +34,7 @@ public class OperatorOverloaderTests extends ExpressionTestCase { static class StringAndBooleanAddition implements OperatorOverloader { + @Override public Object operate(Operation operation, Object leftOperand, Object rightOperand) throws EvaluationException { if (operation==Operation.ADD) { return ((String)leftOperand)+((Boolean)rightOperand).toString(); @@ -42,6 +43,7 @@ public class OperatorOverloaderTests extends ExpressionTestCase { } } + @Override public boolean overridesOperation(Operation operation, Object leftOperand, Object rightOperand) throws EvaluationException { if (leftOperand instanceof String && rightOperand instanceof Boolean) { diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java index 3cb81de5e92..104000d8780 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java @@ -170,28 +170,33 @@ public class PropertyAccessTests extends ExpressionTestCase { int flibbles = 7; + @Override public Class[] getSpecificTargetClasses() { return new Class[] { String.class }; } + @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { if (!(target instanceof String)) throw new RuntimeException("Assertion Failed! target should be String"); return (name.equals("flibbles")); } + @Override public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException { if (!(target instanceof String)) throw new RuntimeException("Assertion Failed! target should be String"); return (name.equals("flibbles")); } + @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { if (!name.equals("flibbles")) throw new RuntimeException("Assertion Failed! name should be flibbles"); return new TypedValue(flibbles); } + @Override public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { if (!name.equals("flibbles")) diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java b/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java index 5bc84c9d380..214af39187d 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java @@ -187,6 +187,7 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase { super(n); } + @Override public String[] getRoles() { return new String[]{"MANAGER"};} } @@ -197,6 +198,7 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase { super(n); } + @Override public String[] getRoles() { return new String[]{"TELLER"};} } @@ -207,6 +209,7 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase { super(n); } + @Override public String[] getRoles() { return new String[]{"SUPERVISOR"};} } @@ -217,22 +220,27 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase { public String name = "Andy"; } + @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { return name.equals("principal"); } + @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { return new TypedValue(new Principal()); } + @Override public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException { return false; } + @Override public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { } + @Override public Class[] getSpecificTargetClasses() { return null; } @@ -247,22 +255,27 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase { void setPerson(Person p) { this.activePerson = p; } + @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { return name.equals("p"); } + @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { return new TypedValue(activePerson); } + @Override public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException { return false; } + @Override public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { } + @Override public Class[] getSpecificTargetClasses() { return null; } @@ -280,6 +293,7 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase { this.tc = typeConverter; } + @Override public TypedValue execute(EvaluationContext context, Object target, Object... arguments) throws AccessException { try { @@ -303,6 +317,7 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase { } } + @Override public MethodExecutor resolve(EvaluationContext context, Object targetObject, String name, List arguments) throws AccessException { if (name.equals("hasRole")) { diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java index 6876afb0e10..0216f5c7afb 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java @@ -487,14 +487,17 @@ public class SpelDocumentationTests extends ExpressionTestCase { static class TemplatedParserContext implements ParserContext { + @Override public String getExpressionPrefix() { return "${"; } + @Override public String getExpressionSuffix() { return "}"; } + @Override public boolean isTemplate() { return true; } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java index dad8d43bea7..e1122ab04f9 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java @@ -122,6 +122,7 @@ public class SpelReproTests extends ExpressionTestCase { static class MyTypeLocator extends StandardTypeLocator { + @Override public Class findType(String typename) throws EvaluationException { if (typename.equals("Spr5899Class")) { return Spr5899Class.class; @@ -240,23 +241,28 @@ public class SpelReproTests extends ExpressionTestCase { static class MapAccessor implements PropertyAccessor { + @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { return (((Map) target).containsKey(name)); } + @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { return new TypedValue(((Map) target).get(name)); } + @Override public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException { return true; } + @Override @SuppressWarnings("unchecked") public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { ((Map) target).put(name, newValue); } + @Override public Class[] getSpecificTargetClasses() { return new Class[] {Map.class}; } @@ -546,12 +552,15 @@ public class SpelReproTests extends ExpressionTestCase { } private static final ParserContext DOLLARSQUARE_TEMPLATE_PARSER_CONTEXT = new ParserContext() { + @Override public String getExpressionPrefix() { return "$["; } + @Override public String getExpressionSuffix() { return "]"; } + @Override public boolean isTemplate() { return true; } @@ -626,6 +635,7 @@ public class SpelReproTests extends ExpressionTestCase { } static class MyBeanResolver implements BeanResolver { + @Override public Object resolve(EvaluationContext context, String beanname) throws AccessException { if (beanname.equals("foo")) { return "custard"; @@ -1100,21 +1110,26 @@ public class SpelReproTests extends ExpressionTestCase { } return null; } + @Override public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException { return getMap(target).containsKey(name); } + @Override public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException { return getMap(target).containsKey(name); } + @Override public Class[] getSpecificTargetClasses() { return new Class[]{ContextObject.class}; } + @Override public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException { return new TypedValue(getMap(target).get(name)); } + @Override public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException { getMap(target).put(name, (String) newValue); @@ -1701,6 +1716,7 @@ public class SpelReproTests extends ExpressionTestCase { private static class GenericImplementation implements GenericInterface { + @Override public Integer getProperty() { return null; } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java index 201944098d2..ab4e0dcd846 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java @@ -36,24 +36,30 @@ import org.springframework.expression.spel.support.StandardEvaluationContext; public class TemplateExpressionParsingTests extends ExpressionTestCase { public static final ParserContext DEFAULT_TEMPLATE_PARSER_CONTEXT = new ParserContext() { + @Override public String getExpressionPrefix() { return "${"; } + @Override public String getExpressionSuffix() { return "}"; } + @Override public boolean isTemplate() { return true; } }; public static final ParserContext HASH_DELIMITED_PARSER_CONTEXT = new ParserContext() { + @Override public String getExpressionPrefix() { return "#{"; } + @Override public String getExpressionSuffix() { return "}"; } + @Override public boolean isTemplate() { return true; } diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ast/OpPlusTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ast/OpPlusTests.java index b156b565c0d..cbcb5ced3eb 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ast/OpPlusTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ast/OpPlusTests.java @@ -199,6 +199,7 @@ public class OpPlusTests { GenericConversionService conversionService = new GenericConversionService(); conversionService.addConverter(new Converter() { + @Override public String convert(Time source) { return format.format(source); } diff --git a/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-jdbc/src/test/java/org/springframework/beans/TestBean.java b/spring-jdbc/src/test/java/org/springframework/beans/TestBean.java index 7842bbfeacf..7a27cf0894e 100644 --- a/spring-jdbc/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-jdbc/src/test/java/org/springframework/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see org.springframework.beans.ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java index ded9cd0bf71..8cf9e5fdaf1 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java @@ -45,6 +45,7 @@ public abstract class AbstractJdbcTests extends TestCase { */ private boolean shouldVerify; + @Override protected void setUp() throws Exception { this.shouldVerify = false; super.setUp(); @@ -68,6 +69,7 @@ public abstract class AbstractJdbcTests extends TestCase { this.shouldVerify = true; } + @Override protected void tearDown() throws Exception { super.tearDown(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java index 4d722fb2c81..daa891016e5 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java @@ -124,6 +124,7 @@ public class InitializeDatabaseIntegrationTests { return cache; } + @Override public void afterPropertiesSet() throws Exception { cache = jdbcTemplate.queryForList("SELECT * FROM T_TEST"); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java index 6f672cf1ea4..ed87fd3edc1 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java @@ -74,6 +74,7 @@ public abstract class AbstractRowMapperTests extends TestCase { protected Statement stmt3; protected JdbcTemplate jdbcTemplate3; + @Override protected void setUp() throws SQLException { conControl = MockControl.createControl(Connection.class); con = (Connection) conControl.getMock(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java index de75c0d0f2e..c681fc1ed66 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java @@ -49,6 +49,7 @@ public class JdbcTemplateQueryTests extends AbstractJdbcTests { private MockControl ctrlResultSetMetaData; private ResultSetMetaData mockResultSetMetaData; + @Override protected void setUp() throws Exception { super.setUp(); @@ -62,6 +63,7 @@ public class JdbcTemplateQueryTests extends AbstractJdbcTests { mockResultSetMetaData = (ResultSetMetaData) ctrlResultSetMetaData.getMock(); } + @Override protected void replay() { super.replay(); ctrlStatement.replay(); @@ -70,6 +72,7 @@ public class JdbcTemplateQueryTests extends AbstractJdbcTests { ctrlResultSetMetaData.replay(); } + @Override protected void tearDown() throws Exception { super.tearDown(); if (shouldVerify()) { @@ -349,6 +352,7 @@ public class JdbcTemplateQueryTests extends AbstractJdbcTests { JdbcTemplate template = new JdbcTemplate(mockDataSource); Object o = template.queryForObject(sql, new RowMapper() { + @Override public Object mapRow(ResultSet rs, int rowNum) throws SQLException { return new Integer(rs.getInt(1)); } @@ -852,6 +856,7 @@ public class JdbcTemplateQueryTests extends AbstractJdbcTests { JdbcTemplate template = new JdbcTemplate(mockDataSource); Object o = template.queryForObject(sql, new Object[] {new Integer(3)}, new RowMapper() { + @Override public Object mapRow(ResultSet rs, int rowNum) throws SQLException { return new Integer(rs.getInt(1)); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java index 62d3c66cf4e..ba9b97dcae1 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java @@ -159,6 +159,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { public void testStringsWithStaticSql() throws Exception { doTestStrings(new JdbcTemplateCallback() { + @Override public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) { template.query(sql, rch); } @@ -167,6 +168,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { public void testStringsWithStaticSqlAndFetchSizeAndMaxRows() throws Exception { doTestStrings(new JdbcTemplateCallback() { + @Override public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) { template.query(sql, rch); } @@ -175,6 +177,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { public void testStringsWithEmptyPreparedStatementSetter() throws Exception { doTestStrings(new JdbcTemplateCallback() { + @Override public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) { template.query(sql, (PreparedStatementSetter) null, rch); } @@ -184,8 +187,10 @@ public class JdbcTemplateTests extends AbstractJdbcTests { public void testStringsWithPreparedStatementSetter() throws Exception { final Integer argument = new Integer(99); doTestStrings(new JdbcTemplateCallback() { + @Override public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) { template.query(sql, new PreparedStatementSetter() { + @Override public void setValues(PreparedStatement ps) throws SQLException { ps.setObject(1, argument); } @@ -196,6 +201,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { public void testStringsWithEmptyPreparedStatementArgs() throws Exception { doTestStrings(new JdbcTemplateCallback() { + @Override public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) { template.query(sql, (Object[]) null, rch); } @@ -205,6 +211,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { public void testStringsWithPreparedStatementArgs() throws Exception { final Integer argument = new Integer(99); doTestStrings(new JdbcTemplateCallback() { + @Override public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) { template.query(sql, new Object[] {argument}, rch); } @@ -221,6 +228,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { class StringHandler implements RowCallbackHandler { private List list = new LinkedList(); + @Override public void processRow(ResultSet rs) throws SQLException { list.add(rs.getString(1)); } @@ -365,6 +373,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { JdbcTemplate template = new JdbcTemplate(mockDataSource); template.setNativeJdbcExtractor(new PlainNativeJdbcExtractor()); Object result = template.execute(new ConnectionCallback() { + @Override public Object doInConnection(Connection con) { assertSame(mockConnection, con); return "test"; @@ -389,6 +398,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { JdbcTemplate template = new JdbcTemplate(mockDataSource); Object result = template.execute(new ConnectionCallback() { + @Override public Object doInConnection(Connection con) throws SQLException { PreparedStatement ps = con.prepareStatement("some SQL"); ps.close(); @@ -471,6 +481,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { JdbcTemplate template = new JdbcTemplate(mockDataSource); try { template.query(sql, new RowCallbackHandler() { + @Override public void processRow(ResultSet rs) { throw rex; } @@ -790,10 +801,12 @@ public class JdbcTemplateTests extends AbstractJdbcTests { BatchPreparedStatementSetter setter = new BatchPreparedStatementSetter() { + @Override public void setValues(PreparedStatement ps, int i) throws SQLException { ps.setInt(1, ids[i]); } + @Override public int getBatchSize() { return ids.length; } @@ -854,14 +867,17 @@ public class JdbcTemplateTests extends AbstractJdbcTests { BatchPreparedStatementSetter setter = new InterruptibleBatchPreparedStatementSetter() { + @Override public void setValues(PreparedStatement ps, int i) throws SQLException { if (i < ids.length) { ps.setInt(1, ids[i]); } } + @Override public int getBatchSize() { return 1000; } + @Override public boolean isBatchExhausted(int i) { return (i >= ids.length); } @@ -922,6 +938,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { BatchPreparedStatementSetter setter = new AbstractInterruptibleBatchPreparedStatementSetter() { + @Override protected boolean setValuesIfAvailable(PreparedStatement ps, int i) throws SQLException { if (i < ids.length) { ps.setInt(1, ids[i]); @@ -986,6 +1003,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { BatchPreparedStatementSetter setter = new AbstractInterruptibleBatchPreparedStatementSetter() { + @Override protected boolean setValuesIfAvailable(PreparedStatement ps, int i) throws SQLException { if (i < ids.length) { ps.setInt(1, ids[i]); @@ -1039,9 +1057,11 @@ public class JdbcTemplateTests extends AbstractJdbcTests { replay(); BatchPreparedStatementSetter setter = new BatchPreparedStatementSetter() { + @Override public void setValues(PreparedStatement ps, int i) throws SQLException { ps.setInt(1, ids[i]); } + @Override public int getBatchSize() { return ids.length; } @@ -1099,9 +1119,11 @@ public class JdbcTemplateTests extends AbstractJdbcTests { replay(); BatchPreparedStatementSetter setter = new BatchPreparedStatementSetter() { + @Override public void setValues(PreparedStatement ps, int i) throws SQLException { ps.setInt(1, ids[i]); } + @Override public int getBatchSize() { return ids.length; } @@ -1242,6 +1264,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { replay(); ParameterizedPreparedStatementSetter setter = new ParameterizedPreparedStatementSetter() { + @Override public void setValues(PreparedStatement ps, Integer argument) throws SQLException { ps.setInt(1, argument.intValue()); } @@ -1470,6 +1493,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { replay(); PreparedStatementSetter pss = new PreparedStatementSetter() { + @Override public void setValues(PreparedStatement ps) throws SQLException { ps.setString(1, name); } @@ -1506,6 +1530,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { replay(); PreparedStatementSetter pss = new PreparedStatementSetter() { + @Override public void setValues(PreparedStatement ps) throws SQLException { ps.setString(1, name); } @@ -1591,6 +1616,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { t.setIgnoreWarnings(false); try { t.query(sql, new RowCallbackHandler() { + @Override public void processRow(ResultSet rs) throws SQLException { rs.getByte(1); } @@ -1643,6 +1669,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { JdbcTemplate template = new JdbcTemplate(mockDataSource); template.setIgnoreWarnings(true); template.query(sql, new RowCallbackHandler() { + @Override public void processRow(ResultSet rs) throws java.sql.SQLException { rs.getByte(1); @@ -1689,6 +1716,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { JdbcTemplate template = new JdbcTemplate(mockDataSource); try { template.query(sql, new RowCallbackHandler() { + @Override public void processRow(ResultSet rs) throws SQLException { throw sex; } @@ -1736,6 +1764,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { template.afterPropertiesSet(); try { template.query(sql, new RowCallbackHandler() { + @Override public void processRow(ResultSet rs) throws SQLException { throw sex; } @@ -1805,6 +1834,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { template.afterPropertiesSet(); try { template.query(sql, new RowCallbackHandler() { + @Override public void processRow(ResultSet rs) throws SQLException { throw sex; @@ -1901,39 +1931,49 @@ public class JdbcTemplateTests extends AbstractJdbcTests { JdbcTemplate template = new JdbcTemplate(mockDataSource); template.setNativeJdbcExtractor(new NativeJdbcExtractor() { + @Override public boolean isNativeConnectionNecessaryForNativeStatements() { return false; } + @Override public boolean isNativeConnectionNecessaryForNativePreparedStatements() { return false; } + @Override public boolean isNativeConnectionNecessaryForNativeCallableStatements() { return false; } + @Override public Connection getNativeConnection(Connection con) { return con; } + @Override public Connection getNativeConnectionFromStatement(Statement stmt) throws SQLException { return stmt.getConnection(); } + @Override public Statement getNativeStatement(Statement stmt) { assertTrue(stmt == mockStatement); return mockStatement2; } + @Override public PreparedStatement getNativePreparedStatement(PreparedStatement ps) { assertTrue(ps == mockPreparedStatement); return mockPreparedStatement2; } + @Override public CallableStatement getNativeCallableStatement(CallableStatement cs) { assertTrue(cs == mockCallableStatement); return mockCallableStatement2; } + @Override public ResultSet getNativeResultSet(ResultSet rs) { return rs; } }); template.query("my query", new ResultSetExtractor() { + @Override public Object extractData(ResultSet rs2) { assertEquals(mockResultSet, rs2); return null; @@ -1941,10 +1981,12 @@ public class JdbcTemplateTests extends AbstractJdbcTests { }); template.query(new PreparedStatementCreator() { + @Override public PreparedStatement createPreparedStatement(Connection conn) { return mockPreparedStatement; } }, new ResultSetExtractor() { + @Override public Object extractData(ResultSet rs2) { assertEquals(mockResultSet, rs2); return null; @@ -1952,6 +1994,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { }); template.call(new CallableStatementCreator() { + @Override public CallableStatement createCallableStatement(Connection con) { return mockCallableStatement; } @@ -2015,6 +2058,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { try { template.query("my query", new ResultSetExtractor() { + @Override public Object extractData(ResultSet rs) { throw new InvalidDataAccessApiUsageException(""); } @@ -2027,6 +2071,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { try { template.query(new PreparedStatementCreator() { + @Override public PreparedStatement createPreparedStatement(Connection con) throws SQLException { return con.prepareStatement("my query"); } @@ -2034,6 +2079,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { return null; } }, new ResultSetExtractor() { + @Override public Object extractData(ResultSet rs2) { throw new InvalidDataAccessApiUsageException(""); } @@ -2084,6 +2130,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { List params = new ArrayList(); params.add(new SqlReturnResultSet("", new RowCallbackHandler() { + @Override public void processRow(ResultSet rs) { throw new InvalidDataAccessApiUsageException(""); } @@ -2093,6 +2140,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { JdbcTemplate template = new JdbcTemplate(mockDataSource); try { template.call(new CallableStatementCreator() { + @Override public CallableStatement createCallableStatement(Connection conn) throws SQLException { return conn.prepareCall("my query"); } @@ -2143,6 +2191,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { params.add(new SqlOutParameter("a", 12)); Map out = template.call(new CallableStatementCreator() { + @Override public CallableStatement createCallableStatement(Connection conn) throws SQLException { return conn.prepareCall("my query"); } @@ -2157,6 +2206,7 @@ public class JdbcTemplateTests extends AbstractJdbcTests { private static class PlainNativeJdbcExtractor extends NativeJdbcExtractorAdapter { + @Override protected Connection doGetNativeConnection(Connection con) throws SQLException { return con; } @@ -2179,12 +2229,14 @@ public class JdbcTemplateTests extends AbstractJdbcTests { this.sql = sql; } + @Override public PreparedStatement createPreparedStatement(Connection conn) throws SQLException { PreparedStatement ps = conn.prepareStatement(sql); ps.setInt(1, id); return ps; } + @Override public String getSql() { return sql; } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java index bd992919cb2..5760ebfe34f 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java @@ -47,6 +47,7 @@ public class RowMapperTests extends TestCase { private JdbcTemplate jdbcTemplate; private List result; + @Override protected void setUp() throws SQLException { conControl = MockControl.createControl(Connection.class); con = (Connection) conControl.getMock(); @@ -121,6 +122,7 @@ public class RowMapperTests extends TestCase { result = jdbcTemplate.query( new PreparedStatementCreator() { + @Override public PreparedStatement createPreparedStatement(Connection con) throws SQLException { return ps; } @@ -153,6 +155,7 @@ public class RowMapperTests extends TestCase { result = jdbcTemplate.query( "some SQL", new PreparedStatementSetter() { + @Override public void setValues(PreparedStatement ps) throws SQLException { ps.setString(1, "test"); } @@ -240,6 +243,7 @@ public class RowMapperTests extends TestCase { private static class TestRowMapper implements RowMapper { + @Override public Object mapRow(ResultSet rs, int rowNum) throws SQLException { return new TestBean(rs.getString(1), rs.getInt(2)); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java index ae4d9737026..3ed281abfce 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java @@ -31,6 +31,7 @@ public class SimpleRowCountCallbackHandler implements RowCallbackHandler { private int count; + @Override public void processRow(ResultSet rs) throws SQLException { count++; } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java index 17292869391..15ce2e9504e 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java @@ -35,11 +35,13 @@ public class StatementCreatorUtilsTests extends TestCase { private MockControl psControl; private PreparedStatement ps; + @Override protected void setUp() { psControl = MockControl.createControl(PreparedStatement.class); ps = (PreparedStatement) psControl.getMock(); } + @Override protected void tearDown() { psControl.verify(); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java index 4716527a36d..e18b28a19fa 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java @@ -71,6 +71,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { private MockControl ctrlResultSet; private ResultSet mockResultSet; + @Override protected void setUp() throws Exception { super.setUp(); ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); @@ -79,6 +80,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { mockResultSet = (ResultSet) ctrlResultSet.getMock(); } + @Override protected void tearDown() throws Exception { super.tearDown(); if (shouldVerify()) { @@ -87,6 +89,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { } } + @Override protected void replay() { super.replay(); ctrlPreparedStatement.replay(); @@ -132,6 +135,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { params.put("perfId", new Integer(1)); params.put("priceId", new Integer(1)); assertEquals("result", jt.execute(UPDATE_NAMED_PARAMETERS, params, new PreparedStatementCallback() { + @Override public Object doInPreparedStatement(PreparedStatement ps) throws SQLException { assertEquals(mockPreparedStatement, ps); ps.executeUpdate(); @@ -164,6 +168,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { params.put("perfId", new SqlParameterValue(Types.DECIMAL, new Integer(1))); params.put("priceId", new SqlParameterValue(Types.INTEGER, new Integer(1))); assertEquals("result", jt.execute(UPDATE_NAMED_PARAMETERS, params, new PreparedStatementCallback() { + @Override public Object doInPreparedStatement(PreparedStatement ps) throws SQLException { assertEquals(mockPreparedStatement, ps); ps.executeUpdate(); @@ -259,6 +264,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { params.put("id", new SqlParameterValue(Types.DECIMAL, new Integer(1))); params.put("country", "UK"); Customer cust = (Customer) jt.query(SELECT_NAMED_PARAMETERS, params, new ResultSetExtractor() { + @Override public Object extractData(ResultSet rs) throws SQLException, DataAccessException { rs.next(); Customer cust = new Customer(); @@ -307,6 +313,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { params.put("country", "UK"); final List customers = new LinkedList(); jt.query(SELECT_NAMED_PARAMETERS, params, new RowCallbackHandler() { + @Override public void processRow(ResultSet rs) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -355,6 +362,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { params.put("id", new SqlParameterValue(Types.DECIMAL, new Integer(1))); params.put("country", "UK"); List customers = jt.query(SELECT_NAMED_PARAMETERS, params, new RowMapper() { + @Override public Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -403,6 +411,7 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { params.put("id", new SqlParameterValue(Types.DECIMAL, new Integer(1))); params.put("country", "UK"); Customer cust = (Customer) jt.queryForObject(SELECT_NAMED_PARAMETERS, params, new RowMapper() { + @Override public Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java index 92166a19bb7..5abcb764ed0 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java @@ -44,6 +44,7 @@ public class NamedParameterQueryTests extends AbstractJdbcTests { private MockControl ctrlResultSetMetaData; private ResultSetMetaData mockResultSetMetaData; + @Override protected void setUp() throws Exception { super.setUp(); ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); @@ -54,6 +55,7 @@ public class NamedParameterQueryTests extends AbstractJdbcTests { mockResultSetMetaData = (ResultSetMetaData) ctrlResultSetMetaData.getMock(); } + @Override protected void replay() { super.replay(); ctrlPreparedStatement.replay(); @@ -61,6 +63,7 @@ public class NamedParameterQueryTests extends AbstractJdbcTests { ctrlResultSetMetaData.replay(); } + @Override protected void tearDown() throws Exception { super.tearDown(); if (false && shouldVerify()) { @@ -317,6 +320,7 @@ public class NamedParameterQueryTests extends AbstractJdbcTests { parms.addValue("id", new Integer(3)); Object o = template.queryForObject(sql, parms, new RowMapper() { + @Override public Object mapRow(ResultSet rs, int rowNum) throws SQLException { return new Integer(rs.getInt(1)); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java index 6ca38bd21f0..3340c760d72 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java @@ -31,6 +31,7 @@ public class CallMetaDataContextTests extends TestCase { private CallMetaDataContext context = new CallMetaDataContext(); + @Override protected void setUp() throws Exception { super.setUp(); @@ -51,6 +52,7 @@ public class CallMetaDataContextTests extends TestCase { } + @Override protected void tearDown() throws Exception { super.tearDown(); ctrlDatabaseMetaData.verify(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java index 64bca82610d..7ed70e88e1e 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java @@ -31,6 +31,7 @@ public class ParameterizedBeanPropertyRowMapperTests extends AbstractRowMapperTe private SimpleJdbcTemplate simpleJdbcTemplate; + @Override protected void setUp() throws SQLException { super.setUp(); simpleJdbcTemplate = new SimpleJdbcTemplate(jdbcTemplate); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java index 3f69a453194..1f664107a65 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java @@ -49,6 +49,7 @@ public class SimpleJdbcCallTests extends TestCase { private MockControl ctrlCallable; private CallableStatement mockCallable; + @Override protected void setUp() throws Exception { ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); @@ -69,6 +70,7 @@ public class SimpleJdbcCallTests extends TestCase { mockCallable = (CallableStatement) ctrlCallable.getMock(); } + @Override protected void tearDown() throws Exception { ctrlDatabaseMetaData.verify(); ctrlDataSource.verify(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java index b6ffa6f70f2..088e48f98a2 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java @@ -40,6 +40,7 @@ public class SimpleJdbcInsertTests extends TestCase { private MockControl ctrlDatabaseMetaData; private DatabaseMetaData mockDatabaseMetaData; + @Override protected void setUp() throws Exception { super.setUp(); @@ -60,6 +61,7 @@ public class SimpleJdbcInsertTests extends TestCase { } + @Override protected void tearDown() throws Exception { super.tearDown(); ctrlDatabaseMetaData.verify(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java index a80ebbe4d46..8bfe278c63b 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java @@ -254,6 +254,7 @@ public class SimpleJdbcTemplateTests extends TestCase { Date expectedResult = new Date(); ParameterizedRowMapper rm = new ParameterizedRowMapper() { + @Override public Date mapRow(ResultSet rs, int rowNum) { return new Date(); } @@ -279,6 +280,7 @@ public class SimpleJdbcTemplateTests extends TestCase { Object arg3 = new Object(); ParameterizedRowMapper rm = new ParameterizedRowMapper() { + @Override public Date mapRow(ResultSet rs, int rowNum) { return new Date(); } @@ -305,6 +307,7 @@ public class SimpleJdbcTemplateTests extends TestCase { Object arg3 = new Object(); ParameterizedRowMapper rm = new ParameterizedRowMapper() { + @Override public Date mapRow(ResultSet rs, int rowNum) { return new Date(); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java index d42a5810dd5..f9eb8828733 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java @@ -30,6 +30,7 @@ public class TableMetaDataContextTests extends TestCase { private TableMetaDataContext context = new TableMetaDataContext(); + @Override protected void setUp() throws Exception { super.setUp(); @@ -50,6 +51,7 @@ public class TableMetaDataContextTests extends TestCase { } + @Override protected void tearDown() throws Exception { super.tearDown(); ctrlDatabaseMetaData.verify(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java index 69d03b371d3..76034050ef3 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java @@ -37,6 +37,7 @@ public class JdbcDaoSupportTests extends TestCase { DataSource ds = (DataSource) dsControl.getMock(); final List test = new ArrayList(); JdbcDaoSupport dao = new JdbcDaoSupport() { + @Override protected void initDao() { test.add("test"); } @@ -52,6 +53,7 @@ public class JdbcDaoSupportTests extends TestCase { JdbcTemplate template = new JdbcTemplate(); final List test = new ArrayList(); JdbcDaoSupport dao = new JdbcDaoSupport() { + @Override protected void initDao() { test.add("test"); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java index b63387c48c1..02cafbb1989 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java @@ -69,6 +69,7 @@ public class LobSupportTests extends TestCase { AbstractLobCreatingPreparedStatementCallback psc = new AbstractLobCreatingPreparedStatementCallback(handler) { + @Override protected void setValues(PreparedStatement ps, LobCreator lobCreator) throws SQLException, DataAccessException { svc.b = true; @@ -155,6 +156,7 @@ public class LobSupportTests extends TestCase { private AbstractLobStreamingResultSetExtractor getResultSetExtractor(final boolean ex) { AbstractLobStreamingResultSetExtractor lobRse = new AbstractLobStreamingResultSetExtractor() { + @Override protected void streamData(ResultSet rs) throws SQLException, IOException { if (ex) { throw new IOException(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java index f2345bbc730..65e5b3f9a83 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java @@ -57,6 +57,7 @@ public class SqlLobValueTests extends TestCase { private MockControl lobCreatorControl; private LobCreator creator; + @Override public void setUp() { // create preparedstatement psControl = MockControl.createControl(PreparedStatement.class); @@ -97,11 +98,13 @@ public class SqlLobValueTests extends TestCase { creator.setBlobAsBytes(ps, 1, testString.getBytes()); // set a matcher to match the byte array! lobCreatorControl.setMatcher(new ArgumentsMatcher() { + @Override public boolean matches(Object[] arg0, Object[] arg1) { byte[] one = (byte[]) arg0[2]; byte[] two = (byte[]) arg1[2]; return Arrays.equals(one, two); } + @Override public String toString(Object[] arg0) { return "bla"; } @@ -149,10 +152,12 @@ public class SqlLobValueTests extends TestCase { ByteArrayInputStream bais = new ByteArrayInputStream(testContent); creator.setClobAsAsciiStream(ps, 1, bais, 3); lobCreatorControl.setMatcher(new ArgumentsMatcher() { + @Override public boolean matches(Object[] arg0, Object[] arg1) { // for now, match always return true; } + @Override public String toString(Object[] arg0) { return null; } @@ -172,10 +177,12 @@ public class SqlLobValueTests extends TestCase { InputStreamReader reader = new InputStreamReader(bais); creator.setClobAsCharacterStream(ps, 1, reader, 3); lobCreatorControl.setMatcher(new ArgumentsMatcher() { + @Override public boolean matches(Object[] arg0, Object[] arg1) { // for now, match always return true; } + @Override public String toString(Object[] arg0) { return null; } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java index 8acf5aa045a..4fe8a5b43fd 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java @@ -96,6 +96,7 @@ public class DataSourceJtaTransactionTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -223,6 +224,7 @@ public class DataSourceJtaTransactionTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse)); assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -246,6 +248,7 @@ public class DataSourceJtaTransactionTests extends TestCase { for (int i = 0; i < 5; i++) { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse)); assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -418,6 +421,7 @@ public class DataSourceJtaTransactionTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -429,6 +433,7 @@ public class DataSourceJtaTransactionTests extends TestCase { tt2.setPropagationBehavior(requiresNew ? TransactionDefinition.PROPAGATION_REQUIRES_NEW : TransactionDefinition.PROPAGATION_REQUIRED); tt2.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -547,6 +552,7 @@ public class DataSourceJtaTransactionTests extends TestCase { try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse)); assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -569,6 +575,7 @@ public class DataSourceJtaTransactionTests extends TestCase { try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse)); assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -653,9 +660,11 @@ public class DataSourceJtaTransactionTests extends TestCase { @SuppressWarnings("serial") JtaTransactionManager ptm = new JtaTransactionManager(ut) { + @Override protected void doRegisterAfterCompletionWithJtaTransaction( JtaTransactionObject txObject, final List synchronizations) { Thread async = new Thread() { + @Override public void run() { invokeAfterCompletion(synchronizations, TransactionSynchronization.STATUS_COMMITTED); } @@ -691,6 +700,7 @@ public class DataSourceJtaTransactionTests extends TestCase { final boolean releaseCon = (i != 1); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive()); assertTrue("Is existing transaction", !status.isNewTransaction()); @@ -769,6 +779,7 @@ public class DataSourceJtaTransactionTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { Connection c = DataSourceUtils.getConnection(dsToUse); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse)); @@ -780,6 +791,7 @@ public class DataSourceJtaTransactionTests extends TestCase { tt.setIsolationLevel(TransactionDefinition.ISOLATION_REPEATABLE_READ); tt.setReadOnly(true); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { Connection c = DataSourceUtils.getConnection(dsToUse); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse)); @@ -865,6 +877,7 @@ public class DataSourceJtaTransactionTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { Connection c = DataSourceUtils.getConnection(dsToUse); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse)); @@ -875,6 +888,7 @@ public class DataSourceJtaTransactionTests extends TestCase { tt.setIsolationLevel(TransactionDefinition.ISOLATION_REPEATABLE_READ); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { Connection c = DataSourceUtils.getConnection(dsToUse); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse)); @@ -890,6 +904,7 @@ public class DataSourceJtaTransactionTests extends TestCase { utControl.verify(); } + @Override protected void tearDown() { assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java index cf3cf2cb452..28eb6b3c04e 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java @@ -134,6 +134,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -242,6 +243,7 @@ public class DataSourceTransactionManagerTests extends TestCase { final RuntimeException ex = new RuntimeException("Application exception"); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -291,6 +293,7 @@ public class DataSourceTransactionManagerTests extends TestCase { final RuntimeException ex = new RuntimeException("Application exception"); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); @@ -359,10 +362,12 @@ public class DataSourceTransactionManagerTests extends TestCase { final TransactionTemplate tt = new TransactionTemplate(tm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is existing transaction", !status.isNewTransaction()); assertFalse("Is not rollback-only", status.isRollbackOnly()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -433,9 +438,11 @@ public class DataSourceTransactionManagerTests extends TestCase { tt2.setIsolationLevel(TransactionDefinition.ISOLATION_SERIALIZABLE); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertFalse("Is not rollback-only", status.isRollbackOnly()); tt2.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { status.setRollbackOnly(); } @@ -489,9 +496,11 @@ public class DataSourceTransactionManagerTests extends TestCase { tt2.setReadOnly(false); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertFalse("Is not rollback-only", status.isRollbackOnly()); tt2.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { status.setRollbackOnly(); } @@ -539,9 +548,11 @@ public class DataSourceTransactionManagerTests extends TestCase { final TestTransactionSynchronization synch = new TestTransactionSynchronization(ds, TransactionSynchronization.STATUS_COMMITTED) { + @Override public void afterCompletion(int status) { super.afterCompletion(status); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { } }); @@ -549,6 +560,7 @@ public class DataSourceTransactionManagerTests extends TestCase { }; tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { TransactionSynchronizationManager.registerSynchronization(synch); } @@ -599,10 +611,12 @@ public class DataSourceTransactionManagerTests extends TestCase { final TransactionTemplate tt = new TransactionTemplate(tm2); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is existing transaction", !status.isNewTransaction()); assertFalse("Is not rollback-only", status.isRollbackOnly()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -661,12 +675,14 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -737,12 +753,14 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); tt2.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -807,12 +825,14 @@ public class DataSourceTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); tt2.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { status.setRollbackOnly(); } @@ -858,12 +878,14 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -911,10 +933,12 @@ public class DataSourceTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NEVER); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { fail("Should have thrown IllegalTransactionStateException"); } @@ -959,11 +983,13 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); TransactionTemplate tt2 = new TransactionTemplate(tm); tt2.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); tt2.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -1015,6 +1041,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); assertSame(con1, DataSourceUtils.getConnection(ds)); @@ -1022,6 +1049,7 @@ public class DataSourceTransactionManagerTests extends TestCase { TransactionTemplate tt2 = new TransactionTemplate(tm); tt2.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); tt2.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -1079,6 +1107,7 @@ public class DataSourceTransactionManagerTests extends TestCase { tt.setReadOnly(true); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); @@ -1142,6 +1171,7 @@ public class DataSourceTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { try { Thread.sleep(1500); @@ -1207,6 +1237,7 @@ public class DataSourceTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(tm); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertEquals(con, DataSourceUtils.getConnection(ds)); @@ -1260,6 +1291,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertEquals(con, DataSourceUtils.getConnection(ds)); @@ -1275,6 +1307,7 @@ public class DataSourceTransactionManagerTests extends TestCase { } tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertEquals(con, DataSourceUtils.getConnection(ds)); @@ -1338,6 +1371,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertEquals(con, DataSourceUtils.getConnection(ds)); @@ -1354,6 +1388,7 @@ public class DataSourceTransactionManagerTests extends TestCase { } tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertEquals(con, DataSourceUtils.getConnection(ds)); @@ -1406,6 +1441,7 @@ public class DataSourceTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(tm); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional } @@ -1443,6 +1479,7 @@ public class DataSourceTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(tm); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional } @@ -1483,6 +1520,7 @@ public class DataSourceTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(tm); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional } @@ -1525,6 +1563,7 @@ public class DataSourceTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(tm); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { status.setRollbackOnly(); } @@ -1550,6 +1589,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); assertTrue("Is not new transaction", !status.isNewTransaction()); @@ -1573,6 +1613,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); assertTrue("Is not new transaction", !status.isNewTransaction()); @@ -1594,6 +1635,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); assertTrue("Is not new transaction", !status.isNewTransaction()); @@ -1655,11 +1697,13 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); assertTrue("Isn't nested transaction", !status.hasSavepoint()); for (int i = 0; i < count; i++) { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -1721,10 +1765,12 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); assertTrue("Isn't nested transaction", !status.hasSavepoint()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization active", TransactionSynchronizationManager.isSynchronizationActive()); @@ -1786,6 +1832,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); Object savepoint = status.createSavepoint(); @@ -1842,6 +1889,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); Object savepoint = status.createSavepoint(); @@ -1883,6 +1931,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); } @@ -1919,6 +1968,7 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { assertTrue("Is new transaction", status.isNewTransaction()); status.setRollbackOnly(); @@ -1930,6 +1980,7 @@ public class DataSourceTransactionManagerTests extends TestCase { dsControl.verify(); } + @Override protected void tearDown() { assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); @@ -1953,15 +2004,19 @@ public class DataSourceTransactionManagerTests extends TestCase { this.status = status; } + @Override public void suspend() { } + @Override public void resume() { } + @Override public void flush() { } + @Override public void beforeCommit(boolean readOnly) { if (this.status != TransactionSynchronization.STATUS_COMMITTED) { fail("Should never be called"); @@ -1970,11 +2025,13 @@ public class DataSourceTransactionManagerTests extends TestCase { this.beforeCommitCalled = true; } + @Override public void beforeCompletion() { assertFalse(this.beforeCompletionCalled); this.beforeCompletionCalled = true; } + @Override public void afterCommit() { if (this.status != TransactionSynchronization.STATUS_COMMITTED) { fail("Should never be called"); @@ -1983,6 +2040,7 @@ public class DataSourceTransactionManagerTests extends TestCase { this.afterCommitCalled = true; } + @Override public void afterCompletion(int status) { assertFalse(this.afterCompletionCalled); this.afterCompletionCalled = true; diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java index 8696edf257d..28b30408888 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java @@ -38,6 +38,7 @@ public class DriverManagerDataSourceTests extends TestCase { ctrlConnection.replay(); class TestDriverManagerDataSource extends DriverManagerDataSource { + @Override protected Connection getConnectionFromDriverManager(String url, Properties props) { assertEquals(jdbcUrl, url); assertEquals(uname, props.getProperty("user")); @@ -77,6 +78,7 @@ public class DriverManagerDataSourceTests extends TestCase { ctrlConnection.replay(); class TestDriverManagerDataSource extends DriverManagerDataSource { + @Override protected Connection getConnectionFromDriverManager(String url, Properties props) { assertEquals(jdbcUrl, url); assertEquals("uname", props.getProperty("user")); @@ -117,6 +119,7 @@ public class DriverManagerDataSourceTests extends TestCase { ctrlConnection.replay(); class TestDriverManagerDataSource extends DriverManagerDataSource { + @Override protected Connection getConnectionFromDriverManager(String url, Properties props) { assertEquals(jdbcUrl, url); assertEquals(uname, props.getProperty("user")); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/TestDataSourceWrapper.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/TestDataSourceWrapper.java index a8c3a79b79b..5e5b5afd6ec 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/TestDataSourceWrapper.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/TestDataSourceWrapper.java @@ -12,10 +12,12 @@ public class TestDataSourceWrapper extends AbstractDataSource { this.target = target; } + @Override public Connection getConnection() throws SQLException { return target.getConnection(); } + @Override public Connection getConnection(String username, String password) throws SQLException { return target.getConnection(username, password); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java index 3a9f6b94ecb..77970dbe087 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryTests.java @@ -24,6 +24,7 @@ public class EmbeddedDatabaseFactoryTests { private boolean populateCalled; + @Override public void populate(Connection connection) { this.populateCalled = true; } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java index 4534d493ed6..48174456d94 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java @@ -35,6 +35,7 @@ public final class JndiDataSourceLookupTests { public void testSunnyDay() throws Exception { final DataSource expectedDataSource = new StubDataSource(); JndiDataSourceLookup lookup = new JndiDataSourceLookup() { + @Override @SuppressWarnings("unchecked") protected Object lookup(String jndiName, Class requiredType) { assertEquals(DATA_SOURCE_NAME, jndiName); @@ -49,6 +50,7 @@ public final class JndiDataSourceLookupTests { @Test(expected=DataSourceLookupFailureException.class) public void testNoDataSourceAtJndiLocation() throws Exception { JndiDataSourceLookup lookup = new JndiDataSourceLookup() { + @Override @SuppressWarnings("unchecked") protected Object lookup(String jndiName, Class requiredType) throws NamingException { assertEquals(DATA_SOURCE_NAME, jndiName); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java index a8521e70ba7..17276e3aeb8 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java @@ -30,10 +30,12 @@ import org.springframework.jdbc.datasource.AbstractDataSource; */ class StubDataSource extends AbstractDataSource { + @Override public Connection getConnection() throws SQLException { throw new UnsupportedOperationException(); } + @Override public Connection getConnection(String username, String password) throws SQLException { throw new UnsupportedOperationException(); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/CustomerMapper.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/CustomerMapper.java index a497dca34e5..9a1e61d9bb7 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/CustomerMapper.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/CustomerMapper.java @@ -10,6 +10,7 @@ public class CustomerMapper implements RowMapper { private static final String[] COLUMN_NAMES = new String[] {"id", "forename"}; + @Override public Customer mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java index 4bf0f2eed40..5c00e0bf75a 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java @@ -61,6 +61,7 @@ public class GenericSqlQueryTests extends AbstractJdbcTests { private BeanFactory bf; + @Override @Before public void setUp() throws Exception { super.setUp(); @@ -72,6 +73,7 @@ public class GenericSqlQueryTests extends AbstractJdbcTests { testDataSource.setTarget(mockDataSource); } + @Override @After public void tearDown() throws Exception { super.tearDown(); @@ -81,6 +83,7 @@ public class GenericSqlQueryTests extends AbstractJdbcTests { } } + @Override protected void replay() { super.replay(); EasyMock.replay(mockPreparedStatement); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java index fd96db3e39a..9c1ff6069e7 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java @@ -52,6 +52,7 @@ public class GenericStoredProcedureTests extends AbstractJdbcTests { private BeanFactory bf; + @Override @Before public void setUp() throws Exception { super.setUp(); @@ -62,6 +63,7 @@ public class GenericStoredProcedureTests extends AbstractJdbcTests { testDataSource.setTarget(mockDataSource); } + @Override @After public void tearDown() throws Exception { super.tearDown(); @@ -70,6 +72,7 @@ public class GenericStoredProcedureTests extends AbstractJdbcTests { } } + @Override protected void replay() { super.replay(); EasyMock.replay(mockCallable); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java index 8feb57fc975..189c59a1a08 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java @@ -213,6 +213,7 @@ public class RdbmsOperationTests extends TestCase { private static class TestRdbmsOperation extends RdbmsOperation { + @Override protected void compileInternal() { } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java index 08b71e6fcb2..478328af8cc 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java @@ -82,6 +82,7 @@ public class SqlQueryTests extends AbstractJdbcTests { private ResultSet mockResultSet; + @Override protected void setUp() throws Exception { super.setUp(); ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); @@ -90,6 +91,7 @@ public class SqlQueryTests extends AbstractJdbcTests { mockResultSet = (ResultSet) ctrlResultSet.getMock(); } + @Override protected void tearDown() throws Exception { super.tearDown(); if (shouldVerify()) { @@ -98,6 +100,7 @@ public class SqlQueryTests extends AbstractJdbcTests { } } + @Override protected void replay() { super.replay(); ctrlPreparedStatement.replay(); @@ -130,6 +133,7 @@ public class SqlQueryTests extends AbstractJdbcTests { replay(); SqlQuery query = new MappingSqlQueryWithParameters() { + @Override protected Object mapRow(ResultSet rs, int rownum, Object[] params, Map context) throws SQLException { assertTrue("params were null", params == null); assertTrue("context was null", context == null); @@ -154,6 +158,7 @@ public class SqlQueryTests extends AbstractJdbcTests { replay(); MappingSqlQuery query = new MappingSqlQuery() { + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { return new Integer(rs.getInt(1)); } @@ -180,6 +185,7 @@ public class SqlQueryTests extends AbstractJdbcTests { replay(); MappingSqlQuery query = new MappingSqlQuery() { + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { return new Integer(rs.getInt(1)); } @@ -374,6 +380,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -431,6 +438,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -522,6 +530,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -587,6 +596,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -654,6 +664,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -712,6 +723,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -767,6 +779,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -797,6 +810,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -876,6 +890,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -943,6 +958,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -1016,6 +1032,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -1057,6 +1074,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); @@ -1128,6 +1146,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object updateRow(ResultSet rs, int rownum, Map context) throws SQLException { rs.updateString(2, "" + context.get(new Integer(rs.getInt(COLUMN_NAMES[0])))); return null; @@ -1148,6 +1167,7 @@ public class SqlQueryTests extends AbstractJdbcTests { compile(); } + @Override protected Object mapRow(ResultSet rs, int rownum) throws SQLException { return rs.getString(1); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java index 867f1891ac4..011fe1624b1 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java @@ -66,12 +66,14 @@ public class SqlUpdateTests extends AbstractJdbcTests { private ResultSetMetaData mockResultSetMetaData; + @Override protected void setUp() throws Exception { super.setUp(); ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); } + @Override protected void tearDown() throws Exception { super.tearDown(); if (shouldVerify()) { @@ -79,6 +81,7 @@ public class SqlUpdateTests extends AbstractJdbcTests { } } + @Override protected void replay() { super.replay(); ctrlPreparedStatement.replay(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java index 48ec7f2b12c..3dae9479306 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java @@ -62,6 +62,7 @@ public class StoredProcedureTests extends AbstractJdbcTests { private MockControl ctrlCallable; private CallableStatement mockCallable; + @Override protected void setUp() throws Exception { super.setUp(); @@ -69,6 +70,7 @@ public class StoredProcedureTests extends AbstractJdbcTests { mockCallable = (CallableStatement) ctrlCallable.getMock(); } + @Override protected void tearDown() throws Exception { super.tearDown(); if (shouldVerify()) { @@ -76,6 +78,7 @@ public class StoredProcedureTests extends AbstractJdbcTests { } } + @Override protected void replay() { super.replay(); ctrlCallable.replay(); @@ -255,6 +258,7 @@ public class StoredProcedureTests extends AbstractJdbcTests { class TestJdbcTemplate extends JdbcTemplate { int calls; + @Override public Map call(CallableStatementCreator csc, List declaredParameters) throws DataAccessException { calls++; return super.call(csc, declaredParameters); @@ -934,6 +938,7 @@ public class StoredProcedureTests extends AbstractJdbcTests { } private static class RowMapperImpl implements RowMapper { + @Override public Object mapRow(ResultSet rs, int rowNum) throws SQLException { return rs.getString(2); } @@ -964,6 +969,7 @@ public class StoredProcedureTests extends AbstractJdbcTests { private TestParameterMapper() { } + @Override public Map createMap(Connection conn) throws SQLException { Map inParms = new HashMap(); String testValue = conn.toString(); @@ -989,6 +995,7 @@ public class StoredProcedureTests extends AbstractJdbcTests { public Map executeTest(final int[] inValue) { Map in = new HashMap(1); in.put("in", new AbstractSqlTypeValue() { + @Override public Object createTypeValue(Connection con, int type, String typeName) { //assertEquals(Connection.class, con.getClass()); //assertEquals(Types.ARRAY, type); @@ -1030,6 +1037,7 @@ public class StoredProcedureTests extends AbstractJdbcTests { setDataSource(ds); setSql(SQL); getJdbcTemplate().setExceptionTranslator(new SQLExceptionTranslator() { + @Override public DataAccessException translate( String task, String sql, diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java index 467f03f2e81..5fb13c22338 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java @@ -27,6 +27,7 @@ import java.sql.SQLException; * @author Thomas Risberg */ public class CustomSqlExceptionTranslator implements SQLExceptionTranslator { + @Override public DataAccessException translate(String task, String sql, SQLException ex) { if (ex.getErrorCode() == 2) { return new TransientDataAccessResourceException("Custom", ex); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java index 565e7d1cce4..039a938a76f 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java @@ -35,6 +35,7 @@ import junit.framework.TestCase; public class KeyHolderTests extends TestCase { private KeyHolder kh; + @Override public void setUp() { kh = new GeneratedKeyHolder(); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java index 2a016ef6e6d..6695bb35aff 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java @@ -110,6 +110,7 @@ public class SQLErrorCodeSQLExceptionTranslatorTests extends TestCase { SQLException intVioEx = new SQLException("", "", 6); SQLErrorCodeSQLExceptionTranslator sext = new SQLErrorCodeSQLExceptionTranslator() { + @Override protected DataAccessException customTranslate(String task, String sql, SQLException sqlex) { assertEquals(TASK, task); assertEquals(SQL, sql); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java index 67e9cdc47f1..d44b0d1a25a 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java @@ -122,6 +122,7 @@ public class SQLErrorCodesFactoryTests extends TestCase { public void testLookupOrder() { class TestSQLErrorCodesFactory extends SQLErrorCodesFactory { private int lookups = 0; + @Override protected Resource loadResource(String path) { ++lookups; if (lookups == 1) { @@ -148,6 +149,7 @@ public class SQLErrorCodesFactoryTests extends TestCase { */ public void testFindUserDefinedCodes() { class TestSQLErrorCodesFactory extends SQLErrorCodesFactory { + @Override protected Resource loadResource(String path) { if (SQLErrorCodesFactory.SQL_ERROR_CODE_OVERRIDE_PATH.equals(path)) { return new ClassPathResource("test-error-codes.xml", SQLErrorCodesFactoryTests.class); @@ -166,6 +168,7 @@ public class SQLErrorCodesFactoryTests extends TestCase { public void testInvalidUserDefinedCodeFormat() { class TestSQLErrorCodesFactory extends SQLErrorCodesFactory { + @Override protected Resource loadResource(String path) { if (SQLErrorCodesFactory.SQL_ERROR_CODE_OVERRIDE_PATH.equals(path)) { // Guaranteed to be on the classpath, but most certainly NOT XML @@ -186,6 +189,7 @@ public class SQLErrorCodesFactoryTests extends TestCase { */ public void testFindCustomCodes() { class TestSQLErrorCodesFactory extends SQLErrorCodesFactory { + @Override protected Resource loadResource(String path) { if (SQLErrorCodesFactory.SQL_ERROR_CODE_OVERRIDE_PATH.equals(path)) { return new ClassPathResource("custom-error-codes.xml", SQLErrorCodesFactoryTests.class); @@ -318,6 +322,7 @@ public class SQLErrorCodesFactoryTests extends TestCase { */ public void testWildCardNameRecognized() throws Exception { class WildcardSQLErrorCodesFactory extends SQLErrorCodesFactory { + @Override protected Resource loadResource(String path) { if (SQLErrorCodesFactory.SQL_ERROR_CODE_OVERRIDE_PATH.equals(path)) { return new ClassPathResource("wildcard-error-codes.xml", SQLErrorCodesFactoryTests.class); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java index 4c72a08876c..1b415ea8fbb 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java @@ -39,6 +39,7 @@ public class ResultSetWrappingRowSetTests extends TestCase { private ResultSet rset; private ResultSetWrappingSqlRowSet rowset; + @Override public void setUp() throws Exception { rsetControl = MockControl.createControl(ResultSet.class); rset = (ResultSet) rsetControl.getMock(); diff --git a/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-jms/src/test/java/org/springframework/beans/TestBean.java b/spring-jms/src/test/java/org/springframework/beans/TestBean.java index ef4aef309ea..7815bf1af34 100644 --- a/spring-jms/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-jms/src/test/java/org/springframework/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java b/spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java index 5270aff4d36..ccf756b53eb 100644 --- a/spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java +++ b/spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java @@ -21,6 +21,7 @@ package org.springframework.core.task; */ public class StubTaskExecutor implements TaskExecutor { + @Override public void execute(Runnable task) { } diff --git a/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java b/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java index 9f38822a4e7..4aa339db763 100644 --- a/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java +++ b/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java @@ -26,13 +26,16 @@ import javax.resource.spi.ResourceAdapter; */ public class StubActivationSpec implements ActivationSpec { + @Override public void validate() throws InvalidPropertyException { } + @Override public ResourceAdapter getResourceAdapter() { return null; } + @Override public void setResourceAdapter(ResourceAdapter resourceAdapter) throws ResourceException { } diff --git a/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java b/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java index 65dcd8b0172..0c70d70dd79 100644 --- a/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java +++ b/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java @@ -29,18 +29,23 @@ import javax.transaction.xa.XAResource; */ public class StubResourceAdapter implements ResourceAdapter { + @Override public void start(BootstrapContext bootstrapContext) throws ResourceAdapterInternalException { } + @Override public void stop() { } + @Override public void endpointActivation(MessageEndpointFactory messageEndpointFactory, ActivationSpec activationSpec) throws ResourceException { } + @Override public void endpointDeactivation(MessageEndpointFactory messageEndpointFactory, ActivationSpec activationSpec) { } + @Override public XAResource[] getXAResources(ActivationSpec[] activationSpecs) throws ResourceException { return null; } diff --git a/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java b/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java index 3d7b35490ce..650c51aa342 100644 --- a/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java +++ b/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java @@ -27,10 +27,12 @@ import javax.jms.JMSException; */ public class StubConnectionFactory implements ConnectionFactory { + @Override public Connection createConnection() throws JMSException { return null; } + @Override public Connection createConnection(String username, String password) throws JMSException { return null; } diff --git a/spring-jms/src/test/java/org/springframework/jms/StubQueue.java b/spring-jms/src/test/java/org/springframework/jms/StubQueue.java index 20586ae9522..eca20ea2b4e 100644 --- a/spring-jms/src/test/java/org/springframework/jms/StubQueue.java +++ b/spring-jms/src/test/java/org/springframework/jms/StubQueue.java @@ -39,6 +39,7 @@ public class StubQueue implements Queue { } + @Override public String getQueueName() { return this.queueName; } diff --git a/spring-jms/src/test/java/org/springframework/jms/StubTopic.java b/spring-jms/src/test/java/org/springframework/jms/StubTopic.java index 022ecdfbdb7..e3b0f1eca64 100644 --- a/spring-jms/src/test/java/org/springframework/jms/StubTopic.java +++ b/spring-jms/src/test/java/org/springframework/jms/StubTopic.java @@ -39,6 +39,7 @@ public class StubTopic implements Topic { } + @Override public String getTopicName() { return this.topicName; } diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java index 4f51d133a07..b62e9e41bbc 100644 --- a/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java @@ -58,10 +58,12 @@ public class JmsNamespaceHandlerTests extends TestCase { private ToolingTestApplicationContext context; + @Override protected void setUp() throws Exception { this.context = new ToolingTestApplicationContext("jmsNamespaceHandlerTests.xml", getClass()); } + @Override protected void tearDown() throws Exception { this.context.close(); } @@ -211,6 +213,7 @@ public class JmsNamespaceHandlerTests extends TestCase { public Message message; + @Override public void onMessage(Message message) { this.message = message; } @@ -229,6 +232,7 @@ public class JmsNamespaceHandlerTests extends TestCase { super(path, clazz); } + @Override protected void initBeanDefinitionReader(XmlBeanDefinitionReader beanDefinitionReader) { this.registeredComponents = new HashSet(); beanDefinitionReader.setEventListener(new StoringReaderEventListener(this.registeredComponents)); @@ -268,6 +272,7 @@ public class JmsNamespaceHandlerTests extends TestCase { this.registeredComponents = registeredComponents; } + @Override public void componentRegistered(ComponentDefinition componentDefinition) { this.registeredComponents.add(componentDefinition); } @@ -276,6 +281,7 @@ public class JmsNamespaceHandlerTests extends TestCase { static class TestErrorHandler implements ErrorHandler { + @Override public void handleError(Throwable t) { } } diff --git a/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java b/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java index 24211c5fd5c..4e5a4afc030 100644 --- a/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java @@ -79,6 +79,7 @@ public class JmsTransactionManagerTests extends TestCase { TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition()); JmsTemplate jt = new JmsTemplate(cf); jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -118,6 +119,7 @@ public class JmsTransactionManagerTests extends TestCase { TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition()); JmsTemplate jt = new JmsTemplate(cf); jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -157,6 +159,7 @@ public class JmsTransactionManagerTests extends TestCase { TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition()); final JmsTemplate jt = new JmsTemplate(cf); jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -164,8 +167,10 @@ public class JmsTransactionManagerTests extends TestCase { }); TransactionTemplate tt = new TransactionTemplate(tm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -207,6 +212,7 @@ public class JmsTransactionManagerTests extends TestCase { TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition()); final JmsTemplate jt = new JmsTemplate(cf); jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -214,8 +220,10 @@ public class JmsTransactionManagerTests extends TestCase { }); TransactionTemplate tt = new TransactionTemplate(tm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -270,6 +278,7 @@ public class JmsTransactionManagerTests extends TestCase { TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition()); final JmsTemplate jt = new JmsTemplate(cf); jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -278,8 +287,10 @@ public class JmsTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess != session); return null; @@ -288,6 +299,7 @@ public class JmsTransactionManagerTests extends TestCase { } }); jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -335,6 +347,7 @@ public class JmsTransactionManagerTests extends TestCase { TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition()); final JmsTemplate jt = new JmsTemplate(cf); jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -343,8 +356,10 @@ public class JmsTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess != session); return null; @@ -353,6 +368,7 @@ public class JmsTransactionManagerTests extends TestCase { } }); jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -407,6 +423,7 @@ public class JmsTransactionManagerTests extends TestCase { TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition()); JmsTemplate jt = new JmsTemplate(cf); jt.send(dest, new MessageCreator() { + @Override public Message createMessage(Session session) throws JMSException { return message; } @@ -446,6 +463,7 @@ public class JmsTransactionManagerTests extends TestCase { TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition()); JmsTemplate jt = new JmsTemplate102(cf, false); jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -485,6 +503,7 @@ public class JmsTransactionManagerTests extends TestCase { TransactionStatus ts = tm.getTransaction(new DefaultTransactionDefinition()); JmsTemplate jt = new JmsTemplate102(cf, true); jt.execute(new SessionCallback() { + @Override public Object doInJms(Session sess) { assertTrue(sess == session); return null; @@ -497,6 +516,7 @@ public class JmsTransactionManagerTests extends TestCase { cfControl.verify(); } + @Override protected void tearDown() { assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); diff --git a/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java b/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java index e37dd2e5dcd..b1cd2e2b02a 100644 --- a/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java +++ b/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java @@ -38,44 +38,55 @@ public class TestConnection implements Connection { private int closeCount; + @Override public Session createSession(boolean b, int i) throws JMSException { return null; } + @Override public String getClientID() throws JMSException { return null; } + @Override public void setClientID(String paramName) throws JMSException { } + @Override public ConnectionMetaData getMetaData() throws JMSException { return null; } + @Override public ExceptionListener getExceptionListener() throws JMSException { return exceptionListener; } + @Override public void setExceptionListener(ExceptionListener exceptionListener) throws JMSException { this.exceptionListener = exceptionListener; } + @Override public void start() throws JMSException { this.startCount++; } + @Override public void stop() throws JMSException { } + @Override public void close() throws JMSException { this.closeCount++; } + @Override public ConnectionConsumer createConnectionConsumer(Destination destination, String paramName, ServerSessionPool serverSessionPool, int i) throws JMSException { return null; } + @Override public ConnectionConsumer createDurableConnectionConsumer(Topic topic, String paramName, String paramName1, ServerSessionPool serverSessionPool, int i) throws JMSException { return null; } diff --git a/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java b/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java index e3f489f8a84..16a20d342e2 100644 --- a/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java +++ b/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java @@ -26,6 +26,7 @@ public class TestExceptionListener implements ExceptionListener { private int count = 0; + @Override public void onException(JMSException ex) { this.count++; } diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java index 8918069e1bf..41c15ccf2b9 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java @@ -22,10 +22,12 @@ package org.springframework.jms.core; */ public class JmsTemplate102JtaTests extends JmsTemplate102Tests { + @Override protected boolean useTransactedSession() { return true; } + @Override protected boolean useTransactedTemplate() { return false; } diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java index b37037c4440..aa03485dc55 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java @@ -102,6 +102,7 @@ public class JmsTemplate102Tests extends TestCase { /** * Create the mock objects for testing. */ + @Override protected void setUp() throws Exception { mockJndiControl = MockControl.createControl(Context.class); mockJndiContext = (Context) this.mockJndiControl.getMock(); @@ -169,6 +170,7 @@ public class JmsTemplate102Tests extends TestCase { JmsTemplate102 template = new JmsTemplate102(); JndiDestinationResolver destMan = new JndiDestinationResolver(); destMan.setJndiTemplate(new JndiTemplate() { + @Override protected Context createInitialContext() { return mockJndiContext; } @@ -203,6 +205,7 @@ public class JmsTemplate102Tests extends TestCase { topicConnectionControl.replay(); template.execute(new SessionCallback() { + @Override public Object doInJms(Session session) throws JMSException { boolean b = session.getTransacted(); return null; @@ -244,6 +247,7 @@ public class JmsTemplate102Tests extends TestCase { topicConnectionControl.replay(); template.execute(new ProducerCallback() { + @Override public Object doInJms(Session session, MessageProducer producer) throws JMSException { boolean b = session.getTransacted(); int i = producer.getPriority(); @@ -292,6 +296,7 @@ public class JmsTemplate102Tests extends TestCase { topicConnectionControl.replay(); template.execute(new ProducerCallback() { + @Override public Object doInJms(Session session, MessageProducer producer) throws JMSException { boolean b = session.getTransacted(); int i = producer.getPriority(); @@ -324,6 +329,7 @@ public class JmsTemplate102Tests extends TestCase { queueConnectionControl.replay(); template.execute(new SessionCallback() { + @Override public Object doInJms(Session session) throws JMSException { boolean b = session.getTransacted(); return null; @@ -365,6 +371,7 @@ public class JmsTemplate102Tests extends TestCase { queueConnectionControl.replay(); template.execute(new ProducerCallback() { + @Override public Object doInJms(Session session, MessageProducer producer) throws JMSException { boolean b = session.getTransacted(); @@ -411,6 +418,7 @@ public class JmsTemplate102Tests extends TestCase { queueConnectionControl.replay(); template.execute(new ProducerCallback() { + @Override public Object doInJms(Session session, MessageProducer producer) throws JMSException { boolean b = session.getTransacted(); int i = producer.getPriority(); @@ -611,6 +619,7 @@ public class JmsTemplate102Tests extends TestCase { if (useDefaultDestination) { template.send(new MessageCreator() { + @Override public Message createMessage(Session session) throws JMSException { return session.createTextMessage("just testing"); } @@ -619,6 +628,7 @@ public class JmsTemplate102Tests extends TestCase { else { if (explicitQueue) { template.send(mockQueue, new MessageCreator() { + @Override public Message createMessage(Session session) throws JMSException { return session.createTextMessage("just testing"); } @@ -626,6 +636,7 @@ public class JmsTemplate102Tests extends TestCase { } else { template.send("testQueue", new MessageCreator() { + @Override public Message createMessage(Session session) throws JMSException { return session.createTextMessage("just testing"); @@ -689,6 +700,7 @@ public class JmsTemplate102Tests extends TestCase { if (explicitTopic) { template.send(mockTopic, new MessageCreator() { + @Override public Message createMessage(Session session) throws JMSException { return session.createTextMessage("just testing"); @@ -697,6 +709,7 @@ public class JmsTemplate102Tests extends TestCase { } else { template.send("testTopic", new MessageCreator() { + @Override public Message createMessage(Session session) throws JMSException { return session.createTextMessage("just testing"); diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java index 20e5b3ed2bb..de630545c5f 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java @@ -22,10 +22,12 @@ package org.springframework.jms.core; */ public class JmsTemplate102TransactedTests extends JmsTemplate102Tests { + @Override protected boolean useTransactedSession() { return true; } + @Override protected boolean useTransactedTemplate() { return true; } diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java index f13a7ccd562..0fea92f9564 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java @@ -22,10 +22,12 @@ package org.springframework.jms.core; */ public class JmsTemplateJtaTests extends JmsTemplateTests { + @Override protected boolean useTransactedSession() { return true; } + @Override protected boolean useTransactedTemplate() { return false; } diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java index bcf880eaaec..7ede7b3a22c 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java @@ -91,6 +91,7 @@ public class JmsTemplateTests extends TestCase { /** * Create the mock objects for testing. */ + @Override protected void setUp() throws Exception { mockJndiControl = MockControl.createControl(Context.class); mockJndiContext = (Context) this.mockJndiControl.getMock(); @@ -131,6 +132,7 @@ public class JmsTemplateTests extends TestCase { JmsTemplate template = new JmsTemplate(); JndiDestinationResolver destMan = new JndiDestinationResolver(); destMan.setJndiTemplate(new JndiTemplate() { + @Override protected Context createInitialContext() { return mockJndiContext; } @@ -186,6 +188,7 @@ public class JmsTemplateTests extends TestCase { connectionControl.replay(); template.execute(new ProducerCallback() { + @Override public Object doInJms(Session session, MessageProducer producer) throws JMSException { boolean b = session.getTransacted(); int i = producer.getPriority(); @@ -229,6 +232,7 @@ public class JmsTemplateTests extends TestCase { connectionControl.replay(); template.execute(new ProducerCallback() { + @Override public Object doInJms(Session session, MessageProducer producer) throws JMSException { boolean b = session.getTransacted(); int i = producer.getPriority(); @@ -258,6 +262,7 @@ public class JmsTemplateTests extends TestCase { connectionControl.replay(); template.execute(new SessionCallback() { + @Override public Object doInJms(Session session) throws JMSException { boolean b = session.getTransacted(); return null; @@ -296,12 +301,14 @@ public class JmsTemplateTests extends TestCase { TransactionSynchronizationManager.initSynchronization(); try { template.execute(new SessionCallback() { + @Override public Object doInJms(Session session) throws JMSException { boolean b = session.getTransacted(); return null; } }); template.execute(new SessionCallback() { + @Override public Object doInJms(Session session) throws JMSException { boolean b = session.getTransacted(); return null; @@ -472,6 +479,7 @@ public class JmsTemplateTests extends TestCase { if (useDefaultDestination) { template.send(new MessageCreator() { + @Override public Message createMessage(Session session) throws JMSException { return session.createTextMessage("just testing"); } @@ -480,6 +488,7 @@ public class JmsTemplateTests extends TestCase { else { if (explicitDestination) { template.send(mockQueue, new MessageCreator() { + @Override public Message createMessage(Session session) throws JMSException { return session.createTextMessage("just testing"); } @@ -487,6 +496,7 @@ public class JmsTemplateTests extends TestCase { } else { template.send(destinationName, new MessageCreator() { + @Override public Message createMessage(Session session) throws JMSException { return session.createTextMessage("just testing"); } diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java index a3874798cc6..bfa36dcb5d0 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java @@ -22,10 +22,12 @@ package org.springframework.jms.core; */ public class JmsTemplateTransactedTests extends JmsTemplateTests { + @Override protected boolean useTransactedSession() { return true; } + @Override protected boolean useTransactedTemplate() { return true; } diff --git a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java index dbc3663fa01..2072342bd62 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java @@ -37,6 +37,7 @@ public class JmsGatewaySupportTests extends TestCase { connectionFactoryControl.replay(); final List test = new ArrayList(); JmsGatewaySupport gateway = new JmsGatewaySupport() { + @Override protected void initGateway() { test.add("test"); } @@ -53,6 +54,7 @@ public class JmsGatewaySupportTests extends TestCase { JmsTemplate template = new JmsTemplate(); final List test = new ArrayList(); JmsGatewaySupport gateway = new JmsGatewaySupport() { + @Override protected void initGateway() { test.add("test"); } diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java index 18e47584a48..388fbe86c8c 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java @@ -63,6 +63,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener this.container = (SimpleMessageListenerContainer) getContainer(); } + @Override protected AbstractMessageListenerContainer getContainer() { return new SimpleMessageListenerContainer(); } @@ -234,6 +235,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener this.container.setConnectionFactory(connectionFactory); this.container.setDestinationName(DESTINATION_NAME); this.container.setMessageListener(new SessionAwareMessageListener() { + @Override public void onMessage(Message message, Session sess) { try { // Check correct Session passed into SessionAwareMessageListener. @@ -301,6 +303,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener this.container.setDestinationName(DESTINATION_NAME); this.container.setMessageListener(listener); this.container.setTaskExecutor(new TaskExecutor() { + @Override public void execute(Runnable task) { listener.executorInvoked = true; assertFalse(listener.listenerInvoked); @@ -364,6 +367,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener this.container.setConnectionFactory(connectionFactory); this.container.setDestinationName(DESTINATION_NAME); this.container.setMessageListener(new SessionAwareMessageListener() { + @Override public void onMessage(Message message, Session session) throws JMSException { throw theException; } @@ -430,6 +434,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener this.container.setConnectionFactory(connectionFactory); this.container.setDestinationName(DESTINATION_NAME); this.container.setMessageListener(new SessionAwareMessageListener() { + @Override public void onMessage(Message message, Session session) throws JMSException { throw theException; } @@ -491,6 +496,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener this.container.setConnectionFactory(connectionFactory); this.container.setDestinationName(DESTINATION_NAME); this.container.setMessageListener(new MessageListener() { + @Override public void onMessage(Message message) { throw new UnsupportedOperationException(); } @@ -555,6 +561,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener this.container.setConnectionFactory(connectionFactory); this.container.setDestinationName(DESTINATION_NAME); this.container.setMessageListener(new MessageListener() { + @Override public void onMessage(Message message) { throw new UnsupportedOperationException(); } @@ -644,6 +651,7 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener public boolean listenerInvoked = false; + @Override public void onMessage(Message message) { this.listenerInvoked = true; } @@ -658,30 +666,37 @@ public class SimpleMessageListenerContainerTests extends AbstractMessageListener this.messageListener.onMessage(message); } + @Override public String getMessageSelector() throws JMSException { throw new UnsupportedOperationException(); } + @Override public MessageListener getMessageListener() throws JMSException { return this.messageListener; } + @Override public void setMessageListener(MessageListener messageListener) throws JMSException { this.messageListener = messageListener; } + @Override public Message receive() throws JMSException { throw new UnsupportedOperationException(); } + @Override public Message receive(long l) throws JMSException { throw new UnsupportedOperationException(); } + @Override public Message receiveNoWait() throws JMSException { throw new UnsupportedOperationException(); } + @Override public void close() throws JMSException { throw new UnsupportedOperationException(); } diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java index 56c56a8e653..d34c5597d66 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java @@ -169,6 +169,7 @@ public final class MessageListenerAdapter102Tests { mockDelegate.replay(); MessageListenerAdapter102 adapter = new MessageListenerAdapter102(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -230,6 +231,7 @@ public final class MessageListenerAdapter102Tests { mockDelegate.replay(); MessageListenerAdapter102 adapter = new MessageListenerAdapter102(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -291,6 +293,7 @@ public final class MessageListenerAdapter102Tests { mockDelegate.replay(); MessageListenerAdapter102 adapter = new MessageListenerAdapter102(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -337,6 +340,7 @@ public final class MessageListenerAdapter102Tests { mockDelegate.replay(); final MessageListenerAdapter102 adapter = new MessageListenerAdapter102(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -399,6 +403,7 @@ public final class MessageListenerAdapter102Tests { mockDelegate.replay(); final MessageListenerAdapter102 adapter = new MessageListenerAdapter102(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -434,6 +439,7 @@ public final class MessageListenerAdapter102Tests { mockDelegate.replay(); final MessageListenerAdapter102 adapter = new MessageListenerAdapter102(delegate) { + @Override protected Object extractMessage(Message message) { return message; } diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java index 2afee39fefc..6a296262081 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java @@ -216,6 +216,7 @@ public class MessageListenerAdapterTests { mockDelegate.replay(); MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { + @Override protected void handleListenerException(Throwable ex) { assertNotNull("The Throwable passed to the handleListenerException(..) method must never be null.", ex); assertTrue("The Throwable passed to the handleListenerException(..) method must be of type [ListenerExecutionFailedException].", @@ -320,6 +321,7 @@ public class MessageListenerAdapterTests { mockDelegate.replay(); MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -382,6 +384,7 @@ public class MessageListenerAdapterTests { mockDelegate.replay(); MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -427,6 +430,7 @@ public class MessageListenerAdapterTests { mockDelegate.replay(); final MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -488,6 +492,7 @@ public class MessageListenerAdapterTests { mockDelegate.replay(); final MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -522,6 +527,7 @@ public class MessageListenerAdapterTests { mockDelegate.replay(); final MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -546,6 +552,7 @@ public class MessageListenerAdapterTests { mockMessage.replay(); final MessageListenerAdapter adapter = new MessageListenerAdapter() { + @Override protected void handleListenerException(Throwable ex) { assertTrue(ex instanceof IllegalStateException); } @@ -566,9 +573,11 @@ public class MessageListenerAdapterTests { mockMessage.replay(); final MessageListenerAdapter adapter = new MessageListenerAdapter() { + @Override protected void handleListenerException(Throwable ex) { assertTrue(ex instanceof javax.jms.IllegalStateException); } + @Override protected String getListenerMethodName(Message originalMessage, Object extractedMessage) { return null; } @@ -596,6 +605,7 @@ public class MessageListenerAdapterTests { mockDelegate.replay(); final MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { + @Override protected Object extractMessage(Message message) { return message; } @@ -654,6 +664,7 @@ public class MessageListenerAdapterTests { mockDelegate.replay(); final MessageListenerAdapter adapter = new MessageListenerAdapter(delegate) { + @Override protected Object extractMessage(Message message) { return message; } diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java index 4973cda8ce5..218ec707e12 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java @@ -35,6 +35,7 @@ public class StubMessageListenerAdapter extends MessageListenerAdapter { this.wasCalled = true; } + @Override protected void handleListenerException(Throwable ex) { System.out.println(ex); } diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java index 20ea0c40bb6..324c7bf817e 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java @@ -35,6 +35,7 @@ public class StubMessageListenerAdapter102 extends MessageListenerAdapter102 { this.wasCalled = true; } + @Override protected void handleListenerException(Throwable ex) { System.out.println(ex); } diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java index 3b7e23a91f6..880e535f92b 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java @@ -34,6 +34,7 @@ public class DefaultJmsActivationSpecFactoryTests extends TestCase { private JmsActivationSpecConfig activationSpecConfig; + @Override protected void setUp() throws Exception { activationSpecConfig = new JmsActivationSpecConfig(); activationSpecConfig.setMaxConcurrency(5); diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java index 1be6176bd69..cf433e3352e 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java @@ -26,6 +26,7 @@ import org.springframework.jca.StubActivationSpec; */ public class StubJmsActivationSpecFactory implements JmsActivationSpecFactory { + @Override public ActivationSpec createActivationSpec(ResourceAdapter adapter, JmsActivationSpecConfig config) { return new StubActivationSpec(); } diff --git a/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java b/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java index 97c33f03077..49b1f47f6ca 100644 --- a/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java @@ -56,6 +56,7 @@ public class JmsInvokerTests extends TestCase { private Queue mockQueue; + @Override protected void setUp() throws Exception { connectionFactoryControl = MockControl.createControl(QueueConnectionFactory.class); mockConnectionFactory = (QueueConnectionFactory) connectionFactoryControl.getMock(); @@ -107,6 +108,7 @@ public class JmsInvokerTests extends TestCase { exporter.afterPropertiesSet(); JmsInvokerProxyFactoryBean pfb = new JmsInvokerProxyFactoryBean() { + @Override protected Message doExecuteRequest(Session session, Queue queue, Message requestMessage) throws JMSException { MockControl exporterSessionControl = MockControl.createControl(Session.class); Session mockExporterSession = (Session) exporterSessionControl.getMock(); @@ -167,59 +169,75 @@ public class JmsInvokerTests extends TestCase { public boolean closed = false; + @Override public void setDisableMessageID(boolean b) throws JMSException { } + @Override public boolean getDisableMessageID() throws JMSException { return false; } + @Override public void setDisableMessageTimestamp(boolean b) throws JMSException { } + @Override public boolean getDisableMessageTimestamp() throws JMSException { return false; } + @Override public void setDeliveryMode(int i) throws JMSException { } + @Override public int getDeliveryMode() throws JMSException { return 0; } + @Override public void setPriority(int i) throws JMSException { } + @Override public int getPriority() throws JMSException { return 0; } + @Override public void setTimeToLive(long l) throws JMSException { } + @Override public long getTimeToLive() throws JMSException { return 0; } + @Override public Destination getDestination() throws JMSException { return null; } + @Override public void close() throws JMSException { this.closed = true; } + @Override public void send(Message message) throws JMSException { this.response = message; } + @Override public void send(Message message, int i, int i1, long l) throws JMSException { } + @Override public void send(Destination destination, Message message) throws JMSException { } + @Override public void send(Destination destination, Message message, int i, int i1, long l) throws JMSException { } } @@ -235,169 +253,216 @@ public class JmsInvokerTests extends TestCase { this.serializable = serializable; } + @Override public void setObject(Serializable serializable) throws JMSException { this.serializable = serializable; } + @Override public Serializable getObject() throws JMSException { return serializable; } + @Override public String getJMSMessageID() throws JMSException { return null; } + @Override public void setJMSMessageID(String string) throws JMSException { } + @Override public long getJMSTimestamp() throws JMSException { return 0; } + @Override public void setJMSTimestamp(long l) throws JMSException { } + @Override public byte[] getJMSCorrelationIDAsBytes() throws JMSException { return new byte[0]; } + @Override public void setJMSCorrelationIDAsBytes(byte[] bytes) throws JMSException { } + @Override public void setJMSCorrelationID(String string) throws JMSException { } + @Override public String getJMSCorrelationID() throws JMSException { return null; } + @Override public Destination getJMSReplyTo() throws JMSException { return replyTo; } + @Override public void setJMSReplyTo(Destination destination) throws JMSException { this.replyTo = destination; } + @Override public Destination getJMSDestination() throws JMSException { return null; } + @Override public void setJMSDestination(Destination destination) throws JMSException { } + @Override public int getJMSDeliveryMode() throws JMSException { return 0; } + @Override public void setJMSDeliveryMode(int i) throws JMSException { } + @Override public boolean getJMSRedelivered() throws JMSException { return false; } + @Override public void setJMSRedelivered(boolean b) throws JMSException { } + @Override public String getJMSType() throws JMSException { return null; } + @Override public void setJMSType(String string) throws JMSException { } + @Override public long getJMSExpiration() throws JMSException { return 0; } + @Override public void setJMSExpiration(long l) throws JMSException { } + @Override public int getJMSPriority() throws JMSException { return 0; } + @Override public void setJMSPriority(int i) throws JMSException { } + @Override public void clearProperties() throws JMSException { } + @Override public boolean propertyExists(String string) throws JMSException { return false; } + @Override public boolean getBooleanProperty(String string) throws JMSException { return false; } + @Override public byte getByteProperty(String string) throws JMSException { return 0; } + @Override public short getShortProperty(String string) throws JMSException { return 0; } + @Override public int getIntProperty(String string) throws JMSException { return 0; } + @Override public long getLongProperty(String string) throws JMSException { return 0; } + @Override public float getFloatProperty(String string) throws JMSException { return 0; } + @Override public double getDoubleProperty(String string) throws JMSException { return 0; } + @Override public String getStringProperty(String string) throws JMSException { return null; } + @Override public Object getObjectProperty(String string) throws JMSException { return null; } + @Override public Enumeration getPropertyNames() throws JMSException { return null; } + @Override public void setBooleanProperty(String string, boolean b) throws JMSException { } + @Override public void setByteProperty(String string, byte b) throws JMSException { } + @Override public void setShortProperty(String string, short i) throws JMSException { } + @Override public void setIntProperty(String string, int i) throws JMSException { } + @Override public void setLongProperty(String string, long l) throws JMSException { } + @Override public void setFloatProperty(String string, float v) throws JMSException { } + @Override public void setDoubleProperty(String string, double v) throws JMSException { } + @Override public void setStringProperty(String string, String string1) throws JMSException { } + @Override public void setObjectProperty(String string, Object object) throws JMSException { } + @Override public void acknowledge() throws JMSException { } + @Override public void clearBody() throws JMSException { } } @@ -405,6 +470,7 @@ public class JmsInvokerTests extends TestCase { private static class MockSimpleMessageConverter extends SimpleMessageConverter { + @Override public Message toMessage(Object object, Session session) throws JMSException, MessageConversionException { return new MockObjectMessage((Serializable) object); } diff --git a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java index 450c0889a52..861ff0a52b2 100644 --- a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java +++ b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java @@ -49,12 +49,14 @@ public final class SimpleMessageConverter102Tests extends TestCase { messageControl.setVoidCallable(1); message.readBytes(new byte[SimpleMessageConverter102.BUFFER_SIZE]); messageControl.setMatcher(new ArgumentsMatcher() { + @Override public boolean matches(Object[] arg0, Object[] arg1) { byte[] one = (byte[]) arg0[0]; byte[] two = (byte[]) arg1[0]; return Arrays.equals(one, two); } + @Override public String toString(Object[] arg0) { return "bla"; } diff --git a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java index 7085c1669b4..6546fd869d5 100644 --- a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java @@ -87,12 +87,14 @@ public final class SimpleMessageConverterTests { messageControl.setReturnValue(content.length, 1); message.readBytes(new byte[content.length]); messageControl.setMatcher(new ArgumentsMatcher() { + @Override public boolean matches(Object[] arg0, Object[] arg1) { byte[] one = (byte[]) arg0[0]; byte[] two = (byte[]) arg1[0]; return Arrays.equals(one, two); } + @Override public String toString(Object[] arg0) { return "bla"; } diff --git a/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java b/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java index 739dbe3d3c2..531ff04c4cf 100644 --- a/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java @@ -88,6 +88,7 @@ public class JndiDestinationResolverTests { mockDestinationResolver.replay(); JndiDestinationResolver resolver = new JndiDestinationResolver() { + @Override protected Object lookup(String jndiName, Class requiredClass) throws NamingException { throw new NamingException(); } @@ -114,6 +115,7 @@ public class JndiDestinationResolverTests { mockDestinationResolver.replay(); final JndiDestinationResolver resolver = new JndiDestinationResolver() { + @Override protected Object lookup(String jndiName, Class requiredClass) throws NamingException { throw new NamingException(); } @@ -134,6 +136,7 @@ public class JndiDestinationResolverTests { private boolean called; + @Override protected Object lookup(String jndiName, Class requiredType) throws NamingException { if (called) { fail("Must not be delegating to lookup(..), must be resolving from cache."); @@ -152,6 +155,7 @@ public class JndiDestinationResolverTests { return this.callCount; } + @Override protected Object lookup(String jndiName, Class requiredType) throws NamingException { ++this.callCount; return DESTINATION; diff --git a/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java index 0c0b3cb81cf..02996e490f8 100644 --- a/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java +++ b/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java @@ -32,21 +32,25 @@ public class CallCountingTransactionManager extends AbstractPlatformTransactionM public int rollbacks; public int inflight; + @Override protected Object doGetTransaction() { return new Object(); } + @Override protected void doBegin(Object transaction, TransactionDefinition definition) { this.lastDefinition = definition; ++begun; ++inflight; } + @Override protected void doCommit(DefaultTransactionStatus status) { ++commits; --inflight; } + @Override protected void doRollback(DefaultTransactionStatus status) { ++rollbacks; --inflight; diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java index 66ce8a2b076..573e70e2e99 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java @@ -54,10 +54,12 @@ public class DelegatingServletInputStream extends ServletInputStream { } + @Override public int read() throws IOException { return this.sourceStream.read(); } + @Override public void close() throws IOException { super.close(); this.sourceStream.close(); diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java index 784e160483a..c4d9b9ebb3d 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java @@ -54,15 +54,18 @@ public class DelegatingServletOutputStream extends ServletOutputStream { } + @Override public void write(int b) throws IOException { this.targetStream.write(b); } + @Override public void flush() throws IOException { super.flush(); this.targetStream.flush(); } + @Override public void close() throws IOException { super.close(); this.targetStream.close(); diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterChain.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterChain.java index 3f5d5106c36..bb1fa0ee839 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterChain.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterChain.java @@ -116,6 +116,7 @@ public class MockFilterChain implements FilterChain { * Invoke registered {@link javax.servlet.Filter}s and/or {@link javax.servlet.Servlet} also saving the * request and response. */ + @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { Assert.notNull(request, "Request must not be null"); Assert.notNull(response, "Response must not be null"); @@ -159,15 +160,18 @@ public class MockFilterChain implements FilterChain { this.delegateServlet = servlet; } + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { this.delegateServlet.service(request, response); } + @Override public void init(FilterConfig filterConfig) throws ServletException { } + @Override public void destroy() { } diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java index 34cafd55fc1..2de79f09c27 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java @@ -79,10 +79,12 @@ public class MockFilterConfig implements FilterConfig { } + @Override public String getFilterName() { return filterName; } + @Override public ServletContext getServletContext() { return servletContext; } @@ -92,11 +94,13 @@ public class MockFilterConfig implements FilterConfig { this.initParameters.put(name, value); } + @Override public String getInitParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.initParameters.get(name); } + @Override public Enumeration getInitParameterNames() { return Collections.enumeration(this.initParameters.keySet()); } diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java index 7df22ffaf83..8d0b813d481 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java @@ -282,20 +282,24 @@ public class MockHttpServletRequest implements HttpServletRequest { // ServletRequest interface // --------------------------------------------------------------------- + @Override public Object getAttribute(String name) { checkActive(); return this.attributes.get(name); } + @Override public Enumeration getAttributeNames() { checkActive(); return Collections.enumeration(this.attributes.keySet()); } + @Override public String getCharacterEncoding() { return this.characterEncoding; } + @Override public void setCharacterEncoding(String characterEncoding) { this.characterEncoding = characterEncoding; updateContentTypeHeader(); @@ -315,6 +319,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.content = content; } + @Override public int getContentLength() { return (this.content != null ? this.content.length : -1); } @@ -331,10 +336,12 @@ public class MockHttpServletRequest implements HttpServletRequest { } } + @Override public String getContentType() { return this.contentType; } + @Override public ServletInputStream getInputStream() { if (this.content != null) { return new DelegatingServletInputStream(new ByteArrayInputStream(this.content)); @@ -455,21 +462,25 @@ public class MockHttpServletRequest implements HttpServletRequest { this.parameters.clear(); } + @Override public String getParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); String[] arr = this.parameters.get(name); return (arr != null && arr.length > 0 ? arr[0] : null); } + @Override public Enumeration getParameterNames() { return Collections.enumeration(this.parameters.keySet()); } + @Override public String[] getParameterValues(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.parameters.get(name); } + @Override public Map getParameterMap() { return Collections.unmodifiableMap(this.parameters); } @@ -478,6 +489,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.protocol = protocol; } + @Override public String getProtocol() { return this.protocol; } @@ -486,6 +498,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.scheme = scheme; } + @Override public String getScheme() { return this.scheme; } @@ -494,6 +507,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.serverName = serverName; } + @Override public String getServerName() { return this.serverName; } @@ -502,10 +516,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.serverPort = serverPort; } + @Override public int getServerPort() { return this.serverPort; } + @Override public BufferedReader getReader() throws UnsupportedEncodingException { if (this.content != null) { InputStream sourceStream = new ByteArrayInputStream(this.content); @@ -522,6 +538,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.remoteAddr = remoteAddr; } + @Override public String getRemoteAddr() { return this.remoteAddr; } @@ -530,10 +547,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.remoteHost = remoteHost; } + @Override public String getRemoteHost() { return this.remoteHost; } + @Override public void setAttribute(String name, Object value) { checkActive(); Assert.notNull(name, "Attribute name must not be null"); @@ -545,6 +564,7 @@ public class MockHttpServletRequest implements HttpServletRequest { } } + @Override public void removeAttribute(String name) { checkActive(); Assert.notNull(name, "Attribute name must not be null"); @@ -579,10 +599,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.locales.addAll(locales); } + @Override public Locale getLocale() { return this.locales.get(0); } + @Override public Enumeration getLocales() { return Collections.enumeration(this.locales); } @@ -591,14 +613,17 @@ public class MockHttpServletRequest implements HttpServletRequest { this.secure = secure; } + @Override public boolean isSecure() { return this.secure; } + @Override public RequestDispatcher getRequestDispatcher(String path) { return new MockRequestDispatcher(path); } + @Override public String getRealPath(String path) { return this.servletContext.getRealPath(path); } @@ -607,6 +632,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.remotePort = remotePort; } + @Override public int getRemotePort() { return this.remotePort; } @@ -615,6 +641,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.localName = localName; } + @Override public String getLocalName() { return this.localName; } @@ -623,6 +650,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.localAddr = localAddr; } + @Override public String getLocalAddr() { return this.localAddr; } @@ -631,6 +659,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.localPort = localPort; } + @Override public int getLocalPort() { return this.localPort; } @@ -643,6 +672,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.authType = authType; } + @Override public String getAuthType() { return this.authType; } @@ -651,6 +681,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.cookies = cookies; } + @Override public Cookie[] getCookies() { return this.cookies; } @@ -699,6 +730,7 @@ public class MockHttpServletRequest implements HttpServletRequest { } } + @Override public long getDateHeader(String name) { HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name); Object value = (header != null ? header.getValue() : null); @@ -717,20 +749,24 @@ public class MockHttpServletRequest implements HttpServletRequest { } } + @Override public String getHeader(String name) { HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name); return (header != null ? header.getStringValue() : null); } + @Override public Enumeration getHeaders(String name) { HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name); return Collections.enumeration(header != null ? header.getStringValues() : new LinkedList()); } + @Override public Enumeration getHeaderNames() { return Collections.enumeration(this.headers.keySet()); } + @Override public int getIntHeader(String name) { HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name); Object value = (header != null ? header.getValue() : null); @@ -752,6 +788,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.method = method; } + @Override public String getMethod() { return this.method; } @@ -760,10 +797,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.pathInfo = pathInfo; } + @Override public String getPathInfo() { return this.pathInfo; } + @Override public String getPathTranslated() { return (this.pathInfo != null ? getRealPath(this.pathInfo) : null); } @@ -772,6 +811,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.contextPath = contextPath; } + @Override public String getContextPath() { return this.contextPath; } @@ -780,6 +820,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.queryString = queryString; } + @Override public String getQueryString() { return this.queryString; } @@ -788,6 +829,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.remoteUser = remoteUser; } + @Override public String getRemoteUser() { return this.remoteUser; } @@ -796,6 +838,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.userRoles.add(role); } + @Override public boolean isUserInRole(String role) { return (this.userRoles.contains(role) || (this.servletContext instanceof MockServletContext && ((MockServletContext) this.servletContext).getDeclaredRoles().contains( role))); @@ -805,6 +848,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.userPrincipal = userPrincipal; } + @Override public Principal getUserPrincipal() { return this.userPrincipal; } @@ -813,6 +857,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.requestedSessionId = requestedSessionId; } + @Override public String getRequestedSessionId() { return this.requestedSessionId; } @@ -821,10 +866,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.requestURI = requestURI; } + @Override public String getRequestURI() { return this.requestURI; } + @Override public StringBuffer getRequestURL() { StringBuffer url = new StringBuffer(this.scheme); url.append("://").append(this.serverName).append(':').append(this.serverPort); @@ -836,6 +883,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.servletPath = servletPath; } + @Override public String getServletPath() { return this.servletPath; } @@ -848,6 +896,7 @@ public class MockHttpServletRequest implements HttpServletRequest { } } + @Override public HttpSession getSession(boolean create) { checkActive(); // Reset session if invalidated. @@ -861,6 +910,7 @@ public class MockHttpServletRequest implements HttpServletRequest { return this.session; } + @Override public HttpSession getSession() { return getSession(true); } @@ -869,6 +919,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.requestedSessionIdValid = requestedSessionIdValid; } + @Override public boolean isRequestedSessionIdValid() { return this.requestedSessionIdValid; } @@ -877,6 +928,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.requestedSessionIdFromCookie = requestedSessionIdFromCookie; } + @Override public boolean isRequestedSessionIdFromCookie() { return this.requestedSessionIdFromCookie; } @@ -885,10 +937,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.requestedSessionIdFromURL = requestedSessionIdFromURL; } + @Override public boolean isRequestedSessionIdFromURL() { return this.requestedSessionIdFromURL; } + @Override public boolean isRequestedSessionIdFromUrl() { return isRequestedSessionIdFromURL(); } diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java index c86e95a93a7..5a2b7fd1aa8 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java @@ -136,6 +136,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return this.writerAccessAllowed; } + @Override public void setCharacterEncoding(String characterEncoding) { this.characterEncoding = characterEncoding; this.charset = true; @@ -152,10 +153,12 @@ public class MockHttpServletResponse implements HttpServletResponse { } } + @Override public String getCharacterEncoding() { return this.characterEncoding; } + @Override public ServletOutputStream getOutputStream() { if (!this.outputStreamAccessAllowed) { throw new IllegalStateException("OutputStream access not allowed"); @@ -163,6 +166,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return this.outputStream; } + @Override public PrintWriter getWriter() throws UnsupportedEncodingException { if (!this.writerAccessAllowed) { throw new IllegalStateException("Writer access not allowed"); @@ -186,6 +190,7 @@ public class MockHttpServletResponse implements HttpServletResponse { this.content.toString(this.characterEncoding) : this.content.toString(); } + @Override public void setContentLength(int contentLength) { this.contentLength = contentLength; doAddHeaderValue(CONTENT_LENGTH_HEADER, contentLength, true); @@ -195,6 +200,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return this.contentLength; } + @Override public void setContentType(String contentType) { this.contentType = contentType; if (contentType != null) { @@ -208,22 +214,27 @@ public class MockHttpServletResponse implements HttpServletResponse { } } + @Override public String getContentType() { return this.contentType; } + @Override public void setBufferSize(int bufferSize) { this.bufferSize = bufferSize; } + @Override public int getBufferSize() { return this.bufferSize; } + @Override public void flushBuffer() { setCommitted(true); } + @Override public void resetBuffer() { if (isCommitted()) { throw new IllegalStateException("Cannot reset buffer - response is already committed"); @@ -242,10 +253,12 @@ public class MockHttpServletResponse implements HttpServletResponse { this.committed = committed; } + @Override public boolean isCommitted() { return this.committed; } + @Override public void reset() { resetBuffer(); this.characterEncoding = null; @@ -258,10 +271,12 @@ public class MockHttpServletResponse implements HttpServletResponse { this.errorMessage = null; } + @Override public void setLocale(Locale locale) { this.locale = locale; } + @Override public Locale getLocale() { return this.locale; } @@ -271,6 +286,7 @@ public class MockHttpServletResponse implements HttpServletResponse { // HttpServletResponse interface //--------------------------------------------------------------------- + @Override public void addCookie(Cookie cookie) { Assert.notNull(cookie, "Cookie must not be null"); this.cookies.add(cookie); @@ -290,6 +306,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return null; } + @Override public boolean containsHeader(String name) { return (HeaderValueHolder.getByName(this.headers, name) != null); } @@ -365,6 +382,7 @@ public class MockHttpServletResponse implements HttpServletResponse { * The default implementation returns the given URL String as-is. *

Can be overridden in subclasses, appending a session id or the like. */ + @Override public String encodeURL(String url) { return url; } @@ -377,18 +395,22 @@ public class MockHttpServletResponse implements HttpServletResponse { * override the common {@link #encodeURL} method instead, applying * to redirect URLs as well as to general URLs. */ + @Override public String encodeRedirectURL(String url) { return encodeURL(url); } + @Override public String encodeUrl(String url) { return encodeURL(url); } + @Override public String encodeRedirectUrl(String url) { return encodeRedirectURL(url); } + @Override public void sendError(int status, String errorMessage) throws IOException { if (isCommitted()) { throw new IllegalStateException("Cannot set error status - response is already committed"); @@ -398,6 +420,7 @@ public class MockHttpServletResponse implements HttpServletResponse { setCommitted(true); } + @Override public void sendError(int status) throws IOException { if (isCommitted()) { throw new IllegalStateException("Cannot set error status - response is already committed"); @@ -406,6 +429,7 @@ public class MockHttpServletResponse implements HttpServletResponse { setCommitted(true); } + @Override public void sendRedirect(String url) throws IOException { if (isCommitted()) { throw new IllegalStateException("Cannot send redirect - response is already committed"); @@ -420,26 +444,32 @@ public class MockHttpServletResponse implements HttpServletResponse { return getHeader(LOCATION_HEADER); } + @Override public void setDateHeader(String name, long value) { setHeaderValue(name, value); } + @Override public void addDateHeader(String name, long value) { addHeaderValue(name, value); } + @Override public void setHeader(String name, String value) { setHeaderValue(name, value); } + @Override public void addHeader(String name, String value) { addHeaderValue(name, value); } + @Override public void setIntHeader(String name, int value) { setHeaderValue(name, value); } + @Override public void addIntHeader(String name, int value) { addHeaderValue(name, value); } @@ -487,10 +517,12 @@ public class MockHttpServletResponse implements HttpServletResponse { } } + @Override public void setStatus(int status) { this.status = status; } + @Override public void setStatus(int status, String errorMessage) { this.status = status; this.errorMessage = errorMessage; @@ -553,12 +585,14 @@ public class MockHttpServletResponse implements HttpServletResponse { super(out); } + @Override public void write(int b) throws IOException { super.write(b); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void flush() throws IOException { super.flush(); setCommitted(true); @@ -576,24 +610,28 @@ public class MockHttpServletResponse implements HttpServletResponse { super(out, true); } + @Override public void write(char buf[], int off, int len) { super.write(buf, off, len); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void write(String s, int off, int len) { super.write(s, off, len); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void write(int c) { super.write(c); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void flush() { super.flush(); setCommitted(true); diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpSession.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpSession.java index c5096572d02..f7b086c9872 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpSession.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpSession.java @@ -98,10 +98,12 @@ public class MockHttpSession implements HttpSession { this.id = (id != null ? id : Integer.toString(nextId++)); } + @Override public long getCreationTime() { return this.creationTime; } + @Override public String getId() { return this.id; } @@ -111,43 +113,53 @@ public class MockHttpSession implements HttpSession { this.isNew = false; } + @Override public long getLastAccessedTime() { return this.lastAccessedTime; } + @Override public ServletContext getServletContext() { return this.servletContext; } + @Override public void setMaxInactiveInterval(int interval) { this.maxInactiveInterval = interval; } + @Override public int getMaxInactiveInterval() { return this.maxInactiveInterval; } + @Override public HttpSessionContext getSessionContext() { throw new UnsupportedOperationException("getSessionContext"); } + @Override public Object getAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); return this.attributes.get(name); } + @Override public Object getValue(String name) { return getAttribute(name); } + @Override public Enumeration getAttributeNames() { return Collections.enumeration(this.attributes.keySet()); } + @Override public String[] getValueNames() { return this.attributes.keySet().toArray(new String[this.attributes.size()]); } + @Override public void setAttribute(String name, Object value) { Assert.notNull(name, "Attribute name must not be null"); if (value != null) { @@ -161,10 +173,12 @@ public class MockHttpSession implements HttpSession { } } + @Override public void putValue(String name, Object value) { setAttribute(name, value); } + @Override public void removeAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); Object value = this.attributes.remove(name); @@ -173,6 +187,7 @@ public class MockHttpSession implements HttpSession { } } + @Override public void removeValue(String name) { removeAttribute(name); } @@ -197,6 +212,7 @@ public class MockHttpSession implements HttpSession { * * @throws IllegalStateException if this method is called on an already invalidated session */ + @Override public void invalidate() { if (this.invalid) { throw new IllegalStateException("The session has already been invalidated"); @@ -215,6 +231,7 @@ public class MockHttpSession implements HttpSession { this.isNew = value; } + @Override public boolean isNew() { return this.isNew; } diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java index 9ce5f8d5c0b..46924b0893e 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java @@ -55,6 +55,7 @@ public class MockRequestDispatcher implements RequestDispatcher { } + @Override public void forward(ServletRequest request, ServletResponse response) { Assert.notNull(request, "Request must not be null"); Assert.notNull(response, "Response must not be null"); @@ -67,6 +68,7 @@ public class MockRequestDispatcher implements RequestDispatcher { } } + @Override public void include(ServletRequest request, ServletResponse response) { Assert.notNull(request, "Request must not be null"); Assert.notNull(response, "Response must not be null"); diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java index c62ec1520d0..d8e8abdf5ef 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java @@ -78,10 +78,12 @@ public class MockServletConfig implements ServletConfig { } + @Override public String getServletName() { return this.servletName; } + @Override public ServletContext getServletContext() { return this.servletContext; } @@ -91,11 +93,13 @@ public class MockServletConfig implements ServletConfig { this.initParameters.put(name, value); } + @Override public String getInitParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.initParameters.get(name); } + @Override public Enumeration getInitParameterNames() { return Collections.enumeration(this.initParameters.keySet()); } diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletContext.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletContext.java index 7851a77e497..70ae2b53ce3 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletContext.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletContext.java @@ -195,6 +195,7 @@ public class MockServletContext implements ServletContext { } /* This is a Servlet API 2.5 method. */ + @Override public String getContextPath() { return this.contextPath; } @@ -203,6 +204,7 @@ public class MockServletContext implements ServletContext { this.contexts.put(contextPath, context); } + @Override public ServletContext getContext(String contextPath) { if (this.contextPath.equals(contextPath)) { return this; @@ -214,6 +216,7 @@ public class MockServletContext implements ServletContext { this.majorVersion = majorVersion; } + @Override public int getMajorVersion() { return this.majorVersion; } @@ -222,6 +225,7 @@ public class MockServletContext implements ServletContext { this.minorVersion = minorVersion; } + @Override public int getMinorVersion() { return this.minorVersion; } @@ -242,10 +246,12 @@ public class MockServletContext implements ServletContext { return this.effectiveMinorVersion; } + @Override public String getMimeType(String filePath) { return MimeTypeResolver.getMimeType(filePath); } + @Override public Set getResourcePaths(String path) { String actualPath = (path.endsWith("/") ? path : path + "/"); Resource resource = this.resourceLoader.getResource(getResourceLocation(actualPath)); @@ -271,6 +277,7 @@ public class MockServletContext implements ServletContext { } } + @Override public URL getResource(String path) throws MalformedURLException { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); if (!resource.exists()) { @@ -288,6 +295,7 @@ public class MockServletContext implements ServletContext { } } + @Override public InputStream getResourceAsStream(String path) { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); if (!resource.exists()) { @@ -302,6 +310,7 @@ public class MockServletContext implements ServletContext { } } + @Override public RequestDispatcher getRequestDispatcher(String path) { if (!path.startsWith("/")) { throw new IllegalArgumentException("RequestDispatcher path at ServletContext level must start with '/'"); @@ -309,6 +318,7 @@ public class MockServletContext implements ServletContext { return new MockRequestDispatcher(path); } + @Override public RequestDispatcher getNamedDispatcher(String path) { return this.namedRequestDispatchers.get(path); } @@ -366,30 +376,37 @@ public class MockServletContext implements ServletContext { registerNamedDispatcher(this.defaultServletName, new MockRequestDispatcher(this.defaultServletName)); } + @Override public Servlet getServlet(String name) { return null; } + @Override public Enumeration getServlets() { return Collections.enumeration(new HashSet()); } + @Override public Enumeration getServletNames() { return Collections.enumeration(new HashSet()); } + @Override public void log(String message) { logger.info(message); } + @Override public void log(Exception ex, String message) { logger.info(message, ex); } + @Override public void log(String message, Throwable ex) { logger.info(message, ex); } + @Override public String getRealPath(String path) { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); try { @@ -401,15 +418,18 @@ public class MockServletContext implements ServletContext { } } + @Override public String getServerInfo() { return "MockServletContext"; } + @Override public String getInitParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.initParameters.get(name); } + @Override public Enumeration getInitParameterNames() { return Collections.enumeration(this.initParameters.keySet()); } @@ -428,15 +448,18 @@ public class MockServletContext implements ServletContext { this.initParameters.put(name, value); } + @Override public Object getAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); return this.attributes.get(name); } + @Override public Enumeration getAttributeNames() { return new Vector(this.attributes.keySet()).elements(); } + @Override public void setAttribute(String name, Object value) { Assert.notNull(name, "Attribute name must not be null"); if (value != null) { @@ -447,6 +470,7 @@ public class MockServletContext implements ServletContext { } } + @Override public void removeAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); this.attributes.remove(name); @@ -456,6 +480,7 @@ public class MockServletContext implements ServletContext { this.servletContextName = servletContextName; } + @Override public String getServletContextName() { return this.servletContextName; } diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java index b3484a0a83a..1a98d4c6572 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java @@ -73,6 +73,7 @@ public class PassThroughFilterChain implements FilterChain { /** * Pass the call on to the Filter/Servlet. */ + @Override public void doFilter(ServletRequest request, ServletResponse response) throws ServletException, IOException { if (this.filter != null) { this.filter.doFilter(request, response, this.nextFilterChain); diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/orm/hibernate4/HibernateTransactionManagerTests.java b/spring-orm-hibernate4/src/test/java/org/springframework/orm/hibernate4/HibernateTransactionManagerTests.java index 65cf39acaf5..26bdd97e292 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/orm/hibernate4/HibernateTransactionManagerTests.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/orm/hibernate4/HibernateTransactionManagerTests.java @@ -128,6 +128,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sfProxy)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -186,6 +187,7 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); throw new RuntimeException("application exception"); @@ -239,6 +241,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); Session session = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession(); @@ -299,8 +302,10 @@ public class HibernateTransactionManagerTests extends TestCase { l.add("test"); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { Session session = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession(); session.flush(); @@ -348,8 +353,10 @@ public class HibernateTransactionManagerTests extends TestCase { final TransactionTemplate tt = new TransactionTemplate(tm); try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { throw new RuntimeException("application exception"); } @@ -400,8 +407,10 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { status.setRollbackOnly(); return null; @@ -471,12 +480,14 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { final SessionHolder holder = (SessionHolder) TransactionSynchronizationManager.getResource(sf); assertTrue("Has thread session", holder != null); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { Session session = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession(); assertTrue("Not enclosing session", session != holder.getSession()); @@ -538,6 +549,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { SessionHolder holder = (SessionHolder) TransactionSynchronizationManager.getResource(sf); assertTrue("Has thread session", holder != null); @@ -545,6 +557,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -596,6 +609,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sfProxy)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sfProxy)); assertTrue("Is not new transaction", !status.isNewTransaction()); @@ -668,6 +682,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sfProxy)); assertTrue("Is not new transaction", !status.isNewTransaction()); @@ -676,6 +691,7 @@ public class HibernateTransactionManagerTests extends TestCase { Session session = sfProxy.openSession(); assertSame(session1, session); tt2.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); @@ -752,6 +768,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -817,6 +834,7 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); return l; @@ -890,6 +908,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -970,12 +989,14 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); SessionHolder sessionHolder = (SessionHolder) TransactionSynchronizationManager.getResource(sf); assertEquals(tx1, sessionHolder.getTransaction()); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { status.setRollbackOnly(); Session sess = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession(); @@ -996,6 +1017,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Not marked rollback-only", !sessionHolder.isRollbackOnly()); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1066,9 +1088,11 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { status.setRollbackOnly(); Session sess = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession(); @@ -1086,6 +1110,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); Session sess = ((SessionHolder) TransactionSynchronizationManager.getResource(sf)).getSession(); @@ -1176,6 +1201,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1185,6 +1211,7 @@ public class HibernateTransactionManagerTests extends TestCase { } else { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1233,6 +1260,7 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1275,6 +1303,7 @@ public class HibernateTransactionManagerTests extends TestCase { TransactionSynchronizationManager.bindResource(sf, new SessionHolder(session)); try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1327,6 +1356,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1370,6 +1400,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -1385,6 +1416,7 @@ public class HibernateTransactionManagerTests extends TestCase { txControl.verify(); } + @Override protected void tearDown() { assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); diff --git a/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-orm/src/test/java/org/springframework/beans/TestBean.java b/spring-orm/src/test/java/org/springframework/beans/TestBean.java index 7842bbfeacf..7a27cf0894e 100644 --- a/spring-orm/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-orm/src/test/java/org/springframework/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see org.springframework.beans.ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java index b149254bfd7..cd4a7ef25f4 100644 --- a/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java +++ b/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java @@ -44,6 +44,7 @@ public class SimpleMapScope implements Scope, Serializable { } + @Override public Object get(String name, ObjectFactory objectFactory) { synchronized (this.map) { Object scopedObject = this.map.get(name); @@ -55,16 +56,19 @@ public class SimpleMapScope implements Scope, Serializable { } } + @Override public Object remove(String name) { synchronized (this.map) { return this.map.remove(name); } } + @Override public void registerDestructionCallback(String name, Runnable callback) { this.callbacks.add(callback); } + @Override public Object resolveContextualObject(String key) { return null; } @@ -76,6 +80,7 @@ public class SimpleMapScope implements Scope, Serializable { } } + @Override public String getConversationId() { return null; } diff --git a/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java index 10ae6d42837..9b3d10470da 100644 --- a/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java +++ b/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java @@ -70,6 +70,7 @@ public class ExpectedLookupTemplate extends JndiTemplate { * return the object provided in the constructor. If the name is * unexpected, a respective NamingException gets thrown. */ + @Override public Object lookup(String name) throws NamingException { Object object = this.jndiObjects.get(name); if (object == null) { diff --git a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java index c71d6e86810..5ab0d313777 100644 --- a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java +++ b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java @@ -91,6 +91,7 @@ public class SimpleNamingContext implements Context { // Actual implementations of Context methods follow + @Override public NamingEnumeration list(String root) throws NamingException { if (logger.isDebugEnabled()) { logger.debug("Listing name/class pairs under [" + root + "]"); @@ -98,6 +99,7 @@ public class SimpleNamingContext implements Context { return new NameClassPairEnumeration(this, root); } + @Override public NamingEnumeration listBindings(String root) throws NamingException { if (logger.isDebugEnabled()) { logger.debug("Listing bindings under [" + root + "]"); @@ -111,6 +113,7 @@ public class SimpleNamingContext implements Context { * Will be used by any standard InitialContext JNDI lookups. * @throws javax.naming.NameNotFoundException if the object could not be found */ + @Override public Object lookup(String lookupName) throws NameNotFoundException { String name = this.root + lookupName; if (logger.isDebugEnabled()) { @@ -136,6 +139,7 @@ public class SimpleNamingContext implements Context { return found; } + @Override public Object lookupLink(String name) throws NameNotFoundException { return lookup(name); } @@ -147,6 +151,7 @@ public class SimpleNamingContext implements Context { * Use SimpleNamingContextBuilder to set up JNDI bindings then. * @see org.springframework.mock.jndi.SimpleNamingContextBuilder#bind */ + @Override public void bind(String name, Object obj) { if (logger.isInfoEnabled()) { logger.info("Static JNDI binding: [" + this.root + name + "] = [" + obj + "]"); @@ -154,6 +159,7 @@ public class SimpleNamingContext implements Context { this.boundObjects.put(this.root + name, obj); } + @Override public void unbind(String name) { if (logger.isInfoEnabled()) { logger.info("Static JNDI remove: [" + this.root + name + "]"); @@ -161,16 +167,19 @@ public class SimpleNamingContext implements Context { this.boundObjects.remove(this.root + name); } + @Override public void rebind(String name, Object obj) { bind(name, obj); } + @Override public void rename(String oldName, String newName) throws NameNotFoundException { Object obj = lookup(oldName); unbind(oldName); bind(newName, obj); } + @Override public Context createSubcontext(String name) { String subcontextName = this.root + name; if (!subcontextName.endsWith("/")) { @@ -181,84 +190,104 @@ public class SimpleNamingContext implements Context { return subcontext; } + @Override public void destroySubcontext(String name) { unbind(name); } + @Override public String composeName(String name, String prefix) { return prefix + name; } + @Override public Hashtable getEnvironment() { return this.environment; } + @Override public Object addToEnvironment(String propName, Object propVal) { return this.environment.put(propName, propVal); } + @Override public Object removeFromEnvironment(String propName) { return this.environment.remove(propName); } + @Override public void close() { } // Unsupported methods follow: no support for javax.naming.Name + @Override public NamingEnumeration list(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public NamingEnumeration listBindings(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Object lookup(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Object lookupLink(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void bind(Name name, Object obj) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void unbind(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void rebind(Name name, Object obj) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void rename(Name oldName, Name newName) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Context createSubcontext(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void destroySubcontext(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public String getNameInNamespace() throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public NameParser getNameParser(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public NameParser getNameParser(String name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Name composeName(Name name, Name prefix) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } @@ -298,22 +327,27 @@ public class SimpleNamingContext implements Context { protected abstract T createObject(String strippedName, Object obj); + @Override public boolean hasMore() { return this.iterator.hasNext(); } + @Override public T next() { return this.iterator.next(); } + @Override public boolean hasMoreElements() { return this.iterator.hasNext(); } + @Override public T nextElement() { return this.iterator.next(); } + @Override public void close() { } } @@ -325,6 +359,7 @@ public class SimpleNamingContext implements Context { super(context, root); } + @Override protected NameClassPair createObject(String strippedName, Object obj) { return new NameClassPair(strippedName, obj.getClass().getName()); } @@ -337,6 +372,7 @@ public class SimpleNamingContext implements Context { super(context, root); } + @Override protected Binding createObject(String strippedName, Object obj) { return new Binding(strippedName, obj); } diff --git a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java index f21936897b3..32908a306aa 100644 --- a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java +++ b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java @@ -192,6 +192,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder * creating a new SimpleNamingContext instance. * @see SimpleNamingContext */ + @Override public InitialContextFactory createInitialContextFactory(Hashtable environment) { if (activated == null && environment != null) { Object icf = environment.get(Context.INITIAL_CONTEXT_FACTORY); @@ -225,6 +226,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder // Default case... return new InitialContextFactory() { + @Override @SuppressWarnings("unchecked") public Context getInitialContext(Hashtable environment) { return new SimpleNamingContext("", boundObjects, (Hashtable) environment); diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java index e957562d6dd..db0b7901baf 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java @@ -528,6 +528,7 @@ public class HibernateInterceptorTests extends TestCase { sessionControl.verify(); } + @Override protected void tearDown() { assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); @@ -542,6 +543,7 @@ public class HibernateInterceptorTests extends TestCase { this.sessionFactory = sessionFactory; } + @Override public Object proceed() throws Throwable { if (!TransactionSynchronizationManager.hasResource(this.sessionFactory)) { throw new IllegalStateException("Session not bound"); @@ -561,10 +563,12 @@ public class HibernateInterceptorTests extends TestCase { return null; } + @Override public Method getMethod() { return null; } + @Override public AccessibleObject getStaticPart() { return null; } @@ -573,6 +577,7 @@ public class HibernateInterceptorTests extends TestCase { return null; } + @Override public Object[] getArguments() { return null; } @@ -584,6 +589,7 @@ public class HibernateInterceptorTests extends TestCase { return 0; } + @Override public Object getThis() { return null; } diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java index 5b84f9a6f00..7d6a94844bc 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java @@ -136,6 +136,7 @@ public class HibernateJtaTransactionTests { Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { assertTrue("JTA synchronizations active", @@ -145,6 +146,7 @@ public class HibernateJtaTransactionTests { ht.setExposeNativeSession(true); ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -154,6 +156,7 @@ public class HibernateJtaTransactionTests { ht = new HibernateTemplate(sf); List htl = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); return sess.createQuery("some query string").list(); @@ -246,6 +249,7 @@ public class HibernateJtaTransactionTests { Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { assertTrue("JTA synchronizations active", @@ -255,6 +259,7 @@ public class HibernateJtaTransactionTests { ht.setExposeNativeSession(true); List htl = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -265,6 +270,7 @@ public class HibernateJtaTransactionTests { ht.setExposeNativeSession(true); htl = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -338,6 +344,7 @@ public class HibernateJtaTransactionTests { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { assertTrue("JTA synchronizations active", @@ -347,6 +354,7 @@ public class HibernateJtaTransactionTests { ht.setExposeNativeSession(true); List htl = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -357,6 +365,7 @@ public class HibernateJtaTransactionTests { ht.setExposeNativeSession(true); htl = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -442,6 +451,7 @@ public class HibernateJtaTransactionTests { Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { assertTrue("JTA synchronizations active", @@ -449,6 +459,7 @@ public class HibernateJtaTransactionTests { HibernateTemplate ht = new HibernateTemplate(sf); List htl = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { return l; } @@ -578,6 +589,7 @@ public class HibernateJtaTransactionTests { Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { assertTrue("JTA synchronizations active", @@ -589,6 +601,7 @@ public class HibernateJtaTransactionTests { for (int i = 0; i < 5; i++) { htl = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -679,9 +692,11 @@ public class HibernateJtaTransactionTests { tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { status.setRollbackOnly(); try { @@ -693,6 +708,7 @@ public class HibernateJtaTransactionTests { for (int i = 0; i < 5; i++) { ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); @@ -829,6 +845,7 @@ public class HibernateJtaTransactionTests { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { org.hibernate.Session outerSession = SessionFactoryUtils.getSession(sf, false); assertSame(session1, outerSession); @@ -837,6 +854,7 @@ public class HibernateJtaTransactionTests { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { org.hibernate.Session innerSession = SessionFactoryUtils.getSession(sf, false); assertSame(session2, innerSession); @@ -844,6 +862,7 @@ public class HibernateJtaTransactionTests { ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session innerSession) { if (rollback) { throw new HibernateException(""); @@ -949,6 +968,7 @@ public class HibernateJtaTransactionTests { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { org.hibernate.Session outerSession = SessionFactoryUtils.getSession(sf, false); assertSame(session1, outerSession); @@ -956,6 +976,7 @@ public class HibernateJtaTransactionTests { assertTrue("Has thread session", holder != null); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return null; } @@ -1074,6 +1095,7 @@ public class HibernateJtaTransactionTests { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { org.hibernate.Session outerSession = SessionFactoryUtils.getSession(sf, false); assertSame(session1, outerSession); @@ -1082,6 +1104,7 @@ public class HibernateJtaTransactionTests { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { org.hibernate.Session innerSession = SessionFactoryUtils.getSession(sf, false); assertSame(session2, innerSession); @@ -1089,6 +1112,7 @@ public class HibernateJtaTransactionTests { ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session innerSession) { if (rollback) { throw new HibernateException(""); @@ -1172,6 +1196,7 @@ public class HibernateJtaTransactionTests { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); assertTrue("Is not new transaction", !status.isNewTransaction()); @@ -1181,6 +1206,7 @@ public class HibernateJtaTransactionTests { ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { return null; } @@ -1239,6 +1265,7 @@ public class HibernateJtaTransactionTests { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); assertTrue("Is not new transaction", !status.isNewTransaction()); @@ -1248,6 +1275,7 @@ public class HibernateJtaTransactionTests { ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { return null; } @@ -1255,11 +1283,13 @@ public class HibernateJtaTransactionTests { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); tt2.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { HibernateTemplate ht = new HibernateTemplate(sf); ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); // assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); @@ -1315,6 +1345,7 @@ public class HibernateJtaTransactionTests { for (int i = 0; i < 5; i++) { ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -1368,6 +1399,7 @@ public class HibernateJtaTransactionTests { for (int i = 0; i < 5; i++) { ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -1424,6 +1456,7 @@ public class HibernateJtaTransactionTests { for (int i = 0; i < 5; i++) { ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -1436,6 +1469,7 @@ public class HibernateJtaTransactionTests { assertTrue("JTA synchronization registered", synchronization != null); Thread thread = new Thread() { + @Override public void run() { synchronization.afterCompletion(Status.STATUS_ROLLEDBACK); } @@ -1451,11 +1485,13 @@ public class HibernateJtaTransactionTests { tt.setReadOnly(true); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive()); for (int i = 0; i < 5; i++) { ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -1513,6 +1549,7 @@ public class HibernateJtaTransactionTests { for (int i = 0; i < 5; i++) { ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -1587,6 +1624,7 @@ public class HibernateJtaTransactionTests { ht.setExposeNativeSession(true); ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session1, sess); @@ -1595,6 +1633,7 @@ public class HibernateJtaTransactionTests { }); ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session2, sess); @@ -1662,6 +1701,7 @@ public class HibernateJtaTransactionTests { for (int i = 0; i < 5; i++) { ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -1725,6 +1765,7 @@ public class HibernateJtaTransactionTests { for (int i = 0; i < 2; i++) { ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -1736,10 +1777,12 @@ public class HibernateJtaTransactionTests { TransactionTemplate tt = new TransactionTemplate(new JtaTransactionManager(ut)); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { for (int i = 2; i < 5; i++) { ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -1813,6 +1856,7 @@ public class HibernateJtaTransactionTests { for (int i = 0; i < 5; i++) { ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -1900,6 +1944,7 @@ public class HibernateJtaTransactionTests { for (int i = 0; i < 5; i++) { ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertEquals(session, sess); @@ -1917,6 +1962,7 @@ public class HibernateJtaTransactionTests { // coordinator. Thread synch = new Thread() { + @Override public void run() { synchronization.beforeCompletion(); synchronization.afterCompletion(Status.STATUS_COMMITTED); diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java index 9dcb05b7f66..37539cc0a58 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java @@ -75,6 +75,7 @@ public class HibernateTemplateTests extends TestCase { private MockControl sessionControl; private Session session; + @Override protected void setUp() { sfControl = MockControl.createControl(SessionFactory.class); sf = (SessionFactory) sfControl.getMock(); @@ -100,6 +101,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -124,6 +126,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -150,6 +153,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -178,6 +182,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -195,6 +200,7 @@ public class HibernateTemplateTests extends TestCase { ht.setAllowCreate(false); try { ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return null; } @@ -217,6 +223,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -244,6 +251,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -275,6 +283,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -310,6 +319,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -407,6 +417,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -448,6 +459,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -479,6 +491,7 @@ public class HibernateTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -523,6 +536,7 @@ public class HibernateTemplateTests extends TestCase { HibernateTemplate ht = new HibernateTemplate(sf); ht.setCacheQueries(true); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) throws HibernateException { assertNotSame(session, sess); assertTrue(Proxy.isProxyClass(sess.getClass())); @@ -584,6 +598,7 @@ public class HibernateTemplateTests extends TestCase { ht.setCacheQueries(true); ht.setQueryCacheRegion("myRegion"); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) throws HibernateException { assertNotSame(session, sess); assertTrue(Proxy.isProxyClass(sess.getClass())); @@ -634,6 +649,7 @@ public class HibernateTemplateTests extends TestCase { ht.setCacheQueries(true); ht.setQueryCacheRegion("myRegion"); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) throws HibernateException { assertSame(session, sess); sess.createQuery("some query"); @@ -692,6 +708,7 @@ public class HibernateTemplateTests extends TestCase { ht.setFetchSize(10); ht.setMaxResults(20); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) throws HibernateException { sess.createQuery("some query"); sess.getNamedQuery("some query name"); @@ -2273,6 +2290,7 @@ public class HibernateTemplateTests extends TestCase { final JDBCConnectionException jcex = new JDBCConnectionException("mymsg", sqlEx); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw jcex; } @@ -2288,6 +2306,7 @@ public class HibernateTemplateTests extends TestCase { final SQLGrammarException sgex = new SQLGrammarException("mymsg", sqlEx); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw sgex; } @@ -2303,6 +2322,7 @@ public class HibernateTemplateTests extends TestCase { final LockAcquisitionException laex = new LockAcquisitionException("mymsg", sqlEx); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw laex; } @@ -2318,6 +2338,7 @@ public class HibernateTemplateTests extends TestCase { final ConstraintViolationException cvex = new ConstraintViolationException("mymsg", sqlEx, "myconstraint"); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw cvex; } @@ -2333,6 +2354,7 @@ public class HibernateTemplateTests extends TestCase { final DataException dex = new DataException("mymsg", sqlEx); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw dex; } @@ -2348,6 +2370,7 @@ public class HibernateTemplateTests extends TestCase { final JDBCException jdex = new JDBCException("mymsg", sqlEx); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw jdex; } @@ -2363,6 +2386,7 @@ public class HibernateTemplateTests extends TestCase { final PropertyValueException pvex = new PropertyValueException("mymsg", "myentity", "myproperty"); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw pvex; } @@ -2377,6 +2401,7 @@ public class HibernateTemplateTests extends TestCase { try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw new PersistentObjectException(""); } @@ -2389,6 +2414,7 @@ public class HibernateTemplateTests extends TestCase { try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw new TransientObjectException(""); } @@ -2402,6 +2428,7 @@ public class HibernateTemplateTests extends TestCase { final ObjectDeletedException odex = new ObjectDeletedException("msg", "id", TestBean.class.getName()); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw odex; } @@ -2417,6 +2444,7 @@ public class HibernateTemplateTests extends TestCase { qex.setQueryString("query"); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw qex; } @@ -2432,6 +2460,7 @@ public class HibernateTemplateTests extends TestCase { final UnresolvableObjectException uoex = new UnresolvableObjectException("id", TestBean.class.getName()); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw uoex; } @@ -2448,6 +2477,7 @@ public class HibernateTemplateTests extends TestCase { final ObjectNotFoundException onfe = new ObjectNotFoundException("id", TestBean.class.getName()); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw onfe; } @@ -2464,6 +2494,7 @@ public class HibernateTemplateTests extends TestCase { final WrongClassException wcex = new WrongClassException("msg", "id", TestBean.class.getName()); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw wcex; } @@ -2480,6 +2511,7 @@ public class HibernateTemplateTests extends TestCase { final NonUniqueResultException nuex = new NonUniqueResultException(2); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw nuex; } @@ -2495,6 +2527,7 @@ public class HibernateTemplateTests extends TestCase { final StaleObjectStateException sosex = new StaleObjectStateException(TestBean.class.getName(), "id"); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw sosex; } @@ -2511,6 +2544,7 @@ public class HibernateTemplateTests extends TestCase { final StaleStateException ssex = new StaleStateException("msg"); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw ssex; } @@ -2527,6 +2561,7 @@ public class HibernateTemplateTests extends TestCase { final HibernateException hex = new HibernateException("msg"); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw hex; } @@ -2545,6 +2580,7 @@ public class HibernateTemplateTests extends TestCase { final GenericJDBCException gjex = new GenericJDBCException("mymsg", sqlEx); try { createTemplate().execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { throw gjex; } @@ -2572,6 +2608,7 @@ public class HibernateTemplateTests extends TestCase { return new HibernateTemplate(sf); } + @Override protected void tearDown() { try { sfControl.verify(); diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java index 4e7e29d6d70..3eff114c3f3 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java @@ -117,6 +117,7 @@ public class HibernateTransactionManagerTests extends TestCase { queryControl.replay(); LocalSessionFactoryBean lsfb = new LocalSessionFactoryBean() { + @Override protected SessionFactory newSessionFactory(Configuration config) throws HibernateException { return sf; } @@ -136,6 +137,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sfProxy)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -196,10 +198,12 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); HibernateTemplate ht = new HibernateTemplate(sf); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { throw new RuntimeException("application exception"); } @@ -258,11 +262,13 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); HibernateTemplate ht = new HibernateTemplate(sf); ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { return null; } @@ -339,6 +345,7 @@ public class HibernateTransactionManagerTests extends TestCase { queryControl.replay(); LocalSessionFactoryBean lsfb = new LocalSessionFactoryBean() { + @Override protected SessionFactory newSessionFactory(Configuration config) throws HibernateException { return sf; } @@ -359,6 +366,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sfProxy)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -416,6 +424,7 @@ public class HibernateTransactionManagerTests extends TestCase { txControl.replay(); LocalSessionFactoryBean lsfb = new LocalSessionFactoryBean() { + @Override protected SessionFactory newSessionFactory(Configuration config) throws HibernateException { return sf; } @@ -429,12 +438,15 @@ public class HibernateTransactionManagerTests extends TestCase { l.add("test"); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { HibernateTemplate ht = new HibernateTemplate(sfProxy); ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { return l; } @@ -486,12 +498,15 @@ public class HibernateTransactionManagerTests extends TestCase { final TransactionTemplate tt = new TransactionTemplate(tm); try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { HibernateTemplate ht = new HibernateTemplate(sf); ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { throw new RuntimeException("application exception"); } @@ -548,11 +563,14 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { HibernateTemplate ht = new HibernateTemplate(sf); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { return l; } @@ -631,16 +649,19 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { final SessionHolder holder = (SessionHolder) TransactionSynchronizationManager.getResource(sf); assertTrue("Has thread session", holder != null); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { HibernateTemplate ht = new HibernateTemplate(sf); ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { assertTrue("Not enclosing session", session != holder.getSession()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -710,6 +731,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { SessionHolder holder = (SessionHolder) TransactionSynchronizationManager.getResource(sf); assertTrue("Has thread session", holder != null); @@ -717,6 +739,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -724,6 +747,7 @@ public class HibernateTransactionManagerTests extends TestCase { HibernateTemplate ht = new HibernateTemplate(sf); ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { return null; } @@ -770,6 +794,7 @@ public class HibernateTransactionManagerTests extends TestCase { sessionControl.replay(); LocalSessionFactoryBean lsfb = new LocalSessionFactoryBean() { + @Override protected SessionFactory newSessionFactory(Configuration config) throws HibernateException { return sf; } @@ -783,6 +808,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sfProxy)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sfProxy)); assertTrue("Is not new transaction", !status.isNewTransaction()); @@ -791,6 +817,7 @@ public class HibernateTransactionManagerTests extends TestCase { HibernateTemplate ht = new HibernateTemplate(sfProxy); ht.setFlushMode(HibernateTemplate.FLUSH_EAGER); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { return null; } @@ -854,6 +881,7 @@ public class HibernateTransactionManagerTests extends TestCase { txControl.replay(); LocalSessionFactoryBean lsfb = new LocalSessionFactoryBean() { + @Override protected SessionFactory newSessionFactory(Configuration config) throws HibernateException { return sf; } @@ -873,12 +901,14 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sfProxy)); assertTrue("Is not new transaction", !status.isNewTransaction()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertFalse(TransactionSynchronizationManager.isActualTransactionActive()); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { assertSame(session1, session); return null; @@ -886,8 +916,10 @@ public class HibernateTransactionManagerTests extends TestCase { }); assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sfProxy)); tt2.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); @@ -955,10 +987,12 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); HibernateTemplate ht = new HibernateTemplate(sf); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -1036,10 +1070,12 @@ public class HibernateTransactionManagerTests extends TestCase { for (int i = 0; i < 2; i++) { tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); HibernateTemplate ht = new HibernateTemplate(sf); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return null; } @@ -1113,6 +1149,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -1195,10 +1232,12 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); HibernateTemplate ht = new HibernateTemplate(sf); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session session) throws HibernateException { return l; } @@ -1279,6 +1318,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1287,6 +1327,7 @@ public class HibernateTransactionManagerTests extends TestCase { HibernateTemplate ht = new HibernateTemplate(sf); ht.setExposeNativeSession(true); return ht.executeFind(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) throws HibernateException { assertEquals(session, sess); return l; @@ -1370,17 +1411,20 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); SessionHolder sessionHolder = (SessionHolder) TransactionSynchronizationManager.getResource(sf); assertEquals(tx1, sessionHolder.getTransaction()); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { status.setRollbackOnly(); HibernateTemplate ht = new HibernateTemplate(sf); ht.setExposeNativeSession(true); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) throws HibernateException { assertEquals(session, sess); return null; @@ -1402,6 +1446,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Not marked rollback-only", !sessionHolder.isRollbackOnly()); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1410,6 +1455,7 @@ public class HibernateTransactionManagerTests extends TestCase { HibernateTemplate ht = new HibernateTemplate(sf); ht.setExposeNativeSession(true); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) throws HibernateException { assertEquals(session, sess); return null; @@ -1485,15 +1531,18 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { status.setRollbackOnly(); HibernateTemplate ht = new HibernateTemplate(sf); ht.setAllowCreate(false); ht.setExposeNativeSession(true); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) throws HibernateException { assertEquals(session, sess); return null; @@ -1512,12 +1561,14 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("Hasn't thread session", !TransactionSynchronizationManager.hasResource(sf)); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); HibernateTemplate ht = new HibernateTemplate(sf); ht.setAllowCreate(false); ht.setExposeNativeSession(true); ht.execute(new HibernateCallback() { + @Override public Object doInHibernate(org.hibernate.Session sess) throws HibernateException { assertEquals(session, sess); return null; @@ -1612,6 +1663,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1621,6 +1673,7 @@ public class HibernateTransactionManagerTests extends TestCase { } else { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1670,6 +1723,7 @@ public class HibernateTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1713,6 +1767,7 @@ public class HibernateTransactionManagerTests extends TestCase { TransactionSynchronizationManager.bindResource(sf, new SessionHolder(session)); try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1766,6 +1821,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1809,6 +1865,7 @@ public class HibernateTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(sf)); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -1824,6 +1881,7 @@ public class HibernateTransactionManagerTests extends TestCase { txControl.verify(); } + @Override protected void tearDown() { assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java index 95fb2af9309..0ba20000bf8 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java @@ -67,8 +67,10 @@ public class LocalSessionFactoryBeanTests extends TestCase { final DriverManagerDataSource ds = new DriverManagerDataSource(); final List invocations = new ArrayList(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public Configuration addInputStream(InputStream is) { try { is.close(); @@ -80,6 +82,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { } }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { assertEquals(LocalDataSourceConnectionProvider.class.getName(), config.getProperty(Environment.CONNECTION_PROVIDER)); @@ -99,8 +102,10 @@ public class LocalSessionFactoryBeanTests extends TestCase { final RegionFactory regionFactory = new NoCachingRegionFactory(null); final List invocations = new ArrayList(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public Configuration addInputStream(InputStream is) { try { is.close(); @@ -112,6 +117,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { } }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { assertEquals(LocalRegionFactoryProxy.class.getName(), config.getProperty(Environment.CACHE_REGION_FACTORY)); @@ -131,8 +137,10 @@ public class LocalSessionFactoryBeanTests extends TestCase { final CacheProvider cacheProvider = new NoCacheProvider(); final List invocations = new ArrayList(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public Configuration addInputStream(InputStream is) { try { is.close(); @@ -145,6 +153,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { assertEquals(LocalCacheProviderProxy.class.getName(), config.getProperty(Environment.CACHE_PROVIDER)); @@ -164,8 +173,10 @@ public class LocalSessionFactoryBeanTests extends TestCase { final DriverManagerDataSource ds = new DriverManagerDataSource(); final List invocations = new ArrayList(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public Configuration addInputStream(InputStream is) { try { is.close(); @@ -178,6 +189,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { assertEquals(TransactionAwareDataSourceConnectionProvider.class.getName(), config.getProperty(Environment.CONNECTION_PROVIDER)); @@ -200,8 +212,10 @@ public class LocalSessionFactoryBeanTests extends TestCase { final TransactionManager tm = (TransactionManager) tmControl.getMock(); final List invocations = new ArrayList(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public Configuration addInputStream(InputStream is) { try { is.close(); @@ -214,6 +228,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { assertEquals(LocalJtaDataSourceConnectionProvider.class.getName(), config.getProperty(Environment.CONNECTION_PROVIDER)); @@ -242,8 +257,10 @@ public class LocalSessionFactoryBeanTests extends TestCase { final DriverManagerDataSource ds = new DriverManagerDataSource(); final Set invocations = new HashSet(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public Configuration addJar(File file) { invocations.add("addResource " + file.getPath()); return this; @@ -251,6 +268,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { assertEquals(LocalDataSourceConnectionProvider.class.getName(), config.getProperty(Environment.CONNECTION_PROVIDER)); @@ -274,8 +292,10 @@ public class LocalSessionFactoryBeanTests extends TestCase { final DriverManagerDataSource ds = new DriverManagerDataSource(); final Set invocations = new HashSet(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public Configuration addInputStream(InputStream is) { try { is.close(); @@ -288,6 +308,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { assertEquals(LocalDataSourceConnectionProvider.class.getName(), config.getProperty(Environment.CONNECTION_PROVIDER)); @@ -313,6 +334,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { public void testLocalSessionFactoryBeanWithValidProperties() throws Exception { final Set invocations = new HashSet(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected SessionFactory newSessionFactory(Configuration config) { assertEquals(UserSuppliedConnectionProvider.class.getName(), config.getProperty(Environment.CONNECTION_PROVIDER)); @@ -362,6 +384,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { factoryControl.setVoidCallable(1); factoryControl.replay(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected SessionFactory newSessionFactory(Configuration config) { return sessionFactory; } @@ -378,8 +401,10 @@ public class LocalSessionFactoryBeanTests extends TestCase { @SuppressWarnings("serial") public void testLocalSessionFactoryBeanWithEntityInterceptor() throws Exception { LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public Configuration setInterceptor(Interceptor interceptor) { throw new IllegalArgumentException(interceptor.toString()); } @@ -405,8 +430,10 @@ public class LocalSessionFactoryBeanTests extends TestCase { @SuppressWarnings("serial") public void testLocalSessionFactoryBeanWithNamingStrategy() throws Exception { LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public Configuration setNamingStrategy(NamingStrategy namingStrategy) { throw new IllegalArgumentException(namingStrategy.toString()); } @@ -431,18 +458,22 @@ public class LocalSessionFactoryBeanTests extends TestCase { final Properties registeredClassCache = new Properties(); final Properties registeredCollectionCache = new Properties(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public Configuration setCacheConcurrencyStrategy(String clazz, String concurrencyStrategy) { registeredClassCache.setProperty(clazz, concurrencyStrategy); return this; } + @Override public Configuration setCollectionCacheConcurrencyStrategy(String collectionRole, String concurrencyStrategy) { registeredCollectionCache.setProperty(collectionRole, concurrencyStrategy); return this; } }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { return null; } @@ -467,17 +498,21 @@ public class LocalSessionFactoryBeanTests extends TestCase { final Properties registeredClassCache = new Properties(); final Properties registeredCollectionCache = new Properties(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { // changed from return type 'void' to 'Configuration' in Hibernate 3.6 + @Override public void setCacheConcurrencyStrategy(String clazz, String concurrencyStrategy, String regionName) { registeredClassCache.setProperty(clazz, concurrencyStrategy + "," + regionName); } + @Override public void setCollectionCacheConcurrencyStrategy(String collectionRole, String concurrencyStrategy, String regionName) { registeredCollectionCache.setProperty(collectionRole, concurrencyStrategy + "," + regionName); } }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { return null; } @@ -501,13 +536,16 @@ public class LocalSessionFactoryBeanTests extends TestCase { public void testLocalSessionFactoryBeanWithEventListeners() throws Exception { final Map registeredListeners = new HashMap(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public void setListener(String type, Object listener) { registeredListeners.put(type, listener); } }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { return null; } @@ -526,14 +564,17 @@ public class LocalSessionFactoryBeanTests extends TestCase { public void testLocalSessionFactoryBeanWithEventListenerSet() throws Exception { final Map registeredListeners = new HashMap(); LocalSessionFactoryBean sfb = new LocalSessionFactoryBean() { + @Override protected Configuration newConfiguration() { return new Configuration() { + @Override public void setListeners(String type, Object[] listeners) { assertTrue(listeners instanceof MergeEventListener[]); registeredListeners.put(type, new HashSet(Arrays.asList(listeners))); } }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { return null; } @@ -594,14 +635,17 @@ public class LocalSessionFactoryBeanTests extends TestCase { public List registeredFilterDefinitions = new LinkedList(); + @Override protected Configuration newConfiguration() throws HibernateException { return new Configuration() { + @Override public void addFilterDefinition(FilterDefinition definition) { registeredFilterDefinitions.add(definition); } }; } + @Override protected SessionFactory newSessionFactory(Configuration config) { return null; } @@ -612,6 +656,7 @@ public class LocalSessionFactoryBeanTests extends TestCase { public Mappings mappings; + @Override protected SessionFactory newSessionFactory(Configuration config) { this.mappings = config.createMappings(); return null; @@ -622,9 +667,11 @@ public class LocalSessionFactoryBeanTests extends TestCase { @SuppressWarnings("serial") public static class DummyMergeEventListener implements MergeEventListener { + @Override public void onMerge(MergeEvent event) throws HibernateException { } + @Override public void onMerge(MergeEvent event, Map copiedAlready) throws HibernateException { } } diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java index b0d96c7d328..50b8d0631eb 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java @@ -37,6 +37,7 @@ public class HibernateDaoSupportTests extends TestCase { sfControl.replay(); final List test = new ArrayList(); HibernateDaoSupport dao = new HibernateDaoSupport() { + @Override protected void initDao() { test.add("test"); } @@ -53,6 +54,7 @@ public class HibernateDaoSupportTests extends TestCase { HibernateTemplate template = new HibernateTemplate(); final List test = new ArrayList(); HibernateDaoSupport dao = new HibernateDaoSupport() { + @Override protected void initDao() { test.add("test"); } diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java index 3be8ba5f858..dc90981e931 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java @@ -60,6 +60,7 @@ public class LobTypeTests extends TestCase { private MockControl lobCreatorControl = MockControl.createControl(LobCreator.class); private LobCreator lobCreator = (LobCreator) lobCreatorControl.getMock(); + @Override protected void setUp() throws SQLException { lobHandler.getLobCreator(); lobHandlerControl.setReturnValue(lobCreator); @@ -613,6 +614,7 @@ public class LobTypeTests extends TestCase { } } + @Override protected void tearDown() { try { rsControl.verify(); diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java index e0273f10742..41058bb7c4a 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/OpenSessionInViewTests.java @@ -182,6 +182,7 @@ public class OpenSessionInViewTests { asyncManager.setAsyncWebRequest(asyncWebRequest); asyncManager.startCallableProcessing(new Callable() { + @Override public String call() throws Exception { return "anything"; } @@ -422,6 +423,7 @@ public class OpenSessionInViewTests { filter2.init(filterConfig2); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) { assertTrue(TransactionSynchronizationManager.hasResource(sf)); servletRequest.setAttribute("invoked", Boolean.TRUE); @@ -429,6 +431,7 @@ public class OpenSessionInViewTests { }; final FilterChain filterChain2 = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) throws IOException, ServletException { assertTrue(TransactionSynchronizationManager.hasResource(sf2)); @@ -480,6 +483,7 @@ public class OpenSessionInViewTests { filter.init(filterConfig); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) { assertTrue(TransactionSynchronizationManager.hasResource(sf)); count.incrementAndGet(); @@ -498,6 +502,7 @@ public class OpenSessionInViewTests { asyncManager.setTaskExecutor(new SyncTaskExecutor()); asyncManager.setAsyncWebRequest(asyncWebRequest); asyncManager.startCallableProcessing(new Callable() { + @Override public String call() throws Exception { return "anything"; } @@ -568,6 +573,7 @@ public class OpenSessionInViewTests { filter.init(filterConfig); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) { assertTrue(TransactionSynchronizationManager.hasResource(sf)); servletRequest.setAttribute("invoked", Boolean.TRUE); @@ -639,6 +645,7 @@ public class OpenSessionInViewTests { filter2.init(filterConfig2); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) { HibernateTransactionManager tm = new HibernateTransactionManager(sf); TransactionStatus ts = tm.getTransaction( @@ -658,6 +665,7 @@ public class OpenSessionInViewTests { }; final FilterChain filterChain2 = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) throws IOException, ServletException { @@ -738,6 +746,7 @@ public class OpenSessionInViewTests { filter2.init(filterConfig2); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) { HibernateTransactionManager tm = new HibernateTransactionManager(sf); TransactionStatus ts = tm.getTransaction( @@ -760,6 +769,7 @@ public class OpenSessionInViewTests { }; FilterChain filterChain2 = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) throws IOException, ServletException { filter.doFilter(servletRequest, servletResponse, filterChain); diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java index c884a39fa4b..c6931097ce5 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java @@ -31,9 +31,11 @@ public class ScopedBeanInterceptorTests extends TestCase { final Object realObject = new Object(); ScopedObject scoped = new ScopedObject() { + @Override public Object getTargetObject() { return realObject; } + @Override public void removeFromScope() { // do nothing } @@ -53,9 +55,11 @@ public class ScopedBeanInterceptorTests extends TestCase { final Object proxy = proxyFactory.getProxy(); ScopedObject scoped = new ScopedObject() { + @Override public Object getTargetObject() { return proxy; } + @Override public void removeFromScope() { // do nothing } diff --git a/spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java b/spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java index c2f9c63ff93..4e4068ce507 100644 --- a/spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java @@ -88,6 +88,7 @@ public class SqlMapClientTests extends TestCase { template.setSqlMapClient(client); template.afterPropertiesSet(); Object result = template.execute(new SqlMapClientCallback() { + @Override public Object doInSqlMapClient(SqlMapExecutor executor) { assertTrue(executor == session); return "done"; @@ -124,6 +125,7 @@ public class SqlMapClientTests extends TestCase { template.setSqlMapClient(client); template.afterPropertiesSet(); Object result = template.execute(new SqlMapClientCallback() { + @Override public Object doInSqlMapClient(SqlMapExecutor executor) { assertTrue(executor == session); return "done"; @@ -420,6 +422,7 @@ public class SqlMapClientTests extends TestCase { public MockControl executorControl = MockControl.createControl(SqlMapExecutor.class); public SqlMapExecutor executor = (SqlMapExecutor) executorControl.getMock(); + @Override public Object execute(SqlMapClientCallback action) throws DataAccessException { try { return action.doInSqlMapClient(executor); @@ -433,6 +436,7 @@ public class SqlMapClientTests extends TestCase { private static class TestRowHandler implements RowHandler { + @Override public void handleRow(Object row) { } } diff --git a/spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java b/spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java index 6732ddcd548..c0b9717a22a 100644 --- a/spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java @@ -55,6 +55,7 @@ public class LobTypeHandlerTests extends TestCase { private MockControl lobCreatorControl = MockControl.createControl(LobCreator.class); private LobCreator lobCreator = (LobCreator) lobCreatorControl.getMock(); + @Override protected void setUp() throws SQLException { rs.findColumn("column"); rsControl.setReturnValue(1); @@ -170,9 +171,11 @@ public class LobTypeHandlerTests extends TestCase { lobHandlerControl.setReturnValue(new ByteArrayInputStream(baos.toByteArray()), 1); lobCreator.setBlobAsBytes(ps, 1, baos.toByteArray()); lobCreatorControl.setMatcher(new ArgumentsMatcher() { + @Override public boolean matches(Object[] o1, Object[] o2) { return Arrays.equals((byte[]) o1[2], (byte[]) o2[2]); } + @Override public String toString(Object[] objects) { return null; } @@ -224,6 +227,7 @@ public class LobTypeHandlerTests extends TestCase { } } + @Override protected void tearDown() { try { rsControl.verify(); diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java index a07a672b09f..b7a1a64631d 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java @@ -94,6 +94,7 @@ public class JdoInterceptorTests extends TestCase { this.persistenceManagerFactory = persistenceManagerFactory; } + @Override public Object proceed() throws Throwable { if (!TransactionSynchronizationManager.hasResource(this.persistenceManagerFactory)) { throw new IllegalStateException("PersistenceManager not bound"); @@ -101,6 +102,7 @@ public class JdoInterceptorTests extends TestCase { return null; } + @Override public Object[] getArguments() { return null; } @@ -117,10 +119,12 @@ public class JdoInterceptorTests extends TestCase { return null; } + @Override public Method getMethod() { return null; } + @Override public AccessibleObject getStaticPart() { return getMethod(); } @@ -136,6 +140,7 @@ public class JdoInterceptorTests extends TestCase { return 0; } + @Override public Object getThis() { return null; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java index 5ac6d360421..890fdb1f8c6 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java @@ -50,6 +50,7 @@ public class JdoTemplateTests extends TestCase { private MockControl pmControl; private PersistenceManager pm; + @Override protected void setUp() { pmfControl = MockControl.createControl(PersistenceManagerFactory.class); pmf = (PersistenceManagerFactory) pmfControl.getMock(); @@ -59,6 +60,7 @@ public class JdoTemplateTests extends TestCase { pmfControl.setReturnValue(null, 1); } + @Override protected void tearDown() { try { pmfControl.verify(); @@ -75,6 +77,7 @@ public class JdoTemplateTests extends TestCase { jt.setAllowCreate(false); try { jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { return null; } @@ -96,6 +99,7 @@ public class JdoTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = (List) jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { return l; } @@ -116,6 +120,7 @@ public class JdoTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = (List) jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { return l; } @@ -136,6 +141,7 @@ public class JdoTemplateTests extends TestCase { final List l = new ArrayList(); l.add("test"); List result = (List) jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { return l; } @@ -620,6 +626,7 @@ public class JdoTemplateTests extends TestCase { public void testTemplateExceptions() { try { createTemplate().execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw new JDOObjectNotFoundException(); } @@ -632,6 +639,7 @@ public class JdoTemplateTests extends TestCase { try { createTemplate().execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw new JDOOptimisticVerificationException(); } @@ -644,6 +652,7 @@ public class JdoTemplateTests extends TestCase { try { createTemplate().execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw new JDODataStoreException(); } @@ -656,6 +665,7 @@ public class JdoTemplateTests extends TestCase { try { createTemplate().execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw new JDOFatalDataStoreException(); } @@ -668,6 +678,7 @@ public class JdoTemplateTests extends TestCase { try { createTemplate().execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw new JDOUserException(); } @@ -680,6 +691,7 @@ public class JdoTemplateTests extends TestCase { try { createTemplate().execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw new JDOFatalUserException(); } @@ -692,6 +704,7 @@ public class JdoTemplateTests extends TestCase { try { createTemplate().execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw new JDOException(); } @@ -714,6 +727,7 @@ public class JdoTemplateTests extends TestCase { JdoTemplate template = createTemplate(); template.setJdoDialect(dialect); template.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw ex; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java index 204d4e1b31d..a7ab5fa9e69 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java @@ -67,6 +67,7 @@ public class JdoTransactionManagerTests extends TestCase { private Transaction tx; + @Override protected void setUp() { pmfControl = MockControl.createControl(PersistenceManagerFactory.class); pmf = (PersistenceManagerFactory) pmfControl.getMock(); @@ -78,6 +79,7 @@ public class JdoTransactionManagerTests extends TestCase { pmfControl.setReturnValue(null, 1); } + @Override protected void tearDown() { try { pmfControl.verify(); @@ -123,6 +125,7 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); @@ -149,6 +152,7 @@ public class JdoTransactionManagerTests extends TestCase { JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { pm2.flush(); return l; @@ -188,10 +192,12 @@ public class JdoTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw new RuntimeException("application exception"); } @@ -232,10 +238,12 @@ public class JdoTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw new RuntimeException("application exception"); } @@ -278,10 +286,12 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf)); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); JdoTemplate jt = new JdoTemplate(pmf); jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { pm2.flush(); return null; @@ -318,6 +328,7 @@ public class JdoTransactionManagerTests extends TestCase { l.add("test"); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { txControl.reset(); tx.isActive(); @@ -329,9 +340,11 @@ public class JdoTransactionManagerTests extends TestCase { txControl.replay(); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { pm2.flush(); return l; @@ -365,6 +378,7 @@ public class JdoTransactionManagerTests extends TestCase { final TransactionTemplate tt = new TransactionTemplate(tm); try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { txControl.reset(); tx.isActive(); @@ -376,9 +390,11 @@ public class JdoTransactionManagerTests extends TestCase { txControl.replay(); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { throw new RuntimeException("application exception"); } @@ -418,6 +434,7 @@ public class JdoTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { txControl.reset(); tx.isActive(); @@ -433,9 +450,11 @@ public class JdoTransactionManagerTests extends TestCase { txControl.replay(); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { JdoTemplate jt = new JdoTemplate(pmf); jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { pm2.flush(); return l; @@ -478,6 +497,7 @@ public class JdoTransactionManagerTests extends TestCase { l.add("test"); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { txControl.verify(); txControl.reset(); @@ -492,9 +512,11 @@ public class JdoTransactionManagerTests extends TestCase { txControl.replay(); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { pm2.flush(); return l; @@ -534,6 +556,7 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { txControl.verify(); txControl.reset(); @@ -549,15 +572,18 @@ public class JdoTransactionManagerTests extends TestCase { JdoTemplate jt = new JdoTemplate(pmf); jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { return null; } }); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { pm2.flush(); return l; @@ -604,11 +630,13 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive()); assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf)); JdoTemplate jt = new JdoTemplate(pmf); jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); pm2.flush(); @@ -616,6 +644,7 @@ public class JdoTransactionManagerTests extends TestCase { } }); Object result = jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); pm2.flush(); @@ -667,6 +696,7 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { utControl.verify(); @@ -692,15 +722,18 @@ public class JdoTransactionManagerTests extends TestCase { JdoTemplate jt = new JdoTemplate(pmf); jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { return null; } }); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { pm2.flush(); return l; @@ -737,11 +770,13 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf)); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf)); assertTrue("Is not new transaction", !status.isNewTransaction()); JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { return l; } @@ -770,6 +805,7 @@ public class JdoTransactionManagerTests extends TestCase { tt.setIsolationLevel(TransactionDefinition.ISOLATION_SERIALIZABLE); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { } }); @@ -806,10 +842,12 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { return l; } @@ -868,11 +906,13 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf)); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); assertTrue("Has thread con", TransactionSynchronizationManager.hasResource(ds)); JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { return l; } @@ -938,11 +978,13 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf)); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); assertTrue("Has thread con", TransactionSynchronizationManager.hasResource(ds)); JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm) { return l; } @@ -1004,6 +1046,7 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf)); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); assertTrue("Hasn't thread con", !TransactionSynchronizationManager.hasResource(ds)); @@ -1011,6 +1054,7 @@ public class JdoTransactionManagerTests extends TestCase { jt.setPersistenceManagerFactory(pmf); jt.setJdoDialect(dialect); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { pm2.flush(); return l; @@ -1104,6 +1148,7 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("Hasn't thread pm", !TransactionSynchronizationManager.hasResource(pmf)); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); assertTrue("Has thread con", TransactionSynchronizationManager.hasResource(ds)); @@ -1113,6 +1158,7 @@ public class JdoTransactionManagerTests extends TestCase { } else { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread session", TransactionSynchronizationManager.hasResource(pmf)); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); @@ -1122,6 +1168,7 @@ public class JdoTransactionManagerTests extends TestCase { } JdoTemplate jt = new JdoTemplate(pmf); return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { pm2.flush(); return l; @@ -1193,6 +1240,7 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); JdoTemplate jt = new JdoTemplate(pmf); @@ -1201,6 +1249,7 @@ public class JdoTransactionManagerTests extends TestCase { jt.setExposeNativePersistenceManager(true); } return jt.execute(new JdoCallback() { + @Override public Object doInJdo(PersistenceManager pm2) { if (exposeNativePm) { assertSame(pm, pm2); @@ -1249,6 +1298,7 @@ public class JdoTransactionManagerTests extends TestCase { assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread pm", TransactionSynchronizationManager.hasResource(pmf)); status.flush(); diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java index 5ad9c14d397..c5a20a83b15 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java @@ -37,6 +37,7 @@ public class LocalPersistenceManagerFactoryTests extends TestCase { MockControl pmfControl = MockControl.createControl(PersistenceManagerFactory.class); final PersistenceManagerFactory pmf = (PersistenceManagerFactory) pmfControl.getMock(); LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() { + @Override protected PersistenceManagerFactory newPersistenceManagerFactory(Map props) { return pmf; } @@ -73,6 +74,7 @@ public class LocalPersistenceManagerFactoryTests extends TestCase { public void testLocalPersistenceManagerFactoryBeanWithInvalidProperty() throws IOException { LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() { + @Override protected PersistenceManagerFactory newPersistenceManagerFactory(Map props) { throw new IllegalArgumentException((String) props.get("myKey")); } @@ -92,6 +94,7 @@ public class LocalPersistenceManagerFactoryTests extends TestCase { public void testLocalPersistenceManagerFactoryBeanWithFile() throws IOException { LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() { + @Override protected PersistenceManagerFactory newPersistenceManagerFactory(Map props) { throw new IllegalArgumentException((String) props.get("myKey")); } @@ -109,6 +112,7 @@ public class LocalPersistenceManagerFactoryTests extends TestCase { public void testLocalPersistenceManagerFactoryBeanWithName() throws IOException { LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() { + @Override protected PersistenceManagerFactory newPersistenceManagerFactory(String name) { throw new IllegalArgumentException(name); } @@ -126,6 +130,7 @@ public class LocalPersistenceManagerFactoryTests extends TestCase { public void testLocalPersistenceManagerFactoryBeanWithNameAndProperties() throws IOException { LocalPersistenceManagerFactoryBean pmfb = new LocalPersistenceManagerFactoryBean() { + @Override protected PersistenceManagerFactory newPersistenceManagerFactory(String name) { throw new IllegalArgumentException(name); } diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java index 99a55063d45..cfbd52a4164 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java @@ -40,6 +40,7 @@ public class JdoDaoSupportTests extends TestCase { pmfControl.replay(); final List test = new ArrayList(); JdoDaoSupport dao = new JdoDaoSupport() { + @Override protected void initDao() { test.add("test"); } @@ -56,6 +57,7 @@ public class JdoDaoSupportTests extends TestCase { JdoTemplate template = new JdoTemplate(); final List test = new ArrayList(); JdoDaoSupport dao = new JdoDaoSupport() { + @Override protected void initDao() { test.add("test"); } diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java index c01d831d8a4..7a5784ac93c 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewTests.java @@ -146,6 +146,7 @@ public class OpenPersistenceManagerInViewTests extends TestCase { filter2.init(filterConfig2); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) { assertTrue(TransactionSynchronizationManager.hasResource(pmf)); servletRequest.setAttribute("invoked", Boolean.TRUE); @@ -153,6 +154,7 @@ public class OpenPersistenceManagerInViewTests extends TestCase { }; final FilterChain filterChain2 = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) throws IOException, ServletException { assertTrue(TransactionSynchronizationManager.hasResource(pmf2)); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java index 177734aee69..225289d63a6 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java @@ -80,10 +80,12 @@ public abstract class AbstractEntityManagerFactoryBeanTests extends TestCase { return emf; } + @Override public PersistenceUnitInfo getPersistenceUnitInfo() { throw new UnsupportedOperationException(); } + @Override public String getPersistenceUnitName() { return "test"; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java index e453aad9b53..15148f29c65 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java @@ -65,6 +65,7 @@ public abstract class AbstractEntityManagerFactoryIntegrationTests extends Abstr return null; } + @Override protected String[] getConfigLocations() { Provider provider = getProvider(); switch (provider) { diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java index 8bea2144035..d145444a7b9 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java @@ -35,10 +35,12 @@ import org.springframework.transaction.support.DefaultTransactionDefinition; public class DefaultJpaDialectTests extends TestCase { JpaDialect dialect; + @Override protected void setUp() throws Exception { dialect = new DefaultJpaDialect(); } + @Override protected void tearDown() throws Exception { dialect = null; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java index a94be01f20a..f2f545dcf94 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java @@ -242,6 +242,7 @@ public class JpaInterceptorTests extends TestCase { this.entityManagerFactory = entityManagerFactory; } + @Override public Object proceed() throws Throwable { if (!TransactionSynchronizationManager.hasResource(this.entityManagerFactory)) { throw new IllegalStateException("Session not bound"); @@ -261,10 +262,12 @@ public class JpaInterceptorTests extends TestCase { return null; } + @Override public Method getMethod() { return null; } + @Override public AccessibleObject getStaticPart() { return null; } @@ -273,6 +276,7 @@ public class JpaInterceptorTests extends TestCase { return null; } + @Override public Object[] getArguments() { return null; } @@ -284,6 +288,7 @@ public class JpaInterceptorTests extends TestCase { return 0; } + @Override public Object getThis() { return null; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java index c78959f5cc9..41bb0352694 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java @@ -44,6 +44,7 @@ public class JpaTemplateTests extends TestCase { private EntityManagerFactory factory; + @Override protected void setUp() throws Exception { template = new JpaTemplate(); @@ -57,6 +58,7 @@ public class JpaTemplateTests extends TestCase { } + @Override protected void tearDown() throws Exception { template = null; factoryControl = null; @@ -95,6 +97,7 @@ public class JpaTemplateTests extends TestCase { template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) throws PersistenceException { assertSame(em, manager); return null; @@ -104,6 +107,7 @@ public class JpaTemplateTests extends TestCase { template.setExposeNativeEntityManager(false); template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) throws PersistenceException { assertNotSame(em, manager); return null; @@ -128,6 +132,7 @@ public class JpaTemplateTests extends TestCase { try { template.executeFind(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) throws PersistenceException { assertSame(em, manager); return new Object(); @@ -161,6 +166,7 @@ public class JpaTemplateTests extends TestCase { factoryControl.replay(); template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) throws PersistenceException { assertSame(em, manager); return null; @@ -183,6 +189,7 @@ public class JpaTemplateTests extends TestCase { try { template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) throws PersistenceException { assertSame(em, manager); return null; diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java index 722f25adfee..e9ba8b86851 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java @@ -60,6 +60,7 @@ public class JpaTransactionManagerTests extends TestCase { private TransactionTemplate tt; + @Override protected void setUp() throws Exception { factoryControl = MockControl.createControl(EntityManagerFactory.class); factory = (EntityManagerFactory) factoryControl.getMock(); @@ -80,6 +81,7 @@ public class JpaTransactionManagerTests extends TestCase { manager.close(); } + @Override protected void tearDown() throws Exception { assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); @@ -106,9 +108,11 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { em.flush(); return l; @@ -146,9 +150,11 @@ public class JpaTransactionManagerTests extends TestCase { try { Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { em.flush(); return l; @@ -188,9 +194,11 @@ public class JpaTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { throw new RuntimeException("some exception"); } @@ -229,9 +237,11 @@ public class JpaTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { throw new RuntimeException("some exception"); } @@ -269,10 +279,12 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); Object res = template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { em.flush(); return l; @@ -307,6 +319,7 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { txControl.reset(); txControl.expectAndReturn(tx.getRollbackOnly(), false); @@ -316,9 +329,11 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(TransactionSynchronizationManager.hasResource(factory)); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { em.flush(); return l; @@ -351,6 +366,7 @@ public class JpaTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { txControl.reset(); txControl.expectAndReturn(tx.isActive(), true, 2); @@ -360,8 +376,10 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(TransactionSynchronizationManager.hasResource(factory)); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { throw new RuntimeException("exception"); } @@ -400,6 +418,7 @@ public class JpaTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { txControl.reset(); txControl.expectAndReturn(tx.isActive(), true); @@ -412,9 +431,11 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(TransactionSynchronizationManager.hasResource(factory)); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em2) { em2.flush(); return l; @@ -462,6 +483,7 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { txControl.verify(); txControl.reset(); @@ -476,8 +498,10 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(TransactionSynchronizationManager.hasResource(factory)); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em2) { em2.flush(); return l; @@ -517,6 +541,7 @@ public class JpaTransactionManagerTests extends TestCase { try { Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { txControl.verify(); txControl.reset(); @@ -531,6 +556,7 @@ public class JpaTransactionManagerTests extends TestCase { JpaTemplate template2 = new JpaTemplate(factory); template2.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) throws PersistenceException { return null; } @@ -538,8 +564,10 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(TransactionSynchronizationManager.hasResource(factory)); return tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em2) { em2.flush(); return l; @@ -582,13 +610,16 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertFalse(TransactionSynchronizationManager.hasResource(factory)); TransactionTemplate tt2 = new TransactionTemplate(transactionManager); tt2.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); return tt2.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em2) { em2.flush(); return l; @@ -630,9 +661,11 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { JpaTemplate template2 = new JpaTemplate(factory); template2.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) throws PersistenceException { return null; } @@ -642,8 +675,10 @@ public class JpaTransactionManagerTests extends TestCase { TransactionTemplate tt2 = new TransactionTemplate(transactionManager); tt2.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); return tt2.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em2) { em2.flush(); return l; @@ -694,18 +729,23 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em2) { em2.flush(); return null; } }); TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em2) { em2.flush(); return null; @@ -750,11 +790,13 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(!TransactionSynchronizationManager.hasResource(factory)); assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(!status.isNewTransaction()); return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { em.flush(); return l; @@ -790,11 +832,13 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(!TransactionSynchronizationManager.hasResource(factory)); assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(!status.isNewTransaction()); template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { em.flush(); return null; @@ -836,10 +880,12 @@ public class JpaTransactionManagerTests extends TestCase { try { Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { return l; } @@ -881,10 +927,12 @@ public class JpaTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { return null; } @@ -929,11 +977,13 @@ public class JpaTransactionManagerTests extends TestCase { try { Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(!status.isNewTransaction()); return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { em.flush(); return l; @@ -976,11 +1026,13 @@ public class JpaTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(!status.isNewTransaction()); template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { em.flush(); return null; @@ -1026,10 +1078,12 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); Object result = tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); return template.execute(new JpaCallback() { + @Override public Object doInJpa(EntityManager em) { em.flush(); return l; @@ -1063,6 +1117,7 @@ public class JpaTransactionManagerTests extends TestCase { try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { } }); @@ -1092,6 +1147,7 @@ public class JpaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override public void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); status.flush(); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java index 89c41cdc24c..a0ebba76b67 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java @@ -366,12 +366,14 @@ public class LocalContainerEntityManagerFactoryBeanTests extends AbstractEntityM private static class DummyContainerPersistenceProvider implements PersistenceProvider { + @Override public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo pui, Map map) { actualPui = pui; actualProps = map; return mockEmf; } + @Override public EntityManagerFactory createEntityManagerFactory(String emfName, Map properties) { throw new UnsupportedOperationException(); } @@ -380,23 +382,29 @@ public class LocalContainerEntityManagerFactoryBeanTests extends AbstractEntityM private static class NoOpEntityTransaction implements EntityTransaction { + @Override public void begin() { } + @Override public void commit() { } + @Override public void rollback() { } + @Override public void setRollbackOnly() { throw new UnsupportedOperationException(); } + @Override public boolean getRollbackOnly() { return false; } + @Override public boolean isActive() { return false; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java index ad68b90a6f9..8371e18766b 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java @@ -80,10 +80,12 @@ public class LocalEntityManagerFactoryBeanTests extends AbstractEntityManagerFac protected static class DummyPersistenceProvider implements PersistenceProvider { + @Override public EntityManagerFactory createContainerEntityManagerFactory(PersistenceUnitInfo pui, Map map) { throw new UnsupportedOperationException(); } + @Override public EntityManagerFactory createEntityManagerFactory(String emfName, Map properties) { actualName = emfName; actualProps = properties; diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java index 4e092f7ffc3..67f586adb06 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java @@ -28,6 +28,7 @@ import org.springframework.orm.jpa.EntityManagerFactoryInfo; */ public class EclipseLinkEntityManagerFactoryIntegrationTests extends AbstractContainerEntityManagerFactoryIntegrationTests { + @Override protected String[] getConfigLocations() { return ECLIPSELINK_CONFIG_LOCATIONS; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java index e7a439080a1..8759b3710b9 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java @@ -45,6 +45,7 @@ public class HibernateEntityManagerFactoryIntegrationTests extends this.sessionFactory = sessionFactory; } + @Override protected String[] getConfigLocations() { return HIBERNATE_CONFIG_LOCATIONS; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java index 65147c04d14..8e66b709713 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java @@ -40,6 +40,7 @@ public class HibernateMultiEntityManagerFactoryIntegrationTests extends this.entityManagerFactory2 = entityManagerFactory2; } + @Override protected String[] getConfigLocations() { return new String[] { "/org/springframework/orm/jpa/hibernate/hibernate-manager-multi.xml", diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java index fbdb0eda301..68e82f5f800 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java @@ -39,6 +39,7 @@ import org.springframework.transaction.support.TransactionTemplate; */ public class OpenJpaEntityManagerFactoryIntegrationTests extends AbstractContainerEntityManagerFactoryIntegrationTests { + @Override protected String[] getConfigLocations() { return OPENJPA_CONFIG_LOCATIONS; } @@ -62,6 +63,7 @@ public class OpenJpaEntityManagerFactoryIntegrationTests extends AbstractContain TransactionTemplate tt = new TransactionTemplate(transactionManager); tt.setPropagationBehavior(TransactionTemplate.PROPAGATION_NESTED); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { Person tony = new Person(); tony.setFirstName("Tony"); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java index 3b1f71ba3c9..20d9e5f029b 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java @@ -32,6 +32,7 @@ import org.junit.Ignore; @Ignore("this test causes gradle to hang") public class OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests extends OpenJpaEntityManagerFactoryIntegrationTests { + @Override protected String[] getConfigLocations() { return new String[] { "/org/springframework/orm/jpa/openjpa/openjpa-manager-aspectj-weaving.xml", diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java index ec65890b884..28b03587ab9 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java @@ -38,6 +38,7 @@ public class JpaDaoSupportTests extends TestCase { mockControl.replay(); final List test = new ArrayList(); JpaDaoSupport dao = new JpaDaoSupport() { + @Override protected void initDao() { test.add("test"); } @@ -56,6 +57,7 @@ public class JpaDaoSupportTests extends TestCase { mockControl.replay(); final List test = new ArrayList(); JpaDaoSupport dao = new JpaDaoSupport() { + @Override protected void initDao() { test.add("test"); } @@ -73,6 +75,7 @@ public class JpaDaoSupportTests extends TestCase { JpaTemplate template = new JpaTemplate(); final List test = new ArrayList(); JpaDaoSupport dao = new JpaDaoSupport() { + @Override protected void initDao() { test.add("test"); } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java index 06fdf973115..3431e4a4216 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/OpenEntityManagerInViewTests.java @@ -163,6 +163,7 @@ public class OpenEntityManagerInViewTests extends TestCase { asyncManager.setTaskExecutor(new SyncTaskExecutor()); asyncManager.setAsyncWebRequest(asyncWebRequest); asyncManager.startCallableProcessing(new Callable() { + @Override public String call() throws Exception { return "anything"; } @@ -257,6 +258,7 @@ public class OpenEntityManagerInViewTests extends TestCase { filter2.init(filterConfig2); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); servletRequest.setAttribute("invoked", Boolean.TRUE); @@ -264,6 +266,7 @@ public class OpenEntityManagerInViewTests extends TestCase { }; final FilterChain filterChain2 = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) throws IOException, ServletException { assertTrue(TransactionSynchronizationManager.hasResource(factory2)); @@ -323,6 +326,7 @@ public class OpenEntityManagerInViewTests extends TestCase { final AtomicInteger count = new AtomicInteger(0); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) { assertTrue(TransactionSynchronizationManager.hasResource(factory)); servletRequest.setAttribute("invoked", Boolean.TRUE); @@ -333,6 +337,7 @@ public class OpenEntityManagerInViewTests extends TestCase { final AtomicInteger count2 = new AtomicInteger(0); final FilterChain filterChain2 = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) throws IOException, ServletException { assertTrue(TransactionSynchronizationManager.hasResource(factory2)); @@ -355,6 +360,7 @@ public class OpenEntityManagerInViewTests extends TestCase { asyncManager.setTaskExecutor(new SyncTaskExecutor()); asyncManager.setAsyncWebRequest(asyncWebRequest); asyncManager.startCallableProcessing(new Callable() { + @Override public String call() throws Exception { return "anything"; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java index f8af85a5845..4675422aab0 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java @@ -734,14 +734,17 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT @PersistenceContext private EntityManager em; + @Override public Object getObject() throws Exception { return null; } + @Override public Class getObjectType() { return null; } + @Override public boolean isSingleton() { return true; } @@ -785,6 +788,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT @SuppressWarnings("serial") public static class SpecificPublicPersistenceContextSetter extends DefaultPublicPersistenceContextSetter { + @Override @PersistenceContext(unitName="unit2", type = PersistenceContextType.EXTENDED) public void setEntityManager(EntityManager em) { super.setEntityManager(em); @@ -880,6 +884,7 @@ public class PersistenceInjectionTests extends AbstractEntityManagerFactoryBeanT public static boolean closed; + @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { if ("isOpen".equals(method.getName())) { return true; diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkEntityManagerFactoryIntegrationTests.java index d69241996e2..64e43ed7d4f 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkEntityManagerFactoryIntegrationTests.java @@ -28,6 +28,7 @@ import org.springframework.orm.jpa.EntityManagerFactoryInfo; */ public class TopLinkEntityManagerFactoryIntegrationTests extends AbstractContainerEntityManagerFactoryIntegrationTests { + @Override protected String[] getConfigLocations() { return TOPLINK_CONFIG_LOCATIONS; } diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java index c3350e0e255..78e8f86af5b 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java @@ -44,6 +44,7 @@ public class TopLinkMultiEntityManagerFactoryIntegrationTests extends this.entityManagerFactory2 = entityManagerFactory2; } + @Override protected String[] getConfigLocations() { return new String[] { "/org/springframework/orm/jpa/toplink/toplink-manager-multi.xml", diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java index 5da624d1cb7..8cb7fd87440 100644 --- a/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java +++ b/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java @@ -172,6 +172,7 @@ public abstract class AbstractDependencyInjectionSpringContextTests extends Abst * message will be written to the log. * @see #injectDependencies() */ + @Override protected void prepareTestInstance() throws Exception { if (getApplicationContext() == null) { if (this.logger.isInfoEnabled()) { diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java index e1365de448f..b99e20d03fc 100644 --- a/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java +++ b/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java @@ -95,6 +95,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon * This implementation is final. Override {@code onSetUp} for custom behavior. * @see #onSetUp() */ + @Override protected final void setUp() throws Exception { // lazy load, in case getApplicationContext() has not yet been called. if (this.applicationContext == null) { @@ -136,6 +137,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon * custom behavior. * @see #onTearDown() */ + @Override protected final void tearDown() throws Exception { onTearDown(); } @@ -168,6 +170,7 @@ public abstract class AbstractSingleSpringContextTests extends AbstractSpringCon * {@code contextKey()} returns. * @see #getConfigLocations() */ + @Override protected ConfigurableApplicationContext loadContext(Object key) throws Exception { return loadContextLocations((String[]) key); } diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java index f159866bc06..1f0b6123dbd 100644 --- a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java +++ b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java @@ -120,6 +120,7 @@ public abstract class AbstractTransactionalDataSourceSpringContextTests * cleared, as a defensive measure against accidental permanent wiping of a database. * @see org.springframework.test.AbstractTransactionalSpringContextTests#setComplete() */ + @Override protected final void setComplete() { if (this.zappedTables) { throw new IllegalStateException("Cannot set complete after deleting tables"); diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java index b0030de7835..e45774e1c9e 100644 --- a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java +++ b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java @@ -187,6 +187,7 @@ public abstract class AbstractTransactionalSpringContextTests extends AbstractDe * @throws Exception simply let any exception propagate * @see #onTearDown() */ + @Override protected void onSetUp() throws Exception { this.complete = !this.isRollback(); @@ -250,6 +251,7 @@ public abstract class AbstractTransactionalSpringContextTests extends AbstractDe * @throws Exception simply let any exception propagate * @see #onSetUp() */ + @Override protected void onTearDown() throws Exception { // Call onTearDownInTransaction and end transaction if the transaction // is still active. diff --git a/spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java b/spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java index 9fd31193154..8c9dc686d94 100644 --- a/spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java +++ b/spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java @@ -66,6 +66,7 @@ public abstract class ConditionalTestCase extends TestCase { super(name); } + @Override public void runBare() throws Throwable { // getName will return the name of the method being run if (isDisabledInThisEnvironment(getName())) { diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java b/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java index 93b25efcc51..fa6dd008a0a 100644 --- a/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java +++ b/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java @@ -173,6 +173,7 @@ public abstract class AbstractAnnotationAwareTransactionalTests extends // Let JUnit handle execution. We're just changing the state of the test class first. runTestTimed(new TestExecutionCallback() { + @Override public void run() throws Throwable { try { AbstractAnnotationAwareTransactionalTests.super.runBare(); diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java b/spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java index f806acc1ff6..7bd17b9bd5c 100644 --- a/spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java +++ b/spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java @@ -50,6 +50,7 @@ public class SystemProfileValueSource implements ProfileValueSource { * system properties. * @see System#getProperty(String) */ + @Override public String get(String key) { Assert.hasText(key, "'key' must not be empty"); return System.getProperty(key); diff --git a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java index f351a00dfa7..b4cb804032a 100644 --- a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java +++ b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java @@ -331,6 +331,7 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio this.ltw = ltw; } + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { if (bean instanceof LocalContainerEntityManagerFactoryBean) { ((LocalContainerEntityManagerFactoryBean) bean).setLoadTimeWeaver(this.ltw); @@ -352,6 +353,7 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio this.shadowingClassLoader = shadowingClassLoader; } + @Override public void addTransformer(ClassFileTransformer transformer) { try { Method addClassFileTransformer = @@ -364,10 +366,12 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio } } + @Override public ClassLoader getInstrumentableClassLoader() { return this.shadowingClassLoader; } + @Override public ClassLoader getThrowawayClassLoader() { // Be sure to copy the same resource overrides and same class file transformers: // We want the throwaway class loader to behave like the instrumentable class loader. diff --git a/spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java b/spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java index c9c8709c48b..de79edcd747 100644 --- a/spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java +++ b/spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java @@ -28,10 +28,12 @@ public class MockJtaTransaction implements javax.transaction.Transaction { private Synchronization synchronization; + @Override public int getStatus() { return Status.STATUS_ACTIVE; } + @Override public void registerSynchronization(Synchronization synchronization) { this.synchronization = synchronization; } @@ -40,20 +42,25 @@ public class MockJtaTransaction implements javax.transaction.Transaction { return synchronization; } + @Override public boolean enlistResource(XAResource xaResource) { return false; } + @Override public boolean delistResource(XAResource xaResource, int i) { return false; } + @Override public void commit() { } + @Override public void rollback() { } + @Override public void setRollbackOnly() { } diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java index a550a4daedb..9255438766b 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java @@ -206,6 +206,7 @@ public class Jaxb2MarshallerTests extends AbstractMarshallerTests { private void testSupportsPrimitives() { final Primitives primitives = new Primitives(); ReflectionUtils.doWithMethods(Primitives.class, new ReflectionUtils.MethodCallback() { + @Override public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException { Type returnType = method.getGenericReturnType(); assertTrue("Jaxb2Marshaller does not support JAXBElement<" + method.getName().substring(9) + ">", @@ -220,6 +221,7 @@ public class Jaxb2MarshallerTests extends AbstractMarshallerTests { } } }, new ReflectionUtils.MethodFilter() { + @Override public boolean matches(Method method) { return method.getName().startsWith("primitive"); } @@ -229,6 +231,7 @@ public class Jaxb2MarshallerTests extends AbstractMarshallerTests { private void testSupportsStandardClasses() throws Exception { final StandardClasses standardClasses = new StandardClasses(); ReflectionUtils.doWithMethods(StandardClasses.class, new ReflectionUtils.MethodCallback() { + @Override public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException { Type returnType = method.getGenericReturnType(); assertTrue("Jaxb2Marshaller does not support JAXBElement<" + method.getName().substring(13) + ">", @@ -243,6 +246,7 @@ public class Jaxb2MarshallerTests extends AbstractMarshallerTests { } } }, new ReflectionUtils.MethodFilter() { + @Override public boolean matches(Method method) { return method.getName().startsWith("standardClass"); } diff --git a/spring-struts/src/test/java/org/springframework/web/struts/TestAction.java b/spring-struts/src/test/java/org/springframework/web/struts/TestAction.java index 68dda908f51..e89fe77b455 100644 --- a/spring-struts/src/test/java/org/springframework/web/struts/TestAction.java +++ b/spring-struts/src/test/java/org/springframework/web/struts/TestAction.java @@ -34,6 +34,7 @@ public class TestAction extends Action implements BeanNameAware { private String beanName; + @Override public void setBeanName(String beanName) { this.beanName = beanName; } diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java index 66e5e064ef0..56d4c5b40dd 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/DefaultMvcResultTests.java @@ -120,10 +120,12 @@ public class DefaultMvcResultTests { this.asyncStarted = asyncStarted; } + @Override public boolean isAsyncStarted() { return this.asyncStarted; } + @Override public AsyncContext getAsyncContext() { return asyncContext; } diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java index c86e2901371..60426d8075c 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/StubMvcResult.java @@ -60,30 +60,37 @@ public class StubMvcResult implements MvcResult { this.response = response; } + @Override public MockHttpServletRequest getRequest() { return request; } + @Override public Object getHandler() { return handler; } + @Override public HandlerInterceptor[] getInterceptors() { return interceptors; } + @Override public Exception getResolvedException() { return resolvedException; } + @Override public ModelAndView getModelAndView() { return mav; } + @Override public FlashMap getFlashMap() { return flashMap; } + @Override public MockHttpServletResponse getResponse() { return response; } @@ -120,10 +127,12 @@ public class StubMvcResult implements MvcResult { this.response = response; } + @Override public Object getAsyncResult() { return null; } + @Override public Object getAsyncResult(long timeout) { return null; } diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java index 926942869af..9320acd338b 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java @@ -392,6 +392,7 @@ public class MockHttpServletRequestBuilderTests { private final class User implements Principal { + @Override public String getName() { return "Foo"; } diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java index 0eea8533762..5902cb5e94f 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java @@ -63,6 +63,7 @@ public class PrintingResultHandlerTests { public void setup() { this.handler = new TestPrintingResultHandler(); this.request = new MockHttpServletRequest("GET", "/") { + @Override public boolean isAsyncStarted() { return false; } @@ -228,11 +229,13 @@ public class PrintingResultHandlerTests { private Map> printedValues = new HashMap>(); + @Override public void printHeading(String heading) { this.printedHeading = heading; this.printedValues.put(heading, new HashMap()); } + @Override public void printValue(String label, Object value) { Assert.notNull(this.printedHeading, "Heading not printed before label " + label + " with value " + value); diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java index 0a22f71ac09..f021e1355a2 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java @@ -97,6 +97,7 @@ public class AsyncTests { @ResponseBody public Callable getCallable(final Model model) { return new Callable() { + @Override public Person call() throws Exception { return new Person("Joe"); } diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java index 56539b99218..de8760c8792 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FilterTests.java @@ -151,6 +151,7 @@ public class FilterTests { @Override public Principal getUserPrincipal() { return new Principal() { + @Override public String getName() { return PRINCIPAL_NAME; } diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java index b62a0e3dedc..b36043a7e43 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/RequestBuilderTests.java @@ -82,6 +82,7 @@ public class RequestBuilderTests { return this; } + @Override public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) { for (String headerName : this.headers.keySet()) { request.addHeader(headerName, this.headers.get(headerName)); diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java index 9282d4885a9..eaf01a5782a 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/setup/ConditionalDelegatingFilterProxyTests.java @@ -253,10 +253,12 @@ public class ConditionalDelegatingFilterProxyTests { private FilterChain chain; private boolean destroy; + @Override public void init(FilterConfig filterConfig) throws ServletException { this.filterConfig = filterConfig; } + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { this.request = request; @@ -264,6 +266,7 @@ public class ConditionalDelegatingFilterProxyTests { this.chain = chain; } + @Override public void destroy() { this.destroy = true; } diff --git a/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-test/src/test/java/org/springframework/beans/TestBean.java b/spring-test/src/test/java/org/springframework/beans/TestBean.java index d84f85d0964..66e2624f05c 100644 --- a/spring-test/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-test/src/test/java/org/springframework/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] { spouse }; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -369,12 +383,14 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } @@ -382,6 +398,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -419,6 +438,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockFilterChainTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockFilterChainTests.java index e627a333be2..a254398c4ed 100644 --- a/spring-test/src/test/java/org/springframework/mock/web/MockFilterChainTests.java +++ b/spring-test/src/test/java/org/springframework/mock/web/MockFilterChainTests.java @@ -143,6 +143,7 @@ public class MockFilterChainTests { this.servlet = servlet; } + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { @@ -156,9 +157,11 @@ public class MockFilterChainTests { } } + @Override public void init(FilterConfig filterConfig) throws ServletException { } + @Override public void destroy() { } } diff --git a/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java index eb8f362d56d..f02ce343039 100644 --- a/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java @@ -54,6 +54,7 @@ public abstract class AbstractSpr3350SingleSpringContextTests extends AbstractDe * * @see org.springframework.test.AbstractSingleSpringContextTests#getConfigPath() */ + @Override protected abstract String getConfigPath(); /** diff --git a/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java index d0da3c8e5ad..a8908bfd8f0 100644 --- a/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java @@ -44,6 +44,7 @@ public class PropertiesBasedSpr3350SingleSpringContextTests extends AbstractSpr3 * * @see org.springframework.test.AbstractSingleSpringContextTests#createBeanDefinitionReader(org.springframework.context.support.GenericApplicationContext) */ + @Override protected final BeanDefinitionReader createBeanDefinitionReader(GenericApplicationContext context) { return new PropertiesBeanDefinitionReader(context); } @@ -52,6 +53,7 @@ public class PropertiesBasedSpr3350SingleSpringContextTests extends AbstractSpr3 * Returns * "PropertiesBasedSpr3350SingleSpringContextTests-context.properties". */ + @Override protected final String getConfigPath() { return "PropertiesBasedSpr3350SingleSpringContextTests-context.properties"; } diff --git a/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java index ab6e42dc68c..1872385e619 100644 --- a/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java @@ -57,6 +57,7 @@ public class Spr3264DependencyInjectionSpringContextTests extends AbstractDepend // Assert changes to AbstractDependencyInjectionSpringContextTests: new AssertThrows(IllegalStateException.class) { + @Override public void test() throws Exception { Spr3264DependencyInjectionSpringContextTests.super.injectDependencies(); } diff --git a/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java index 8143c775115..9701ab3364a 100644 --- a/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java @@ -38,6 +38,7 @@ public class XmlBasedSpr3350SingleSpringContextTests extends AbstractSpr3350Sing /** * Returns "XmlBasedSpr3350SingleSpringContextTests-context.xml". */ + @Override protected final String getConfigPath() { return "XmlBasedSpr3350SingleSpringContextTests-context.xml"; } diff --git a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java index 580b873b10b..1568b6fbacb 100644 --- a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java +++ b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java @@ -138,6 +138,7 @@ public class ProfileValueAnnotationAwareTransactionalTests extends TestCase { public static class HardCodedProfileValueSource implements ProfileValueSource { + @Override public String get(String key) { return (key.equals(NAME) ? VALUE : null); } diff --git a/spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests.java b/spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests.java index aace2b29a41..fdfa4eb4ac8 100644 --- a/spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests.java @@ -447,12 +447,14 @@ public class ContextLoaderUtilsTests { private static class FooInitializer implements ApplicationContextInitializer { + @Override public void initialize(GenericApplicationContext applicationContext) { } } private static class BarInitializer implements ApplicationContextInitializer { + @Override public void initialize(GenericWebApplicationContext applicationContext) { } } diff --git a/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java b/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java index 9bd67303ba5..35b64fa432b 100644 --- a/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java @@ -369,12 +369,14 @@ public class MergedContextConfigurationTests { private static class FooInitializer implements ApplicationContextInitializer { + @Override public void initialize(GenericApplicationContext applicationContext) { } } private static class BarInitializer implements ApplicationContextInitializer { + @Override public void initialize(GenericApplicationContext applicationContext) { } } diff --git a/spring-test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java b/spring-test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java index 8ae941c107e..d27e3ca50d5 100644 --- a/spring-test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java @@ -146,6 +146,7 @@ public class SpringRunnerContextCacheTests { java.util.Collections.sort(testMethods, new Comparator() { + @Override public int compare(FrameworkMethod method1, FrameworkMethod method2) { return method1.getName().compareTo(method2.getName()); } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java index b1a0a4e5514..70778c7f1c4 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java @@ -109,10 +109,12 @@ public class ConcreteTransactionalJUnit38SpringContextTests extends AbstractTran return simpleJdbcTemplate.update("DELETE FROM person WHERE name=?", name); } + @Override public final void afterPropertiesSet() throws Exception { this.beanInitialized = true; } + @Override public final void setBeanName(final String beanName) { this.beanName = beanName; } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java index 39cf8624ad5..85a7c0a244c 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java @@ -187,6 +187,7 @@ public class ProfileValueJUnit38SpringContextTests extends TestCase { public static class HardCodedProfileValueSource implements ProfileValueSource { + @Override public String get(final String key) { return (key.equals(NAME) ? VALUE : null); } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java index 1c18259f1f9..a9ce65e0d3f 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java @@ -42,22 +42,27 @@ public class ClassLevelDisabledSpringRunnerTests { public static class CustomTestExecutionListener implements TestExecutionListener { + @Override public void beforeTestClass(TestContext testContext) throws Exception { fail("A listener method for a disabled test should never be executed!"); } + @Override public void prepareTestInstance(TestContext testContext) throws Exception { fail("A listener method for a disabled test should never be executed!"); } + @Override public void beforeTestMethod(TestContext testContext) throws Exception { fail("A listener method for a disabled test should never be executed!"); } + @Override public void afterTestMethod(TestContext testContext) throws Exception { fail("A listener method for a disabled test should never be executed!"); } + @Override public void afterTestClass(TestContext testContext) throws Exception { fail("A listener method for a disabled test should never be executed!"); } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java index 01ec43a2fd1..59ad1be4f5f 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java @@ -104,6 +104,7 @@ public class ConcreteTransactionalJUnit4SpringContextTests extends AbstractTrans return simpleJdbcTemplate.update("DELETE FROM person WHERE name=?", name); } + @Override @Resource public void setDataSource(DataSource dataSource) { super.setDataSource(dataSource); @@ -119,10 +120,12 @@ public class ConcreteTransactionalJUnit4SpringContextTests extends AbstractTrans this.bar = bar; } + @Override public final void setBeanName(final String beanName) { this.beanName = beanName; } + @Override public final void afterPropertiesSet() throws Exception { this.beanInitialized = true; } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java index 8e422e1c0cd..72a98004def 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java @@ -48,6 +48,7 @@ public class HardCodedProfileValueSourceSpringRunnerTests extends EnabledAndIgno public static class HardCodedProfileValueSource implements ProfileValueSource { + @Override public String get(final String key) { return (key.equals(NAME) ? VALUE : null); } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java index 22f0c6ebe81..c41eb332386 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java @@ -53,6 +53,7 @@ public class RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests e countRowsInPersonTable(simpleJdbcTemplate)); } + @Override @Before public void verifyInitialTestData() { clearPersonTable(simpleJdbcTemplate); @@ -61,6 +62,7 @@ public class RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests e countRowsInPersonTable(simpleJdbcTemplate)); } + @Override @Test @Transactional @Rollback(false) diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java index 85af698bd33..c65ab7c9394 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java @@ -136,14 +136,17 @@ public class SpringJUnit4ClassRunnerAppCtxTests implements ApplicationContextAwa // ------------------------------------------------------------------------| + @Override public final void afterPropertiesSet() throws Exception { this.beanInitialized = true; } + @Override public final void setApplicationContext(final ApplicationContext applicationContext) throws BeansException { this.applicationContext = applicationContext; } + @Override public final void setBeanName(final String beanName) { this.beanName = beanName; } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/DevProfileInitializer.java b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/DevProfileInitializer.java index 64d8cf2e483..f5424607d56 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/DevProfileInitializer.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/DevProfileInitializer.java @@ -25,6 +25,7 @@ import org.springframework.context.support.GenericApplicationContext; */ public class DevProfileInitializer implements ApplicationContextInitializer { + @Override public void initialize(GenericApplicationContext applicationContext) { applicationContext.getEnvironment().setActiveProfiles("dev"); } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/FooBarAliasInitializer.java b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/FooBarAliasInitializer.java index 0f0858c4baa..1259b82d83d 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/FooBarAliasInitializer.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/FooBarAliasInitializer.java @@ -25,6 +25,7 @@ import org.springframework.context.support.GenericApplicationContext; */ public class FooBarAliasInitializer implements ApplicationContextInitializer { + @Override public void initialize(GenericApplicationContext applicationContext) { applicationContext.registerAlias("foo", "bar"); } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerWithoutConfigFilesOrClassesTest.java b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerWithoutConfigFilesOrClassesTest.java index 3c0b074a812..5d1459c4ce7 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerWithoutConfigFilesOrClassesTest.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/InitializerWithoutConfigFilesOrClassesTest.java @@ -53,6 +53,7 @@ public class InitializerWithoutConfigFilesOrClassesTest { static class EntireAppInitializer implements ApplicationContextInitializer { + @Override public void initialize(GenericApplicationContext applicationContext) { new AnnotatedBeanDefinitionReader(applicationContext).register(GlobalConfig.class); } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/MergedInitializersAnnotationConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/MergedInitializersAnnotationConfigTests.java index 30fe35276fc..0bc08e1c458 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/MergedInitializersAnnotationConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/MergedInitializersAnnotationConfigTests.java @@ -34,6 +34,7 @@ import org.springframework.test.context.junit4.aci.DevProfileInitializer; @ContextConfiguration(initializers = DevProfileInitializer.class) public class MergedInitializersAnnotationConfigTests extends SingleInitializerAnnotationConfigTests { + @Override @Test public void activeBeans() { assertEquals("foo", foo); diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/OrderedInitializersAnnotationConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/OrderedInitializersAnnotationConfigTests.java index d3fcf1dd820..2eac43320f4 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/OrderedInitializersAnnotationConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/OrderedInitializersAnnotationConfigTests.java @@ -125,10 +125,12 @@ public class OrderedInitializersAnnotationConfigTests { static class OrderedOneInitializer implements ApplicationContextInitializer, Ordered { + @Override public void initialize(GenericApplicationContext applicationContext) { applicationContext.getEnvironment().setActiveProfiles(PROFILE_ONE); } + @Override public int getOrder() { return 1; } @@ -137,6 +139,7 @@ public class OrderedInitializersAnnotationConfigTests { @Order(2) static class OrderedTwoInitializer implements ApplicationContextInitializer { + @Override public void initialize(GenericApplicationContext applicationContext) { applicationContext.getEnvironment().setActiveProfiles(PROFILE_TWO); } diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java index 994b886b30e..bb90b212fdf 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java @@ -39,11 +39,13 @@ public class HibernatePersonRepository implements PersonRepository { this.sessionFactory = sessionFactory; } + @Override public Person save(Person person) { this.sessionFactory.getCurrentSession().save(person); return person; } + @Override public Person findByName(String name) { return (Person) this.sessionFactory.getCurrentSession().createQuery( "from Person person where person.name = :name").setString("name", name).uniqueResult(); diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java index 039faa6894f..b6247e4a7e1 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java @@ -41,10 +41,12 @@ public class StandardPersonService implements PersonService { this.personRepository = personRepository; } + @Override public Person findByName(String name) { return this.personRepository.findByName(name); } + @Override @Transactional(readOnly = false) public Person save(Person person) { return this.personRepository.save(person); diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9604/LookUpTxMgrViaTransactionManagementConfigurerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9604/LookUpTxMgrViaTransactionManagementConfigurerTests.java index de9e21b2e35..cd20e40f3f5 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9604/LookUpTxMgrViaTransactionManagementConfigurerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9604/LookUpTxMgrViaTransactionManagementConfigurerTests.java @@ -50,6 +50,7 @@ public class LookUpTxMgrViaTransactionManagementConfigurerTests { @Configuration static class Config implements TransactionManagementConfigurer { + @Override public PlatformTransactionManager annotationDrivenTransactionManager() { return txManager1(); } diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java index 27a08c054c2..f395a90a66e 100644 --- a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java @@ -90,10 +90,12 @@ public class ConcreteTransactionalTestNGSpringContextTests extends AbstractTrans return simpleJdbcTemplate.update("DELETE FROM person WHERE name=?", name); } + @Override public void afterPropertiesSet() throws Exception { this.beanInitialized = true; } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java index 66318987d00..09d76fb8832 100644 --- a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java @@ -123,27 +123,34 @@ public class FailingBeforeAndAfterMethodsTests { int failedConfigurationsCount = 0; + @Override public void onFinish(ITestContext testContext) { this.failedConfigurationsCount += testContext.getFailedConfigurations().size(); } + @Override public void onStart(ITestContext testContext) { } + @Override public void onTestFailedButWithinSuccessPercentage(ITestResult testResult) { } + @Override public void onTestFailure(ITestResult testResult) { this.testFailureCount++; } + @Override public void onTestSkipped(ITestResult testResult) { } + @Override public void onTestStart(ITestResult testResult) { this.testStartCount++; } + @Override public void onTestSuccess(ITestResult testResult) { this.testSuccessCount++; } diff --git a/spring-test/src/test/java/org/springframework/test/context/web/AbstractBasicWacTests.java b/spring-test/src/test/java/org/springframework/test/context/web/AbstractBasicWacTests.java index 5a1a8421dda..334983d8076 100644 --- a/spring-test/src/test/java/org/springframework/test/context/web/AbstractBasicWacTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/web/AbstractBasicWacTests.java @@ -66,6 +66,7 @@ public abstract class AbstractBasicWacTests implements ServletContextAware { protected String foo; + @Override public void setServletContext(ServletContext servletContext) { this.servletContext = servletContext; } diff --git a/spring-test/src/test/java/org/springframework/test/transaction/CallCountingTransactionManager.java b/spring-test/src/test/java/org/springframework/test/transaction/CallCountingTransactionManager.java index 8713dbe5ee6..13f3b5d360d 100644 --- a/spring-test/src/test/java/org/springframework/test/transaction/CallCountingTransactionManager.java +++ b/spring-test/src/test/java/org/springframework/test/transaction/CallCountingTransactionManager.java @@ -34,21 +34,25 @@ public class CallCountingTransactionManager extends AbstractPlatformTransactionM public int inflight; + @Override protected Object doGetTransaction() { return new Object(); } + @Override protected void doBegin(Object transaction, TransactionDefinition definition) { this.lastDefinition = definition; ++begun; ++inflight; } + @Override protected void doCommit(DefaultTransactionStatus status) { ++commits; --inflight; } + @Override protected void doRollback(DefaultTransactionStatus status) { ++rollbacks; --inflight; diff --git a/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java b/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java index 5b64657360d..7e10a054531 100644 --- a/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java +++ b/spring-test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java @@ -86,6 +86,7 @@ public class ReflectionTestUtilsTests { new AssertThrows(IllegalArgumentException.class, "Calling setField() with NULL for a primitive type should throw an IllegalArgumentException.") { + @Override public void test() throws Exception { setField(person, "id", null, long.class); } @@ -94,6 +95,7 @@ public class ReflectionTestUtilsTests { new AssertThrows(IllegalArgumentException.class, "Calling setField() with NULL for a primitive type should throw an IllegalArgumentException.") { + @Override public void test() throws Exception { setField(person, "age", null, int.class); } @@ -102,6 +104,7 @@ public class ReflectionTestUtilsTests { new AssertThrows(IllegalArgumentException.class, "Calling setField() with NULL for a primitive type should throw an IllegalArgumentException.") { + @Override public void test() throws Exception { setField(person, "likesPets", null, boolean.class); } @@ -187,6 +190,7 @@ public class ReflectionTestUtilsTests { new AssertThrows(IllegalArgumentException.class, "Calling invokeSetterMethod() with NULL for a primitive type should throw an IllegalArgumentException.") { + @Override public void test() throws Exception { invokeSetterMethod(person, "id", null, long.class); } @@ -195,6 +199,7 @@ public class ReflectionTestUtilsTests { new AssertThrows(IllegalArgumentException.class, "Calling invokeSetterMethod() with NULL for a primitive type should throw an IllegalArgumentException.") { + @Override public void test() throws Exception { invokeSetterMethod(person, "age", null, int.class); } @@ -203,6 +208,7 @@ public class ReflectionTestUtilsTests { new AssertThrows(IllegalArgumentException.class, "Calling invokeSetterMethod() with NULL for a primitive type should throw an IllegalArgumentException.") { + @Override public void test() throws Exception { invokeSetterMethod(person, "likesPets", null, boolean.class); } diff --git a/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java index 0940539f54a..8ada7848fa9 100644 --- a/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -51,12 +51,14 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void setBeanName(String beanName) { if (this.beanName == null || beanName == null) { this.beanName = beanName; } } + @Override public String getBeanName() { return beanName; } @@ -75,10 +77,12 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void destroy() { this.destroyed = true; } + @Override public boolean wasDestroyed() { return destroyed; } diff --git a/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-tx/src/test/java/org/springframework/beans/TestBean.java b/spring-tx/src/test/java/org/springframework/beans/TestBean.java index 7842bbfeacf..7a27cf0894e 100644 --- a/spring-tx/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-tx/src/test/java/org/springframework/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see org.springframework.beans.ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java b/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java index e2bfda3f1d6..c1be3a57455 100644 --- a/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java +++ b/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java @@ -40,6 +40,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { private final List imports = new LinkedList(); + @Override public void defaultsRegistered(DefaultsDefinition defaultsDefinition) { this.defaults.add(defaultsDefinition); } @@ -48,6 +49,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return Collections.unmodifiableList(this.defaults); } + @Override public void componentRegistered(ComponentDefinition componentDefinition) { this.componentDefinitions.put(componentDefinition.getName(), componentDefinition); } @@ -61,6 +63,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return (ComponentDefinition[]) collection.toArray(new ComponentDefinition[collection.size()]); } + @Override public void aliasRegistered(AliasDefinition aliasDefinition) { List aliases = (List) this.aliasMap.get(aliasDefinition.getBeanName()); if(aliases == null) { @@ -75,6 +78,7 @@ public class CollectingReaderEventListener implements ReaderEventListener { return aliases == null ? null : Collections.unmodifiableList(aliases); } + @Override public void importProcessed(ImportDefinition importDefinition) { this.imports.add(importDefinition); } diff --git a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java index 8099156006c..9142a73b5bc 100644 --- a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java +++ b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java @@ -167,12 +167,14 @@ public class PersistenceExceptionTranslationAdvisorTests extends TestCase { this.runtimeException = rex; } + @Override public void noThrowsClause() { if (runtimeException != null) { throw runtimeException; } } + @Override public void throwsPersistenceException() throws PersistenceException { if (runtimeException != null) { throw runtimeException; diff --git a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java index 3b759466a57..2bd949d3ad1 100644 --- a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java +++ b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java @@ -114,6 +114,7 @@ public class PersistenceExceptionTranslationPostProcessorTests extends TestCase public static class RepositoryWithoutInterfaceAndOtherwiseAdvised extends StereotypedRepositoryInterfaceImpl implements Additional { + @Override public void additionalMethod() { } } diff --git a/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java b/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java index e0a4523bfb2..bdab740fbaa 100644 --- a/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java +++ b/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java @@ -270,6 +270,7 @@ public class DataAccessUtilsTests extends TestCase { this.translations.put(in, out); } + @Override public DataAccessException translateExceptionIfPossible(RuntimeException ex) { return (DataAccessException) translations.get(ex); } diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java index 16f1012a75e..ce88bbf03d0 100644 --- a/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java +++ b/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java @@ -81,6 +81,7 @@ public class CciLocalTransactionTests { TransactionTemplate tt = new TransactionTemplate(tm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(connectionFactory)); CciTemplate ct = new CciTemplate(connectionFactory); @@ -131,6 +132,7 @@ public class CciLocalTransactionTests { try { tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(connectionFactory)); CciTemplate ct = new CciTemplate(connectionFactory); diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java index 50bdd4c2de7..f8a72506215 100644 --- a/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java +++ b/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java @@ -153,6 +153,7 @@ public class CciTemplateTests { CciTemplate ct = new CciTemplate(connectionFactory); ct.setOutputRecordCreator(new RecordCreator() { + @Override public Record createRecord(RecordFactory recordFactory) { assertTrue(recordFactory instanceof NotSupportedRecordFactory); return outputRecord; diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java index bd8f7fb5d00..a7e40c6bf4b 100644 --- a/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java +++ b/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java @@ -233,10 +233,12 @@ public class EisOperationTests { this.callDetector = callDetector; } + @Override protected Record createInputRecord(RecordFactory recordFactory, Object inputObject) { return this.callDetector.callCreateInputRecord(recordFactory, inputObject); } + @Override protected Object extractOutputData(Record outputRecord) throws ResourceException { return this.callDetector.callExtractOutputData(outputRecord); } diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java index 10ae6d42837..9b3d10470da 100644 --- a/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java +++ b/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java @@ -70,6 +70,7 @@ public class ExpectedLookupTemplate extends JndiTemplate { * return the object provided in the constructor. If the name is * unexpected, a respective NamingException gets thrown. */ + @Override public Object lookup(String name) throws NamingException { Object object = this.jndiObjects.get(name); if (object == null) { diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java index c71d6e86810..5ab0d313777 100644 --- a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java +++ b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java @@ -91,6 +91,7 @@ public class SimpleNamingContext implements Context { // Actual implementations of Context methods follow + @Override public NamingEnumeration list(String root) throws NamingException { if (logger.isDebugEnabled()) { logger.debug("Listing name/class pairs under [" + root + "]"); @@ -98,6 +99,7 @@ public class SimpleNamingContext implements Context { return new NameClassPairEnumeration(this, root); } + @Override public NamingEnumeration listBindings(String root) throws NamingException { if (logger.isDebugEnabled()) { logger.debug("Listing bindings under [" + root + "]"); @@ -111,6 +113,7 @@ public class SimpleNamingContext implements Context { * Will be used by any standard InitialContext JNDI lookups. * @throws javax.naming.NameNotFoundException if the object could not be found */ + @Override public Object lookup(String lookupName) throws NameNotFoundException { String name = this.root + lookupName; if (logger.isDebugEnabled()) { @@ -136,6 +139,7 @@ public class SimpleNamingContext implements Context { return found; } + @Override public Object lookupLink(String name) throws NameNotFoundException { return lookup(name); } @@ -147,6 +151,7 @@ public class SimpleNamingContext implements Context { * Use SimpleNamingContextBuilder to set up JNDI bindings then. * @see org.springframework.mock.jndi.SimpleNamingContextBuilder#bind */ + @Override public void bind(String name, Object obj) { if (logger.isInfoEnabled()) { logger.info("Static JNDI binding: [" + this.root + name + "] = [" + obj + "]"); @@ -154,6 +159,7 @@ public class SimpleNamingContext implements Context { this.boundObjects.put(this.root + name, obj); } + @Override public void unbind(String name) { if (logger.isInfoEnabled()) { logger.info("Static JNDI remove: [" + this.root + name + "]"); @@ -161,16 +167,19 @@ public class SimpleNamingContext implements Context { this.boundObjects.remove(this.root + name); } + @Override public void rebind(String name, Object obj) { bind(name, obj); } + @Override public void rename(String oldName, String newName) throws NameNotFoundException { Object obj = lookup(oldName); unbind(oldName); bind(newName, obj); } + @Override public Context createSubcontext(String name) { String subcontextName = this.root + name; if (!subcontextName.endsWith("/")) { @@ -181,84 +190,104 @@ public class SimpleNamingContext implements Context { return subcontext; } + @Override public void destroySubcontext(String name) { unbind(name); } + @Override public String composeName(String name, String prefix) { return prefix + name; } + @Override public Hashtable getEnvironment() { return this.environment; } + @Override public Object addToEnvironment(String propName, Object propVal) { return this.environment.put(propName, propVal); } + @Override public Object removeFromEnvironment(String propName) { return this.environment.remove(propName); } + @Override public void close() { } // Unsupported methods follow: no support for javax.naming.Name + @Override public NamingEnumeration list(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public NamingEnumeration listBindings(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Object lookup(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Object lookupLink(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void bind(Name name, Object obj) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void unbind(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void rebind(Name name, Object obj) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void rename(Name oldName, Name newName) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Context createSubcontext(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public void destroySubcontext(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public String getNameInNamespace() throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public NameParser getNameParser(Name name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public NameParser getNameParser(String name) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } + @Override public Name composeName(Name name, Name prefix) throws NamingException { throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]"); } @@ -298,22 +327,27 @@ public class SimpleNamingContext implements Context { protected abstract T createObject(String strippedName, Object obj); + @Override public boolean hasMore() { return this.iterator.hasNext(); } + @Override public T next() { return this.iterator.next(); } + @Override public boolean hasMoreElements() { return this.iterator.hasNext(); } + @Override public T nextElement() { return this.iterator.next(); } + @Override public void close() { } } @@ -325,6 +359,7 @@ public class SimpleNamingContext implements Context { super(context, root); } + @Override protected NameClassPair createObject(String strippedName, Object obj) { return new NameClassPair(strippedName, obj.getClass().getName()); } @@ -337,6 +372,7 @@ public class SimpleNamingContext implements Context { super(context, root); } + @Override protected Binding createObject(String strippedName, Object obj) { return new Binding(strippedName, obj); } diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java index f21936897b3..32908a306aa 100644 --- a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java +++ b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java @@ -192,6 +192,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder * creating a new SimpleNamingContext instance. * @see SimpleNamingContext */ + @Override public InitialContextFactory createInitialContextFactory(Hashtable environment) { if (activated == null && environment != null) { Object icf = environment.get(Context.INITIAL_CONTEXT_FACTORY); @@ -225,6 +226,7 @@ public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder // Default case... return new InitialContextFactory() { + @Override @SuppressWarnings("unchecked") public Context getInitialContext(Hashtable environment) { return new SimpleNamingContext("", boundObjects, (Hashtable) environment); diff --git a/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java index 0c0b3cb81cf..02996e490f8 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java +++ b/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java @@ -32,21 +32,25 @@ public class CallCountingTransactionManager extends AbstractPlatformTransactionM public int rollbacks; public int inflight; + @Override protected Object doGetTransaction() { return new Object(); } + @Override protected void doBegin(Object transaction, TransactionDefinition definition) { this.lastDefinition = definition; ++begun; ++inflight; } + @Override protected void doCommit(DefaultTransactionStatus status) { ++commits; --inflight; } + @Override protected void doRollback(DefaultTransactionStatus status) { ++rollbacks; --inflight; diff --git a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java index c78fdcf43cb..ecacf398aae 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java @@ -112,6 +112,7 @@ public class JndiJtaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); @@ -157,6 +158,7 @@ public class JndiJtaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); @@ -206,6 +208,7 @@ public class JndiJtaTransactionManagerTests extends TestCase { assertTrue(!TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); @@ -215,6 +218,7 @@ public class JndiJtaTransactionManagerTests extends TestCase { ptm.setJndiTemplate(new ExpectedLookupTemplate("java:comp/UserTransaction", ut2)); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); @@ -232,6 +236,7 @@ public class JndiJtaTransactionManagerTests extends TestCase { * Prevent any side-effects due to this test modifying ThreadLocals that might * affect subsequent tests when all tests are run in the same JVM, as with Eclipse. */ + @Override protected void tearDown() { assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); diff --git a/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java index 480b869d3aa..b2522b08a87 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java @@ -78,6 +78,7 @@ public class JtaTransactionManagerTests extends TestCase { assertNull(TransactionSynchronizationManager.getCurrentTransactionName()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); @@ -124,6 +125,7 @@ public class JtaTransactionManagerTests extends TestCase { ptm.setTransactionSynchronization(JtaTransactionManager.SYNCHRONIZATION_ON_ACTUAL_TRANSACTION); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); @@ -156,6 +158,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); } @@ -197,6 +200,7 @@ public class JtaTransactionManagerTests extends TestCase { assertNull(TransactionSynchronizationManager.getCurrentTransactionName()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -242,6 +246,7 @@ public class JtaTransactionManagerTests extends TestCase { tt.setTimeout(10); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -277,6 +282,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); status.setRollbackOnly(); @@ -308,6 +314,7 @@ public class JtaTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(ptm); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -342,6 +349,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -383,6 +391,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -421,6 +430,7 @@ public class JtaTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(ptm); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -454,6 +464,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -500,6 +511,7 @@ public class JtaTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(ptm); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -538,6 +550,7 @@ public class JtaTransactionManagerTests extends TestCase { ptm.setTransactionSynchronization(JtaTransactionManager.SYNCHRONIZATION_ON_ACTUAL_TRANSACTION); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -566,6 +579,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); status.setRollbackOnly(); @@ -598,6 +612,7 @@ public class JtaTransactionManagerTests extends TestCase { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -630,6 +645,7 @@ public class JtaTransactionManagerTests extends TestCase { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); TransactionSynchronizationManager.registerSynchronization(synch); @@ -657,6 +673,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); status.setRollbackOnly(); @@ -682,6 +699,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); status.setRollbackOnly(); @@ -713,6 +731,7 @@ public class JtaTransactionManagerTests extends TestCase { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); status.setRollbackOnly(); @@ -757,6 +776,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertEquals("txName", TransactionSynchronizationManager.getCurrentTransactionName()); @@ -767,6 +787,7 @@ public class JtaTransactionManagerTests extends TestCase { tt2.setReadOnly(true); tt2.setName("txName2"); tt2.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertEquals("txName2", TransactionSynchronizationManager.getCurrentTransactionName()); @@ -804,6 +825,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -812,6 +834,7 @@ public class JtaTransactionManagerTests extends TestCase { TransactionTemplate tt2 = new TransactionTemplate(ptm); tt2.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); tt2.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -854,6 +877,7 @@ public class JtaTransactionManagerTests extends TestCase { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); } @@ -882,6 +906,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); } @@ -921,6 +946,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); } @@ -958,6 +984,7 @@ public class JtaTransactionManagerTests extends TestCase { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); } @@ -980,6 +1007,7 @@ public class JtaTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); try { tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { } }); @@ -1005,6 +1033,7 @@ public class JtaTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(ptm); tt.setIsolationLevel(TransactionDefinition.ISOLATION_SERIALIZABLE); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional } @@ -1029,6 +1058,7 @@ public class JtaTransactionManagerTests extends TestCase { JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional } @@ -1057,6 +1087,7 @@ public class JtaTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(ptm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional } @@ -1079,6 +1110,7 @@ public class JtaTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(ptm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional } @@ -1106,6 +1138,7 @@ public class JtaTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(ptm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional } @@ -1132,6 +1165,7 @@ public class JtaTransactionManagerTests extends TestCase { JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional } @@ -1162,9 +1196,11 @@ public class JtaTransactionManagerTests extends TestCase { JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { assertTrue("Correct completion status", status == TransactionSynchronization.STATUS_ROLLED_BACK); } @@ -1218,9 +1254,11 @@ public class JtaTransactionManagerTests extends TestCase { TransactionTemplate tt = new TransactionTemplate(tm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { assertTrue("Correct completion status", status == TransactionSynchronization.STATUS_ROLLED_BACK); } @@ -1266,9 +1304,11 @@ public class JtaTransactionManagerTests extends TestCase { JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { assertTrue("Correct completion status", status == TransactionSynchronization.STATUS_UNKNOWN); } @@ -1302,9 +1342,11 @@ public class JtaTransactionManagerTests extends TestCase { JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { assertTrue("Correct completion status", status == TransactionSynchronization.STATUS_UNKNOWN); } @@ -1338,9 +1380,11 @@ public class JtaTransactionManagerTests extends TestCase { JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { // something transactional TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { assertTrue("Correct completion status", status == TransactionSynchronization.STATUS_UNKNOWN); } @@ -1373,8 +1417,10 @@ public class JtaTransactionManagerTests extends TestCase { JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { assertTrue("Correct completion status", status == TransactionSynchronization.STATUS_UNKNOWN); } @@ -1404,6 +1450,7 @@ public class JtaTransactionManagerTests extends TestCase { JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { status.setRollbackOnly(); } @@ -1430,9 +1477,11 @@ public class JtaTransactionManagerTests extends TestCase { JtaTransactionManager ptm = newJtaTransactionManager(ut); TransactionTemplate tt = new TransactionTemplate(ptm); tt.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { status.setRollbackOnly(); TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { assertTrue("Correct completion status", status == TransactionSynchronization.STATUS_UNKNOWN); } @@ -1562,6 +1611,7 @@ public class JtaTransactionManagerTests extends TestCase { * Prevent any side-effects due to this test modifying ThreadLocals that might * affect subsequent tests when all tests are run in the same JVM, as with Eclipse. */ + @Override protected void tearDown() { assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); diff --git a/spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java index f810e715b9b..7c250610542 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java +++ b/spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java @@ -30,6 +30,7 @@ public class MockCallbackPreferringTransactionManager implements CallbackPreferr private TransactionStatus status; + @Override public Object execute(TransactionDefinition definition, TransactionCallback callback) throws TransactionException { this.definition = definition; this.status = new SimpleTransactionStatus(); @@ -45,14 +46,17 @@ public class MockCallbackPreferringTransactionManager implements CallbackPreferr } + @Override public TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException { throw new UnsupportedOperationException(); } + @Override public void commit(TransactionStatus status) throws TransactionException { throw new UnsupportedOperationException(); } + @Override public void rollback(TransactionStatus status) throws TransactionException { throw new UnsupportedOperationException(); } diff --git a/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java b/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java index c9c8709c48b..de79edcd747 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java +++ b/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java @@ -28,10 +28,12 @@ public class MockJtaTransaction implements javax.transaction.Transaction { private Synchronization synchronization; + @Override public int getStatus() { return Status.STATUS_ACTIVE; } + @Override public void registerSynchronization(Synchronization synchronization) { this.synchronization = synchronization; } @@ -40,20 +42,25 @@ public class MockJtaTransaction implements javax.transaction.Transaction { return synchronization; } + @Override public boolean enlistResource(XAResource xaResource) { return false; } + @Override public boolean delistResource(XAResource xaResource, int i) { return false; } + @Override public void commit() { } + @Override public void rollback() { } + @Override public void setRollbackOnly() { } diff --git a/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java index 1fdd0659ebe..579e1a815f3 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java +++ b/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java @@ -46,14 +46,17 @@ class TestTransactionManager extends AbstractPlatformTransactionManager { setTransactionSynchronization(SYNCHRONIZATION_NEVER); } + @Override protected Object doGetTransaction() { return TRANSACTION; } + @Override protected boolean isExistingTransaction(Object transaction) { return existingTransaction; } + @Override protected void doBegin(Object transaction, TransactionDefinition definition) { if (!TRANSACTION.equals(transaction)) { throw new IllegalArgumentException("Not the same transaction object"); @@ -64,6 +67,7 @@ class TestTransactionManager extends AbstractPlatformTransactionManager { this.begin = true; } + @Override protected void doCommit(DefaultTransactionStatus status) { if (!TRANSACTION.equals(status.getTransaction())) { throw new IllegalArgumentException("Not the same transaction object"); @@ -71,6 +75,7 @@ class TestTransactionManager extends AbstractPlatformTransactionManager { this.commit = true; } + @Override protected void doRollback(DefaultTransactionStatus status) { if (!TRANSACTION.equals(status.getTransaction())) { throw new IllegalArgumentException("Not the same transaction object"); @@ -78,6 +83,7 @@ class TestTransactionManager extends AbstractPlatformTransactionManager { this.rollback = true; } + @Override protected void doSetRollbackOnly(DefaultTransactionStatus status) { if (!TRANSACTION.equals(status.getTransaction())) { throw new IllegalArgumentException("Not the same transaction object"); diff --git a/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java b/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java index 13646322584..e29ecca39fb 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java @@ -139,6 +139,7 @@ public class TransactionSupportTests extends TestCase { TestTransactionManager tm = new TestTransactionManager(false, true); TransactionTemplate template = new TransactionTemplate(tm); template.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { } }); @@ -152,6 +153,7 @@ public class TransactionSupportTests extends TestCase { MockCallbackPreferringTransactionManager ptm = new MockCallbackPreferringTransactionManager(); TransactionTemplate template = new TransactionTemplate(ptm); template.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { } }); @@ -165,6 +167,7 @@ public class TransactionSupportTests extends TestCase { final RuntimeException ex = new RuntimeException("Some application exception"); try { template.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { throw ex; } @@ -185,6 +188,7 @@ public class TransactionSupportTests extends TestCase { public void testTransactionTemplateWithRollbackException() { final TransactionSystemException tex = new TransactionSystemException("system exception"); TestTransactionManager tm = new TestTransactionManager(false, true) { + @Override protected void doRollback(DefaultTransactionStatus status) { super.doRollback(status); throw tex; @@ -194,6 +198,7 @@ public class TransactionSupportTests extends TestCase { final RuntimeException ex = new RuntimeException("Some application exception"); try { template.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { throw ex; } @@ -215,6 +220,7 @@ public class TransactionSupportTests extends TestCase { TransactionTemplate template = new TransactionTemplate(tm); try { template.execute(new TransactionCallbackWithoutResult() { + @Override protected void doInTransactionWithoutResult(TransactionStatus status) { throw new Error("Some application error"); } @@ -277,6 +283,7 @@ public class TransactionSupportTests extends TestCase { assertTrue("Correct isolation level set", template.getIsolationLevel() == TransactionDefinition.ISOLATION_REPEATABLE_READ); } + @Override protected void tearDown() { assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); diff --git a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java index e2a96b972ac..e76730f727c 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java @@ -36,6 +36,7 @@ public class TxNamespaceHandlerEventTests extends TestCase { private CollectingReaderEventListener eventListener = new CollectingReaderEventListener(); + @Override public void setUp() throws Exception { XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(this.beanFactory); reader.setEventListener(this.eventListener); diff --git a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java index cfae77ca56b..72f1bdac10a 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java @@ -40,6 +40,7 @@ public class TxNamespaceHandlerTests extends TestCase { private Method setAgeMethod; + @Override public void setUp() throws Exception { this.context = new ClassPathXmlApplicationContext("txNamespaceHandlerTests.xml", getClass()); this.getAgeMethod = ITestBean.class.getMethod("getAge", new Class[0]); diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java index 1dfd6a1bb1c..16f29f90f6d 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java @@ -311,18 +311,22 @@ public class AnnotationTransactionAttributeSourceTests { this.age = age; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -344,19 +348,23 @@ public class AnnotationTransactionAttributeSourceTests { this.age = age; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override @Transactional(rollbackFor=Exception.class) public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -377,18 +385,22 @@ public class AnnotationTransactionAttributeSourceTests { this.age = age; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -409,20 +421,24 @@ public class AnnotationTransactionAttributeSourceTests { this.age = age; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override @Transactional(propagation=Propagation.REQUIRES_NEW, isolation=Isolation.REPEATABLE_READ, timeout=5, readOnly=true, rollbackFor=Exception.class, noRollbackFor={IOException.class}) public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -444,18 +460,22 @@ public class AnnotationTransactionAttributeSourceTests { this.age = age; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -495,6 +515,7 @@ public class AnnotationTransactionAttributeSourceTests { public static class MyFoo implements Foo { + @Override @Transactional public void doSomething(String theArgument) { System.out.println(theArgument); @@ -508,20 +529,24 @@ public class AnnotationTransactionAttributeSourceTests { private int age; + @Override @javax.ejb.TransactionAttribute(TransactionAttributeType.SUPPORTS) public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override @javax.ejb.TransactionAttribute public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -535,19 +560,23 @@ public class AnnotationTransactionAttributeSourceTests { private int age; + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override @javax.ejb.TransactionAttribute public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -574,18 +603,22 @@ public class AnnotationTransactionAttributeSourceTests { private int age; + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java index 608512aefa0..a38057e1086 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java @@ -36,6 +36,7 @@ public class AnnotationTransactionInterceptorTests extends TestCase { private TransactionInterceptor ti; + @Override public void setUp() { this.ptm = new CallCountingTransactionManager(); this.source = new AnnotationTransactionAttributeSource(); @@ -319,11 +320,13 @@ public class AnnotationTransactionInterceptorTests extends TestCase { public static class TestWithInterfaceImpl implements TestWithInterface { + @Override public void doSomething() { assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); } + @Override public void doSomethingElse() { assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); assertTrue(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); @@ -345,13 +348,16 @@ public class AnnotationTransactionInterceptorTests extends TestCase { public static class SomeServiceImpl implements SomeService { + @Override public void bar() { } + @Override @Transactional public void foo() { } + @Override @Transactional(readOnly = false) public void fooBar() { } @@ -367,6 +373,7 @@ public class AnnotationTransactionInterceptorTests extends TestCase { @Transactional public static class OtherServiceImpl implements OtherService { + @Override public void foo() { } } diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java index 36c076ce521..564887d4248 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java @@ -41,11 +41,13 @@ public class AnnotationTransactionNamespaceHandlerTests extends TestCase { private ConfigurableApplicationContext context; + @Override public void setUp() { this.context = new ClassPathXmlApplicationContext( "org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml"); } + @Override protected void tearDown() { this.context.close(); } diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java index fcbc5e880ab..11eff8c216a 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java @@ -127,6 +127,7 @@ public class EnableTransactionManagementTests { return new CallCountingTransactionManager(); } + @Override public PlatformTransactionManager annotationDrivenTransactionManager() { return txManager2(); } diff --git a/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java b/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java index ec6f49fe145..5768b1bd9b7 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java @@ -87,6 +87,7 @@ public class AnnotationDrivenTests extends TestCase { @SuppressWarnings("serial") public static class TransactionCheckingInterceptor implements MethodInterceptor, Serializable { + @Override public Object invoke(MethodInvocation methodInvocation) throws Throwable { if (methodInvocation.getMethod().getName().equals("setSomething")) { assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java index 59947292cfd..ffad95f811f 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java @@ -250,6 +250,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase { final String spouseName = "innerName"; TestBean outer = new TestBean() { + @Override public void exceptional(Throwable t) throws Throwable { TransactionInfo ti = TransactionAspectSupport.currentTransactionInfo(); assertTrue(ti.hasTransaction()); @@ -257,6 +258,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase { } }; TestBean inner = new TestBean() { + @Override public String getName() { // Assert that we're in the inner proxy TransactionInfo ti = TransactionAspectSupport.currentTransactionInfo(); @@ -311,6 +313,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase { final String spouseName = "innerName"; TestBean outer = new TestBean() { + @Override public void exceptional(Throwable t) throws Throwable { TransactionInfo ti = TransactionAspectSupport.currentTransactionInfo(); assertTrue(ti.hasTransaction()); @@ -319,6 +322,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase { } }; TestBean inner = new TestBean() { + @Override public String getName() { // Assert that we're in the inner proxy TransactionInfo ti = TransactionAspectSupport.currentTransactionInfo(); @@ -386,6 +390,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase { final Exception ex, final boolean shouldRollback, boolean rollbackException) throws Exception { TransactionAttribute txatt = new DefaultTransactionAttribute() { + @Override public boolean rollbackOn(Throwable t) { assertTrue(t == ex); return shouldRollback; @@ -461,6 +466,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase { final String name = "jenny"; TestBean tb = new TestBean() { + @Override public String getName() { TransactionStatus txStatus = TransactionInterceptor.currentTransactionStatus(); txStatus.setRollbackOnly(); @@ -504,6 +510,7 @@ public abstract class AbstractTransactionAspectTests extends TestCase { ptmControl.replay(); TestBean tb = new TestBean() { + @Override public String getName() { throw new UnsupportedOperationException( "Shouldn't have invoked target method when couldn't create transaction for transactional method"); diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java index 27d72c2dc4e..593c4dd4643 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java @@ -50,6 +50,7 @@ public class BeanFactoryTransactionTests extends TestCase { private XmlBeanFactory factory; + @Override public void setUp() { this.factory = new XmlBeanFactory(new ClassPathResource("transactionalBeanFactory.xml", getClass())); } @@ -127,6 +128,7 @@ public class BeanFactoryTransactionTests extends TestCase { final TransactionStatus ts = (TransactionStatus) statusControl.getMock(); ptm = new PlatformTransactionManager() { private boolean invoked; + @Override public TransactionStatus getTransaction(TransactionDefinition def) throws TransactionException { if (invoked) { throw new IllegalStateException("getTransaction should not get invoked more than once"); @@ -138,9 +140,11 @@ public class BeanFactoryTransactionTests extends TestCase { } return ts; } + @Override public void commit(TransactionStatus status) throws TransactionException { assertTrue(status == ts); } + @Override public void rollback(TransactionStatus status) throws TransactionException { throw new IllegalStateException("rollback should not get invoked"); } @@ -204,6 +208,7 @@ public class BeanFactoryTransactionTests extends TestCase { int counter = 0; + @Override public boolean matches(Method method, Class clazz) { counter++; return true; @@ -215,6 +220,7 @@ public class BeanFactoryTransactionTests extends TestCase { int counter = 0; + @Override public Object invoke(MethodInvocation methodInvocation) throws Throwable { counter++; return methodInvocation.proceed(); diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java index a260d3ef719..7c2eed8ac97 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java @@ -40,10 +40,12 @@ public class MapTransactionAttributeSource extends AbstractFallbackTransactionAt } + @Override protected TransactionAttribute findTransactionAttribute(Method method) { return this.attributeMap.get(method); } + @Override protected TransactionAttribute findTransactionAttribute(Class clazz) { return this.attributeMap.get(clazz); } diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java index 7aa4a1e275b..a6cc819e628 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java @@ -37,14 +37,17 @@ public class PlatformTransactionManagerFacade implements PlatformTransactionMana */ public static PlatformTransactionManager delegate; + @Override public TransactionStatus getTransaction(TransactionDefinition definition) { return delegate.getTransaction(definition); } + @Override public void commit(TransactionStatus status) { delegate.commit(status); } + @Override public void rollback(TransactionStatus status) { delegate.rollback(status); } diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java index 5255b972ac8..a9f3775b948 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java @@ -34,6 +34,7 @@ import org.springframework.util.SerializationTestUtils; */ public class TransactionInterceptorTests extends AbstractTransactionAspectTests { + @Override protected Object advised(Object target, PlatformTransactionManager ptm, TransactionAttributeSource[] tas) throws Exception { TransactionInterceptor ti = new TransactionInterceptor(); ti.setTransactionManager(ptm); @@ -49,6 +50,7 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests * target object and transaction setup. * Creates a TransactionInterceptor and applies it. */ + @Override protected Object advised(Object target, PlatformTransactionManager ptm, TransactionAttributeSource tas) { TransactionInterceptor ti = new TransactionInterceptor(); ti.setTransactionManager(ptm); @@ -111,14 +113,17 @@ public class TransactionInterceptorTests extends AbstractTransactionAspectTests @SuppressWarnings("serial") public static class SerializableTransactionManager implements PlatformTransactionManager, Serializable { + @Override public TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException { throw new UnsupportedOperationException(); } + @Override public void commit(TransactionStatus status) throws TransactionException { throw new UnsupportedOperationException(); } + @Override public void rollback(TransactionStatus status) throws TransactionException { throw new UnsupportedOperationException(); } diff --git a/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java b/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java index 94ca9025802..7eaad371bfe 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java +++ b/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java @@ -48,6 +48,7 @@ public class MockUOWManager implements UOWManager { private final List synchronizations = new LinkedList(); + @Override public void runUnderUOW(int type, boolean join, UOWAction action) throws UOWActionException, UOWException { this.type = type; this.joined = join; @@ -70,6 +71,7 @@ public class MockUOWManager implements UOWManager { } } + @Override public int getUOWType() { return this.type; } @@ -78,22 +80,27 @@ public class MockUOWManager implements UOWManager { return this.joined; } + @Override public long getLocalUOWId() { return 0; } + @Override public void setUOWTimeout(int uowType, int timeout) { this.timeout = timeout; } + @Override public int getUOWTimeout() { return this.timeout; } + @Override public void setRollbackOnly() { this.rollbackOnly = true; } + @Override public boolean getRollbackOnly() { return this.rollbackOnly; } @@ -102,18 +109,22 @@ public class MockUOWManager implements UOWManager { this.status = status; } + @Override public int getUOWStatus() { return this.status; } + @Override public void putResource(Object key, Object value) { this.resources.put(key, value); } + @Override public Object getResource(Object key) throws NullPointerException { return this.resources.get(key); } + @Override public void registerInterposedSynchronization(Synchronization sync) { this.synchronizations.add(sync); } diff --git a/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java index b6dbf51348f..5f9d5ba6309 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java @@ -52,6 +52,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { DefaultTransactionDefinition definition = new DefaultTransactionDefinition(); assertEquals("result", ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return "result"; } @@ -87,6 +88,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { TransactionStatus ts = ptm.getTransaction(definition); ptm.commit(ts); assertEquals("result", ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return "result"; } @@ -105,6 +107,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { try { ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return "result"; } @@ -174,6 +177,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result", ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { if (synchMode == WebSphereUowTransactionManager.SYNCHRONIZATION_ALWAYS) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); @@ -257,6 +261,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result", ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { if (synchMode != WebSphereUowTransactionManager.SYNCHRONIZATION_NEVER) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); @@ -294,6 +299,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result", ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); @@ -315,6 +321,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { public void testNewTransactionWithCommitException() { final RollbackException rex = new RollbackException(); MockUOWManager manager = new MockUOWManager() { + @Override public void runUnderUOW(int type, boolean join, UOWAction action) throws UOWException { throw new UOWException(rex); } @@ -328,6 +335,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { try { ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); @@ -362,6 +370,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { try { ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); @@ -395,6 +404,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result", ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); @@ -425,6 +435,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result", ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); @@ -452,6 +463,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { try { ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return "result"; } @@ -472,6 +484,7 @@ public class WebSphereUowTransactionManagerTests extends TestCase { try { ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return "result"; } @@ -508,11 +521,13 @@ public class WebSphereUowTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result", ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result2", ptm.execute(definition2, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); @@ -555,11 +570,13 @@ public class WebSphereUowTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result", ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result2", ptm.execute(definition2, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertEquals(propagationBehavior == TransactionDefinition.PROPAGATION_REQUIRES_NEW, @@ -600,11 +617,13 @@ public class WebSphereUowTransactionManagerTests extends TestCase { assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result", ptm.execute(definition, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertEquals("result2", ptm.execute(definition2, new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isActualTransactionActive()); diff --git a/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java index 0940539f54a..8ada7848fa9 100644 --- a/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -51,12 +51,14 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void setBeanName(String beanName) { if (this.beanName == null || beanName == null) { this.beanName = beanName; } } + @Override public String getBeanName() { return beanName; } @@ -75,10 +77,12 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void destroy() { this.destroyed = true; } + @Override public boolean wasDestroyed() { return destroyed; } diff --git a/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java index 13c2c5447a5..9a2a3193df2 100644 --- a/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java +++ b/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java @@ -31,22 +31,27 @@ public class SerializablePerson implements Person, Serializable { private String name; private int age; + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override public Object echo(Object o) throws Throwable { if (o instanceof Throwable) { throw (Throwable) o; diff --git a/spring-web/src/test/java/org/springframework/beans/TestBean.java b/spring-web/src/test/java/org/springframework/beans/TestBean.java index 282a18352d7..e553f31f5b7 100644 --- a/spring-web/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-web/src/test/java/org/springframework/beans/TestBean.java @@ -143,6 +143,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -151,6 +152,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -167,10 +169,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -186,10 +190,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -202,6 +208,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } @@ -214,10 +221,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return (spouses != null ? (TestBean) spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -244,42 +253,52 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } + @Override public Integer[] getSomeIntegerArray() { return someIntegerArray; } + @Override public void setSomeIntegerArray(Integer[] someIntegerArray) { this.someIntegerArray = someIntegerArray; } + @Override public Integer[][] getNestedIntegerArray() { return nestedIntegerArray; } + @Override public void setNestedIntegerArray(Integer[][] nestedIntegerArray) { this.nestedIntegerArray = nestedIntegerArray; } + @Override public int[] getSomeIntArray() { return someIntArray; } + @Override public void setSomeIntArray(int[] someIntArray) { this.someIntArray = someIntArray; } + @Override public int[][] getNestedIntArray() { return nestedIntArray; } + @Override public void setNestedIntArray(int[][] nestedIntArray) { this.nestedIntArray = nestedIntArray; } @@ -340,6 +359,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -348,6 +368,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -380,6 +401,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -405,23 +427,28 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } + @Override public Object returnsThis() { return this; } + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -451,6 +478,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java index 006228975a7..f3d6eedefe1 100644 --- a/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java +++ b/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java @@ -74,6 +74,7 @@ public class DummyFactory * Return if the bean managed by this factory is a singleton. * @see FactoryBean#isSingleton() */ + @Override public boolean isSingleton() { return this.singleton; } @@ -85,6 +86,7 @@ public class DummyFactory this.singleton = singleton; } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -93,6 +95,7 @@ public class DummyFactory return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = (AutowireCapableBeanFactory) beanFactory; this.beanFactory.applyBeanPostProcessorsBeforeInitialization(this.testBean, this.beanName); @@ -119,6 +122,7 @@ public class DummyFactory return otherTestBean; } + @Override public void afterPropertiesSet() { if (initialized) { throw new RuntimeException("Cannot call afterPropertiesSet twice on the one bean"); @@ -144,6 +148,7 @@ public class DummyFactory * and prototype mode. * @see FactoryBean#getObject() */ + @Override public Object getObject() throws BeansException { if (isSingleton()) { return this.testBean; @@ -158,11 +163,13 @@ public class DummyFactory } } + @Override public Class getObjectType() { return TestBean.class; } + @Override public void destroy() { if (this.testBean != null) { this.testBean.setName(null); diff --git a/spring-web/src/test/java/org/springframework/core/task/MockRunnable.java b/spring-web/src/test/java/org/springframework/core/task/MockRunnable.java index 42b9adbfd56..a826a9c2076 100644 --- a/spring-web/src/test/java/org/springframework/core/task/MockRunnable.java +++ b/spring-web/src/test/java/org/springframework/core/task/MockRunnable.java @@ -23,6 +23,7 @@ public class MockRunnable implements Runnable { private boolean executed = false; + @Override public void run() { this.executed = true; } diff --git a/spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java b/spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java index 4461024f642..43dc47e3c6f 100644 --- a/spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java +++ b/spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java @@ -41,10 +41,12 @@ public class MockHttpInputMessage implements HttpInputMessage { this.body = body; } + @Override public HttpHeaders getHeaders() { return headers; } + @Override public InputStream getBody() throws IOException { return body; } diff --git a/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java b/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java index 323fff1af36..75f5db49b25 100644 --- a/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java +++ b/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java @@ -30,10 +30,12 @@ public class MockHttpOutputMessage implements HttpOutputMessage { private final ByteArrayOutputStream body = new ByteArrayOutputStream(); + @Override public HttpHeaders getHeaders() { return headers; } + @Override public OutputStream getBody() throws IOException { return body; } diff --git a/spring-web/src/test/java/org/springframework/http/client/BufferedSimpleHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/BufferedSimpleHttpRequestFactoryTests.java index 7408552ff58..4904ea31910 100644 --- a/spring-web/src/test/java/org/springframework/http/client/BufferedSimpleHttpRequestFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/BufferedSimpleHttpRequestFactoryTests.java @@ -28,6 +28,7 @@ public class BufferedSimpleHttpRequestFactoryTests extends AbstractHttpRequestFa return new SimpleClientHttpRequestFactory(); } + @Override @Test public void httpMethods() throws Exception { try { diff --git a/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java index 917e5de114b..0eabc67d937 100644 --- a/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java @@ -26,6 +26,7 @@ public class HttpComponentsClientHttpRequestFactoryTests extends AbstractHttpReq return new HttpComponentsClientHttpRequestFactory(); } + @Override @Test public void httpMethods() throws Exception { assertHttpMethod("patch", HttpMethod.PATCH); diff --git a/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java index 70f5e257d25..2df6331b8e3 100644 --- a/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/InterceptingClientHttpRequestFactoryTests.java @@ -79,6 +79,7 @@ public class InterceptingClientHttpRequestFactoryTests { public void noExecution() throws Exception { List interceptors = new ArrayList(); interceptors.add(new ClientHttpRequestInterceptor() { + @Override public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException { return responseMock; @@ -101,6 +102,7 @@ public class InterceptingClientHttpRequestFactoryTests { final String headerName = "Foo"; final String headerValue = "Bar"; ClientHttpRequestInterceptor interceptor = new ClientHttpRequestInterceptor() { + @Override public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException { @@ -134,6 +136,7 @@ public class InterceptingClientHttpRequestFactoryTests { public void changeURI() throws Exception { final URI changedUri = new URI("http://example.com/2"); ClientHttpRequestInterceptor interceptor = new ClientHttpRequestInterceptor() { + @Override public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException { @@ -166,6 +169,7 @@ public class InterceptingClientHttpRequestFactoryTests { public void changeMethod() throws Exception { final HttpMethod changedMethod = HttpMethod.POST; ClientHttpRequestInterceptor interceptor = new ClientHttpRequestInterceptor() { + @Override public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException { @@ -198,6 +202,7 @@ public class InterceptingClientHttpRequestFactoryTests { public void changeBody() throws Exception { final byte[] changedBody = "Foo".getBytes(); ClientHttpRequestInterceptor interceptor = new ClientHttpRequestInterceptor() { + @Override public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException { @@ -217,6 +222,7 @@ public class InterceptingClientHttpRequestFactoryTests { private boolean invoked = false; + @Override public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException { invoked = true; @@ -226,6 +232,7 @@ public class InterceptingClientHttpRequestFactoryTests { private class RequestFactoryMock implements ClientHttpRequestFactory { + @Override public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod) throws IOException { requestMock.setURI(uri); requestMock.setMethod(httpMethod); @@ -249,6 +256,7 @@ public class InterceptingClientHttpRequestFactoryTests { private RequestMock() { } + @Override public URI getURI() { return uri; } @@ -257,6 +265,7 @@ public class InterceptingClientHttpRequestFactoryTests { this.uri = uri; } + @Override public HttpMethod getMethod() { return method; } @@ -265,14 +274,17 @@ public class InterceptingClientHttpRequestFactoryTests { this.method = method; } + @Override public HttpHeaders getHeaders() { return headers; } + @Override public OutputStream getBody() throws IOException { return body; } + @Override public ClientHttpResponse execute() throws IOException { executed = true; return responseMock; @@ -287,26 +299,32 @@ public class InterceptingClientHttpRequestFactoryTests { private HttpHeaders headers = new HttpHeaders(); + @Override public HttpStatus getStatusCode() throws IOException { return statusCode; } + @Override public int getRawStatusCode() throws IOException { return statusCode.value(); } + @Override public String getStatusText() throws IOException { return statusText; } + @Override public HttpHeaders getHeaders() { return headers; } + @Override public InputStream getBody() throws IOException { return null; } + @Override public void close() { } } diff --git a/spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java index 8507cdbfe83..6adeed5ecab 100644 --- a/spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java @@ -47,6 +47,7 @@ public class StreamingSimpleHttpRequestFactoryTests extends AbstractHttpRequestF final String headerName = "MyHeader"; final String headerValue = "MyValue"; ClientHttpRequestInterceptor interceptor = new ClientHttpRequestInterceptor() { + @Override public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException { request.getHeaders().add(headerName, headerValue); diff --git a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java index 0771b1f4c73..7f1110d6efe 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java @@ -167,20 +167,24 @@ public class FormHttpMessageConverterTests { this.outputMessage = outputMessage; } + @Override public String getCharacterEncoding() { MediaType contentType = outputMessage.getHeaders().getContentType(); return contentType != null && contentType.getCharSet() != null ? contentType.getCharSet().name() : null; } + @Override public String getContentType() { MediaType contentType = outputMessage.getHeaders().getContentType(); return contentType != null ? contentType.toString() : null; } + @Override public int getContentLength() { return outputMessage.getBodyAsBytes().length; } + @Override public InputStream getInputStream() throws IOException { return new ByteArrayInputStream(outputMessage.getBodyAsBytes()); } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java b/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java index d3e3ff67857..f0a259edd20 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletInputStream.java @@ -54,10 +54,12 @@ public class DelegatingServletInputStream extends ServletInputStream { } + @Override public int read() throws IOException { return this.sourceStream.read(); } + @Override public void close() throws IOException { super.close(); this.sourceStream.close(); diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletOutputStream.java b/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletOutputStream.java index 5f32208ecb6..58aa59d49da 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletOutputStream.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/DelegatingServletOutputStream.java @@ -54,15 +54,18 @@ public class DelegatingServletOutputStream extends ServletOutputStream { } + @Override public void write(int b) throws IOException { this.targetStream.write(b); } + @Override public void flush() throws IOException { super.flush(); this.targetStream.flush(); } + @Override public void close() throws IOException { super.close(); this.targetStream.close(); diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockAsyncContext.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockAsyncContext.java index 00a632f47dc..f4ff566922c 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockAsyncContext.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockAsyncContext.java @@ -56,14 +56,17 @@ public class MockAsyncContext implements AsyncContext { this.response = (HttpServletResponse) response; } + @Override public ServletRequest getRequest() { return this.request; } + @Override public ServletResponse getResponse() { return this.response; } + @Override public boolean hasOriginalRequestAndResponse() { return (this.request instanceof MockHttpServletRequest) && (this.response instanceof MockHttpServletResponse); } @@ -72,18 +75,22 @@ public class MockAsyncContext implements AsyncContext { return this.dispatchedPath; } + @Override public void dispatch() { dispatch(this.request.getRequestURI()); } + @Override public void dispatch(String path) { dispatch(null, path); } + @Override public void dispatch(ServletContext context, String path) { this.dispatchedPath = path; } + @Override public void complete() { MockHttpServletRequest mockRequest = WebUtils.getNativeRequest(request, MockHttpServletRequest.class); if (mockRequest != null) { @@ -99,6 +106,7 @@ public class MockAsyncContext implements AsyncContext { } } + @Override public void start(Runnable runnable) { runnable.run(); } @@ -107,22 +115,27 @@ public class MockAsyncContext implements AsyncContext { return this.listeners; } + @Override public void addListener(AsyncListener listener) { this.listeners.add(listener); } + @Override public void addListener(AsyncListener listener, ServletRequest request, ServletResponse response) { this.listeners.add(listener); } + @Override public T createListener(Class clazz) throws ServletException { return BeanUtils.instantiateClass(clazz); } + @Override public long getTimeout() { return this.timeout; } + @Override public void setTimeout(long timeout) { this.timeout = timeout; } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockBodyContent.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockBodyContent.java index 7160e641557..eb3ebe8e8b6 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockBodyContent.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockBodyContent.java @@ -77,14 +77,17 @@ public class MockBodyContent extends BodyContent { } + @Override public Reader getReader() { return new StringReader(this.content); } + @Override public String getString() { return this.content; } + @Override public void writeOut(Writer writer) throws IOException { writer.write(this.content); } @@ -94,102 +97,127 @@ public class MockBodyContent extends BodyContent { // Delegating implementations of JspWriter's abstract methods //--------------------------------------------------------------------- + @Override public void clear() throws IOException { getEnclosingWriter().clear(); } + @Override public void clearBuffer() throws IOException { getEnclosingWriter().clearBuffer(); } + @Override public void close() throws IOException { getEnclosingWriter().close(); } + @Override public int getRemaining() { return getEnclosingWriter().getRemaining(); } + @Override public void newLine() throws IOException { getEnclosingWriter().println(); } + @Override public void write(char value[], int offset, int length) throws IOException { getEnclosingWriter().write(value, offset, length); } + @Override public void print(boolean value) throws IOException { getEnclosingWriter().print(value); } + @Override public void print(char value) throws IOException { getEnclosingWriter().print(value); } + @Override public void print(char[] value) throws IOException { getEnclosingWriter().print(value); } + @Override public void print(double value) throws IOException { getEnclosingWriter().print(value); } + @Override public void print(float value) throws IOException { getEnclosingWriter().print(value); } + @Override public void print(int value) throws IOException { getEnclosingWriter().print(value); } + @Override public void print(long value) throws IOException { getEnclosingWriter().print(value); } + @Override public void print(Object value) throws IOException { getEnclosingWriter().print(value); } + @Override public void print(String value) throws IOException { getEnclosingWriter().print(value); } + @Override public void println() throws IOException { getEnclosingWriter().println(); } + @Override public void println(boolean value) throws IOException { getEnclosingWriter().println(value); } + @Override public void println(char value) throws IOException { getEnclosingWriter().println(value); } + @Override public void println(char[] value) throws IOException { getEnclosingWriter().println(value); } + @Override public void println(double value) throws IOException { getEnclosingWriter().println(value); } + @Override public void println(float value) throws IOException { getEnclosingWriter().println(value); } + @Override public void println(int value) throws IOException { getEnclosingWriter().println(value); } + @Override public void println(long value) throws IOException { getEnclosingWriter().println(value); } + @Override public void println(Object value) throws IOException { getEnclosingWriter().println(value); } + @Override public void println(String value) throws IOException { getEnclosingWriter().println(value); } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockExpressionEvaluator.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockExpressionEvaluator.java index e13749eef11..b399bafe62a 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockExpressionEvaluator.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockExpressionEvaluator.java @@ -53,17 +53,20 @@ public class MockExpressionEvaluator extends ExpressionEvaluator { this.pageContext = pageContext; } + @Override public Expression parseExpression( final String expression, final Class expectedType, final FunctionMapper functionMapper) throws ELException { return new Expression() { + @Override public Object evaluate(VariableResolver variableResolver) throws ELException { return doEvaluate(expression, expectedType, functionMapper); } }; } + @Override public Object evaluate( String expression, Class expectedType, VariableResolver variableResolver, FunctionMapper functionMapper) throws ELException { diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterChain.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterChain.java index a6fa2f6b261..5b4b68b94d7 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterChain.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterChain.java @@ -117,6 +117,7 @@ public class MockFilterChain implements FilterChain { * Invoke registered {@link Filter}s and/or {@link Servlet} also saving the * request and response. */ + @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { Assert.notNull(request, "Request must not be null"); Assert.notNull(response, "Response must not be null"); @@ -160,15 +161,18 @@ public class MockFilterChain implements FilterChain { this.delegateServlet = servlet; } + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { this.delegateServlet.service(request, response); } + @Override public void init(FilterConfig filterConfig) throws ServletException { } + @Override public void destroy() { } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterConfig.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterConfig.java index 9db10c665bd..12fbe613ec8 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterConfig.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockFilterConfig.java @@ -79,10 +79,12 @@ public class MockFilterConfig implements FilterConfig { } + @Override public String getFilterName() { return filterName; } + @Override public ServletContext getServletContext() { return servletContext; } @@ -92,11 +94,13 @@ public class MockFilterConfig implements FilterConfig { this.initParameters.put(name, value); } + @Override public String getInitParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.initParameters.get(name); } + @Override public Enumeration getInitParameterNames() { return Collections.enumeration(this.initParameters.keySet()); } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java index 4544448afaf..5694b666105 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java @@ -264,6 +264,7 @@ public class MockHttpServletRequest implements HttpServletRequest { * Return the ServletContext that this request is associated with. (Not * available in the standard HttpServletRequest interface for some reason.) */ + @Override public ServletContext getServletContext() { return this.servletContext; } @@ -305,20 +306,24 @@ public class MockHttpServletRequest implements HttpServletRequest { // ServletRequest interface //--------------------------------------------------------------------- + @Override public Object getAttribute(String name) { checkActive(); return this.attributes.get(name); } + @Override public Enumeration getAttributeNames() { checkActive(); return Collections.enumeration(this.attributes.keySet()); } + @Override public String getCharacterEncoding() { return this.characterEncoding; } + @Override public void setCharacterEncoding(String characterEncoding) { this.characterEncoding = characterEncoding; updateContentTypeHeader(); @@ -338,6 +343,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.content = content; } + @Override public int getContentLength() { return (this.content != null ? this.content.length : -1); } @@ -354,10 +360,12 @@ public class MockHttpServletRequest implements HttpServletRequest { } } + @Override public String getContentType() { return this.contentType; } + @Override public ServletInputStream getInputStream() { if (this.content != null) { return new DelegatingServletInputStream(new ByteArrayInputStream(this.content)); @@ -480,21 +488,25 @@ public class MockHttpServletRequest implements HttpServletRequest { this.parameters.clear(); } + @Override public String getParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); String[] arr = this.parameters.get(name); return (arr != null && arr.length > 0 ? arr[0] : null); } + @Override public Enumeration getParameterNames() { return Collections.enumeration(this.parameters.keySet()); } + @Override public String[] getParameterValues(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.parameters.get(name); } + @Override public Map getParameterMap() { return Collections.unmodifiableMap(this.parameters); } @@ -503,6 +515,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.protocol = protocol; } + @Override public String getProtocol() { return this.protocol; } @@ -511,6 +524,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.scheme = scheme; } + @Override public String getScheme() { return this.scheme; } @@ -519,6 +533,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.serverName = serverName; } + @Override public String getServerName() { return this.serverName; } @@ -527,10 +542,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.serverPort = serverPort; } + @Override public int getServerPort() { return this.serverPort; } + @Override public BufferedReader getReader() throws UnsupportedEncodingException { if (this.content != null) { InputStream sourceStream = new ByteArrayInputStream(this.content); @@ -547,6 +564,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.remoteAddr = remoteAddr; } + @Override public String getRemoteAddr() { return this.remoteAddr; } @@ -555,10 +573,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.remoteHost = remoteHost; } + @Override public String getRemoteHost() { return this.remoteHost; } + @Override public void setAttribute(String name, Object value) { checkActive(); Assert.notNull(name, "Attribute name must not be null"); @@ -570,6 +590,7 @@ public class MockHttpServletRequest implements HttpServletRequest { } } + @Override public void removeAttribute(String name) { checkActive(); Assert.notNull(name, "Attribute name must not be null"); @@ -604,10 +625,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.locales.addAll(locales); } + @Override public Locale getLocale() { return this.locales.get(0); } + @Override public Enumeration getLocales() { return Collections.enumeration(this.locales); } @@ -616,14 +639,17 @@ public class MockHttpServletRequest implements HttpServletRequest { this.secure = secure; } + @Override public boolean isSecure() { return this.secure; } + @Override public RequestDispatcher getRequestDispatcher(String path) { return new MockRequestDispatcher(path); } + @Override public String getRealPath(String path) { return this.servletContext.getRealPath(path); } @@ -632,6 +658,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.remotePort = remotePort; } + @Override public int getRemotePort() { return this.remotePort; } @@ -640,6 +667,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.localName = localName; } + @Override public String getLocalName() { return this.localName; } @@ -648,6 +676,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.localAddr = localAddr; } + @Override public String getLocalAddr() { return this.localAddr; } @@ -656,6 +685,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.localPort = localPort; } + @Override public int getLocalPort() { return this.localPort; } @@ -669,6 +699,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.authType = authType; } + @Override public String getAuthType() { return this.authType; } @@ -677,6 +708,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.cookies = cookies; } + @Override public Cookie[] getCookies() { return this.cookies; } @@ -725,6 +757,7 @@ public class MockHttpServletRequest implements HttpServletRequest { } } + @Override public long getDateHeader(String name) { HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name); Object value = (header != null ? header.getValue() : null); @@ -743,20 +776,24 @@ public class MockHttpServletRequest implements HttpServletRequest { } } + @Override public String getHeader(String name) { HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name); return (header != null ? header.getValue().toString() : null); } + @Override public Enumeration getHeaders(String name) { HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name); return Collections.enumeration(header != null ? header.getStringValues() : new LinkedList()); } + @Override public Enumeration getHeaderNames() { return Collections.enumeration(this.headers.keySet()); } + @Override public int getIntHeader(String name) { HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name); Object value = (header != null ? header.getValue() : null); @@ -778,6 +815,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.method = method; } + @Override public String getMethod() { return this.method; } @@ -786,10 +824,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.pathInfo = pathInfo; } + @Override public String getPathInfo() { return this.pathInfo; } + @Override public String getPathTranslated() { return (this.pathInfo != null ? getRealPath(this.pathInfo) : null); } @@ -798,6 +838,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.contextPath = contextPath; } + @Override public String getContextPath() { return this.contextPath; } @@ -806,6 +847,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.queryString = queryString; } + @Override public String getQueryString() { return this.queryString; } @@ -814,6 +856,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.remoteUser = remoteUser; } + @Override public String getRemoteUser() { return this.remoteUser; } @@ -822,6 +865,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.userRoles.add(role); } + @Override public boolean isUserInRole(String role) { return (this.userRoles.contains(role) || (this.servletContext instanceof MockServletContext && ((MockServletContext) this.servletContext).getDeclaredRoles().contains( role))); @@ -831,6 +875,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.userPrincipal = userPrincipal; } + @Override public Principal getUserPrincipal() { return this.userPrincipal; } @@ -839,6 +884,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.requestedSessionId = requestedSessionId; } + @Override public String getRequestedSessionId() { return this.requestedSessionId; } @@ -847,10 +893,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.requestURI = requestURI; } + @Override public String getRequestURI() { return this.requestURI; } + @Override public StringBuffer getRequestURL() { StringBuffer url = new StringBuffer(this.scheme); url.append("://").append(this.serverName).append(':').append(this.serverPort); @@ -862,6 +910,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.servletPath = servletPath; } + @Override public String getServletPath() { return this.servletPath; } @@ -874,6 +923,7 @@ public class MockHttpServletRequest implements HttpServletRequest { } } + @Override public HttpSession getSession(boolean create) { checkActive(); // Reset session if invalidated. @@ -887,6 +937,7 @@ public class MockHttpServletRequest implements HttpServletRequest { return this.session; } + @Override public HttpSession getSession() { return getSession(true); } @@ -895,6 +946,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.requestedSessionIdValid = requestedSessionIdValid; } + @Override public boolean isRequestedSessionIdValid() { return this.requestedSessionIdValid; } @@ -903,6 +955,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.requestedSessionIdFromCookie = requestedSessionIdFromCookie; } + @Override public boolean isRequestedSessionIdFromCookie() { return this.requestedSessionIdFromCookie; } @@ -911,10 +964,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.requestedSessionIdFromURL = requestedSessionIdFromURL; } + @Override public boolean isRequestedSessionIdFromURL() { return this.requestedSessionIdFromURL; } + @Override public boolean isRequestedSessionIdFromUrl() { return isRequestedSessionIdFromURL(); } @@ -924,6 +979,7 @@ public class MockHttpServletRequest implements HttpServletRequest { // Methods introduced in Servlet 3.0 //--------------------------------------------------------------------- + @Override public AsyncContext getAsyncContext() { return this.asyncContext; } @@ -932,6 +988,7 @@ public class MockHttpServletRequest implements HttpServletRequest { this.asyncContext = asyncContext; } + @Override public DispatcherType getDispatcherType() { return this.dispatcherType; } @@ -944,14 +1001,17 @@ public class MockHttpServletRequest implements HttpServletRequest { this.asyncSupported = asyncSupported; } + @Override public boolean isAsyncSupported() { return this.asyncSupported; } + @Override public AsyncContext startAsync() { return startAsync(this, null); } + @Override public AsyncContext startAsync(ServletRequest request, ServletResponse response) { if (!this.asyncSupported) { throw new IllegalStateException("Async not supported"); @@ -965,10 +1025,12 @@ public class MockHttpServletRequest implements HttpServletRequest { this.asyncStarted = asyncStarted; } + @Override public boolean isAsyncStarted() { return this.asyncStarted; } + @Override public boolean authenticate(HttpServletResponse arg0) throws IOException, ServletException { throw new UnsupportedOperationException(); } @@ -977,18 +1039,22 @@ public class MockHttpServletRequest implements HttpServletRequest { parts.put(part.getName(), part); } + @Override public Part getPart(String key) throws IOException, IllegalStateException, ServletException { return parts.get(key); } + @Override public Collection getParts() throws IOException, IllegalStateException, ServletException { return parts.values(); } + @Override public void login(String arg0, String arg1) throws ServletException { throw new UnsupportedOperationException(); } + @Override public void logout() throws ServletException { throw new UnsupportedOperationException(); } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java index ce6ef7fa9bc..6f52ab8e3e8 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java @@ -138,6 +138,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return this.writerAccessAllowed; } + @Override public void setCharacterEncoding(String characterEncoding) { this.characterEncoding = characterEncoding; this.charset = true; @@ -154,10 +155,12 @@ public class MockHttpServletResponse implements HttpServletResponse { } } + @Override public String getCharacterEncoding() { return this.characterEncoding; } + @Override public ServletOutputStream getOutputStream() { if (!this.outputStreamAccessAllowed) { throw new IllegalStateException("OutputStream access not allowed"); @@ -165,6 +168,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return this.outputStream; } + @Override public PrintWriter getWriter() throws UnsupportedEncodingException { if (!this.writerAccessAllowed) { throw new IllegalStateException("Writer access not allowed"); @@ -188,6 +192,7 @@ public class MockHttpServletResponse implements HttpServletResponse { this.content.toString(this.characterEncoding) : this.content.toString(); } + @Override public void setContentLength(int contentLength) { this.contentLength = contentLength; doAddHeaderValue(CONTENT_LENGTH_HEADER, contentLength, true); @@ -197,6 +202,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return this.contentLength; } + @Override public void setContentType(String contentType) { this.contentType = contentType; if (contentType != null) { @@ -210,22 +216,27 @@ public class MockHttpServletResponse implements HttpServletResponse { } } + @Override public String getContentType() { return this.contentType; } + @Override public void setBufferSize(int bufferSize) { this.bufferSize = bufferSize; } + @Override public int getBufferSize() { return this.bufferSize; } + @Override public void flushBuffer() { setCommitted(true); } + @Override public void resetBuffer() { if (isCommitted()) { throw new IllegalStateException("Cannot reset buffer - response is already committed"); @@ -244,10 +255,12 @@ public class MockHttpServletResponse implements HttpServletResponse { this.committed = committed; } + @Override public boolean isCommitted() { return this.committed; } + @Override public void reset() { resetBuffer(); this.characterEncoding = null; @@ -260,10 +273,12 @@ public class MockHttpServletResponse implements HttpServletResponse { this.errorMessage = null; } + @Override public void setLocale(Locale locale) { this.locale = locale; } + @Override public Locale getLocale() { return this.locale; } @@ -273,6 +288,7 @@ public class MockHttpServletResponse implements HttpServletResponse { // HttpServletResponse interface //--------------------------------------------------------------------- + @Override public void addCookie(Cookie cookie) { Assert.notNull(cookie, "Cookie must not be null"); this.cookies.add(cookie); @@ -292,6 +308,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return null; } + @Override public boolean containsHeader(String name) { return (HeaderValueHolder.getByName(this.headers, name) != null); } @@ -301,6 +318,7 @@ public class MockHttpServletResponse implements HttpServletResponse { *

As of Servlet 3.0, this method is also defined HttpServletResponse. * @return the {@code Set} of header name {@code Strings}, or an empty {@code Set} if none */ + @Override public Set getHeaderNames() { return this.headers.keySet(); } @@ -314,6 +332,7 @@ public class MockHttpServletResponse implements HttpServletResponse { * @param name the name of the header * @return the associated header value, or {@code null} if none */ + @Override public String getHeader(String name) { HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name); return (header != null ? header.getStringValue() : null); @@ -327,6 +346,7 @@ public class MockHttpServletResponse implements HttpServletResponse { * @param name the name of the header * @return the associated header values, or an empty List if none */ + @Override public List getHeaders(String name) { HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name); if (header != null) { @@ -367,6 +387,7 @@ public class MockHttpServletResponse implements HttpServletResponse { * The default implementation returns the given URL String as-is. *

Can be overridden in subclasses, appending a session id or the like. */ + @Override public String encodeURL(String url) { return url; } @@ -379,18 +400,22 @@ public class MockHttpServletResponse implements HttpServletResponse { * override the common {@link #encodeURL} method instead, applying * to redirect URLs as well as to general URLs. */ + @Override public String encodeRedirectURL(String url) { return encodeURL(url); } + @Override public String encodeUrl(String url) { return encodeURL(url); } + @Override public String encodeRedirectUrl(String url) { return encodeRedirectURL(url); } + @Override public void sendError(int status, String errorMessage) throws IOException { if (isCommitted()) { throw new IllegalStateException("Cannot set error status - response is already committed"); @@ -400,6 +425,7 @@ public class MockHttpServletResponse implements HttpServletResponse { setCommitted(true); } + @Override public void sendError(int status) throws IOException { if (isCommitted()) { throw new IllegalStateException("Cannot set error status - response is already committed"); @@ -408,6 +434,7 @@ public class MockHttpServletResponse implements HttpServletResponse { setCommitted(true); } + @Override public void sendRedirect(String url) throws IOException { if (isCommitted()) { throw new IllegalStateException("Cannot send redirect - response is already committed"); @@ -422,26 +449,32 @@ public class MockHttpServletResponse implements HttpServletResponse { return getHeader(LOCATION_HEADER); } + @Override public void setDateHeader(String name, long value) { setHeaderValue(name, value); } + @Override public void addDateHeader(String name, long value) { addHeaderValue(name, value); } + @Override public void setHeader(String name, String value) { setHeaderValue(name, value); } + @Override public void addHeader(String name, String value) { addHeaderValue(name, value); } + @Override public void setIntHeader(String name, int value) { setHeaderValue(name, value); } + @Override public void addIntHeader(String name, int value) { addHeaderValue(name, value); } @@ -489,15 +522,18 @@ public class MockHttpServletResponse implements HttpServletResponse { } } + @Override public void setStatus(int status) { this.status = status; } + @Override public void setStatus(int status, String errorMessage) { this.status = status; this.errorMessage = errorMessage; } + @Override public int getStatus() { return this.status; } @@ -555,12 +591,14 @@ public class MockHttpServletResponse implements HttpServletResponse { super(out); } + @Override public void write(int b) throws IOException { super.write(b); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void flush() throws IOException { super.flush(); setCommitted(true); @@ -578,24 +616,28 @@ public class MockHttpServletResponse implements HttpServletResponse { super(out, true); } + @Override public void write(char buf[], int off, int len) { super.write(buf, off, len); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void write(String s, int off, int len) { super.write(s, off, len); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void write(int c) { super.write(c); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void flush() { super.flush(); setCommitted(true); diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java index ae7d58af432..12301763b6b 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.java @@ -98,10 +98,12 @@ public class MockHttpSession implements HttpSession { this.id = (id != null ? id : Integer.toString(nextId++)); } + @Override public long getCreationTime() { return this.creationTime; } + @Override public String getId() { return this.id; } @@ -111,43 +113,53 @@ public class MockHttpSession implements HttpSession { this.isNew = false; } + @Override public long getLastAccessedTime() { return this.lastAccessedTime; } + @Override public ServletContext getServletContext() { return this.servletContext; } + @Override public void setMaxInactiveInterval(int interval) { this.maxInactiveInterval = interval; } + @Override public int getMaxInactiveInterval() { return this.maxInactiveInterval; } + @Override public HttpSessionContext getSessionContext() { throw new UnsupportedOperationException("getSessionContext"); } + @Override public Object getAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); return this.attributes.get(name); } + @Override public Object getValue(String name) { return getAttribute(name); } + @Override public Enumeration getAttributeNames() { return Collections.enumeration(this.attributes.keySet()); } + @Override public String[] getValueNames() { return this.attributes.keySet().toArray(new String[this.attributes.size()]); } + @Override public void setAttribute(String name, Object value) { Assert.notNull(name, "Attribute name must not be null"); if (value != null) { @@ -161,10 +173,12 @@ public class MockHttpSession implements HttpSession { } } + @Override public void putValue(String name, Object value) { setAttribute(name, value); } + @Override public void removeAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); Object value = this.attributes.remove(name); @@ -173,6 +187,7 @@ public class MockHttpSession implements HttpSession { } } + @Override public void removeValue(String name) { removeAttribute(name); } @@ -197,6 +212,7 @@ public class MockHttpSession implements HttpSession { * * @throws IllegalStateException if this method is called on an already invalidated session */ + @Override public void invalidate() { if (this.invalid) { throw new IllegalStateException("The session has already been invalidated"); @@ -215,6 +231,7 @@ public class MockHttpSession implements HttpSession { this.isNew = value; } + @Override public boolean isNew() { return this.isNew; } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockJspWriter.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockJspWriter.java index dc1dc5c51ce..e83ff23521f 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockJspWriter.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockJspWriter.java @@ -82,6 +82,7 @@ public class MockJspWriter extends JspWriter { } + @Override public void clear() throws IOException { if (this.response.isCommitted()) { throw new IOException("Response already committed"); @@ -89,101 +90,126 @@ public class MockJspWriter extends JspWriter { this.response.resetBuffer(); } + @Override public void clearBuffer() throws IOException { } + @Override public void flush() throws IOException { this.response.flushBuffer(); } + @Override public void close() throws IOException { flush(); } + @Override public int getRemaining() { return Integer.MAX_VALUE; } + @Override public void newLine() throws IOException { getTargetWriter().println(); } + @Override public void write(char value[], int offset, int length) throws IOException { getTargetWriter().write(value, offset, length); } + @Override public void print(boolean value) throws IOException { getTargetWriter().print(value); } + @Override public void print(char value) throws IOException { getTargetWriter().print(value); } + @Override public void print(char[] value) throws IOException { getTargetWriter().print(value); } + @Override public void print(double value) throws IOException { getTargetWriter().print(value); } + @Override public void print(float value) throws IOException { getTargetWriter().print(value); } + @Override public void print(int value) throws IOException { getTargetWriter().print(value); } + @Override public void print(long value) throws IOException { getTargetWriter().print(value); } + @Override public void print(Object value) throws IOException { getTargetWriter().print(value); } + @Override public void print(String value) throws IOException { getTargetWriter().print(value); } + @Override public void println() throws IOException { getTargetWriter().println(); } + @Override public void println(boolean value) throws IOException { getTargetWriter().println(value); } + @Override public void println(char value) throws IOException { getTargetWriter().println(value); } + @Override public void println(char[] value) throws IOException { getTargetWriter().println(value); } + @Override public void println(double value) throws IOException { getTargetWriter().println(value); } + @Override public void println(float value) throws IOException { getTargetWriter().println(value); } + @Override public void println(int value) throws IOException { getTargetWriter().println(value); } + @Override public void println(long value) throws IOException { getTargetWriter().println(value); } + @Override public void println(Object value) throws IOException { getTargetWriter().println(value); } + @Override public void println(String value) throws IOException { getTargetWriter().println(value); } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartFile.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartFile.java index c9bf0742967..8cad672a2de 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartFile.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartFile.java @@ -96,34 +96,42 @@ public class MockMultipartFile implements MultipartFile { } + @Override public String getName() { return this.name; } + @Override public String getOriginalFilename() { return this.originalFilename; } + @Override public String getContentType() { return this.contentType; } + @Override public boolean isEmpty() { return (this.content.length == 0); } + @Override public long getSize() { return this.content.length; } + @Override public byte[] getBytes() throws IOException { return this.content; } + @Override public InputStream getInputStream() throws IOException { return new ByteArrayInputStream(this.content); } + @Override public void transferTo(File dest) throws IOException, IllegalStateException { FileCopyUtils.copy(this.content, dest); } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartHttpServletRequest.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartHttpServletRequest.java index dc915eec4f3..868d786bdd3 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartHttpServletRequest.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartHttpServletRequest.java @@ -66,14 +66,17 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl this.multipartFiles.add(file.getName(), file); } + @Override public Iterator getFileNames() { return this.multipartFiles.keySet().iterator(); } + @Override public MultipartFile getFile(String name) { return this.multipartFiles.getFirst(name); } + @Override public List getFiles(String name) { List multipartFiles = this.multipartFiles.get(name); if (multipartFiles != null) { @@ -84,14 +87,17 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl } } + @Override public Map getFileMap() { return this.multipartFiles.toSingleValueMap(); } + @Override public MultiValueMap getMultiFileMap() { return new LinkedMultiValueMap(this.multipartFiles); } + @Override public String getMultipartContentType(String paramOrFileName) { MultipartFile file = getFile(paramOrFileName); if (file != null) { @@ -102,10 +108,12 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl } } + @Override public HttpMethod getRequestMethod() { return HttpMethod.valueOf(getMethod()); } + @Override public HttpHeaders getRequestHeaders() { HttpHeaders headers = new HttpHeaders(); Enumeration headerNames = getHeaderNames(); @@ -116,6 +124,7 @@ public class MockMultipartHttpServletRequest extends MockHttpServletRequest impl return headers; } + @Override public HttpHeaders getMultipartHeaders(String paramOrFileName) { String contentType = getMultipartContentType(paramOrFileName); if (contentType != null) { diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockPageContext.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockPageContext.java index efa1319b92d..2c17aca78e0 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockPageContext.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockPageContext.java @@ -125,6 +125,7 @@ public class MockPageContext extends PageContext { } + @Override public void initialize( Servlet servlet, ServletRequest request, ServletResponse response, String errorPageURL, boolean needsSession, int bufferSize, boolean autoFlush) { @@ -132,9 +133,11 @@ public class MockPageContext extends PageContext { throw new UnsupportedOperationException("Use appropriate constructor"); } + @Override public void release() { } + @Override public void setAttribute(String name, Object value) { Assert.notNull(name, "Attribute name must not be null"); if (value != null) { @@ -145,6 +148,7 @@ public class MockPageContext extends PageContext { } } + @Override public void setAttribute(String name, Object value, int scope) { Assert.notNull(name, "Attribute name must not be null"); switch (scope) { @@ -165,11 +169,13 @@ public class MockPageContext extends PageContext { } } + @Override public Object getAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); return this.attributes.get(name); } + @Override public Object getAttribute(String name, int scope) { Assert.notNull(name, "Attribute name must not be null"); switch (scope) { @@ -187,6 +193,7 @@ public class MockPageContext extends PageContext { } } + @Override public Object findAttribute(String name) { Object value = getAttribute(name); if (value == null) { @@ -201,6 +208,7 @@ public class MockPageContext extends PageContext { return value; } + @Override public void removeAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); this.removeAttribute(name, PageContext.PAGE_SCOPE); @@ -209,6 +217,7 @@ public class MockPageContext extends PageContext { this.removeAttribute(name, PageContext.APPLICATION_SCOPE); } + @Override public void removeAttribute(String name, int scope) { Assert.notNull(name, "Attribute name must not be null"); switch (scope) { @@ -229,6 +238,7 @@ public class MockPageContext extends PageContext { } } + @Override public int getAttributesScope(String name) { if (getAttribute(name) != null) { return PAGE_SCOPE; @@ -251,6 +261,7 @@ public class MockPageContext extends PageContext { return Collections.enumeration(this.attributes.keySet()); } + @Override @SuppressWarnings("unchecked") public Enumeration getAttributeNamesInScope(int scope) { switch (scope) { @@ -268,6 +279,7 @@ public class MockPageContext extends PageContext { } } + @Override public JspWriter getOut() { if (this.out == null) { this.out = new MockJspWriter(this.response); @@ -275,54 +287,67 @@ public class MockPageContext extends PageContext { return this.out; } + @Override public ExpressionEvaluator getExpressionEvaluator() { return new MockExpressionEvaluator(this); } + @Override public ELContext getELContext() { return null; } + @Override public VariableResolver getVariableResolver() { return null; } + @Override public HttpSession getSession() { return this.request.getSession(); } + @Override public Object getPage() { return this; } + @Override public ServletRequest getRequest() { return this.request; } + @Override public ServletResponse getResponse() { return this.response; } + @Override public Exception getException() { return null; } + @Override public ServletConfig getServletConfig() { return this.servletConfig; } + @Override public ServletContext getServletContext() { return this.servletContext; } + @Override public void forward(String path) throws ServletException, IOException { this.request.getRequestDispatcher(path).forward(this.request, this.response); } + @Override public void include(String path) throws ServletException, IOException { this.request.getRequestDispatcher(path).include(this.request, this.response); } + @Override public void include(String path, boolean flush) throws ServletException, IOException { this.request.getRequestDispatcher(path).include(this.request, this.response); if (flush) { @@ -340,10 +365,12 @@ public class MockPageContext extends PageContext { return ((MockHttpServletResponse) this.response).getContentAsString(); } + @Override public void handlePageException(Exception ex) throws ServletException, IOException { throw new ServletException("Page exception", ex); } + @Override public void handlePageException(Throwable ex) throws ServletException, IOException { throw new ServletException("Page exception", ex); } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockPart.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockPart.java index ef594bc7577..f26dfc2b9c1 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockPart.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockPart.java @@ -90,22 +90,27 @@ public class MockPart implements Part { } + @Override public String getName() { return this.name; } + @Override public String getContentType() { return this.contentType; } + @Override public long getSize() { return this.content.length; } + @Override public InputStream getInputStream() throws IOException { return new ByteArrayInputStream(this.content); } + @Override public String getHeader(String name) { if (CONTENT_TYPE.equalsIgnoreCase(name)) { return this.contentType; @@ -115,6 +120,7 @@ public class MockPart implements Part { } } + @Override public Collection getHeaders(String name) { if (CONTENT_TYPE.equalsIgnoreCase(name)) { return Collections.singleton(this.contentType); @@ -124,14 +130,17 @@ public class MockPart implements Part { } } + @Override public Collection getHeaderNames() { return Collections.singleton(CONTENT_TYPE); } + @Override public void write(String fileName) throws IOException { throw new UnsupportedOperationException(); } + @Override public void delete() throws IOException { throw new UnsupportedOperationException(); } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockRequestDispatcher.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockRequestDispatcher.java index d2766fcb0f0..b8679b80209 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockRequestDispatcher.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockRequestDispatcher.java @@ -55,6 +55,7 @@ public class MockRequestDispatcher implements RequestDispatcher { } + @Override public void forward(ServletRequest request, ServletResponse response) { Assert.notNull(request, "Request must not be null"); Assert.notNull(response, "Response must not be null"); @@ -67,6 +68,7 @@ public class MockRequestDispatcher implements RequestDispatcher { } } + @Override public void include(ServletRequest request, ServletResponse response) { Assert.notNull(request, "Request must not be null"); Assert.notNull(response, "Response must not be null"); diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockServletConfig.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockServletConfig.java index 9447b10d7e2..d7738c95273 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockServletConfig.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockServletConfig.java @@ -78,10 +78,12 @@ public class MockServletConfig implements ServletConfig { } + @Override public String getServletName() { return this.servletName; } + @Override public ServletContext getServletContext() { return this.servletContext; } @@ -91,11 +93,13 @@ public class MockServletConfig implements ServletConfig { this.initParameters.put(name, value); } + @Override public String getInitParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.initParameters.get(name); } + @Override public Enumeration getInitParameterNames() { return Collections.enumeration(this.initParameters.keySet()); } diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java index 3a0e23e2932..d18678dc4a4 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java @@ -205,6 +205,7 @@ public class MockServletContext implements ServletContext { } /* This is a Servlet API 2.5 method. */ + @Override public String getContextPath() { return this.contextPath; } @@ -213,6 +214,7 @@ public class MockServletContext implements ServletContext { this.contexts.put(contextPath, context); } + @Override public ServletContext getContext(String contextPath) { if (this.contextPath.equals(contextPath)) { return this; @@ -224,6 +226,7 @@ public class MockServletContext implements ServletContext { this.majorVersion = majorVersion; } + @Override public int getMajorVersion() { return this.majorVersion; } @@ -232,6 +235,7 @@ public class MockServletContext implements ServletContext { this.minorVersion = minorVersion; } + @Override public int getMinorVersion() { return this.minorVersion; } @@ -240,6 +244,7 @@ public class MockServletContext implements ServletContext { this.effectiveMajorVersion = effectiveMajorVersion; } + @Override public int getEffectiveMajorVersion() { return this.effectiveMajorVersion; } @@ -248,14 +253,17 @@ public class MockServletContext implements ServletContext { this.effectiveMinorVersion = effectiveMinorVersion; } + @Override public int getEffectiveMinorVersion() { return this.effectiveMinorVersion; } + @Override public String getMimeType(String filePath) { return MimeTypeResolver.getMimeType(filePath); } + @Override public Set getResourcePaths(String path) { String actualPath = (path.endsWith("/") ? path : path + "/"); Resource resource = this.resourceLoader.getResource(getResourceLocation(actualPath)); @@ -281,6 +289,7 @@ public class MockServletContext implements ServletContext { } } + @Override public URL getResource(String path) throws MalformedURLException { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); if (!resource.exists()) { @@ -298,6 +307,7 @@ public class MockServletContext implements ServletContext { } } + @Override public InputStream getResourceAsStream(String path) { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); if (!resource.exists()) { @@ -312,6 +322,7 @@ public class MockServletContext implements ServletContext { } } + @Override public RequestDispatcher getRequestDispatcher(String path) { if (!path.startsWith("/")) { throw new IllegalArgumentException("RequestDispatcher path at ServletContext level must start with '/'"); @@ -319,6 +330,7 @@ public class MockServletContext implements ServletContext { return new MockRequestDispatcher(path); } + @Override public RequestDispatcher getNamedDispatcher(String path) { return this.namedRequestDispatchers.get(path); } @@ -376,30 +388,37 @@ public class MockServletContext implements ServletContext { registerNamedDispatcher(this.defaultServletName, new MockRequestDispatcher(this.defaultServletName)); } + @Override public Servlet getServlet(String name) { return null; } + @Override public Enumeration getServlets() { return Collections.enumeration(new HashSet()); } + @Override public Enumeration getServletNames() { return Collections.enumeration(new HashSet()); } + @Override public void log(String message) { logger.info(message); } + @Override public void log(Exception ex, String message) { logger.info(message, ex); } + @Override public void log(String message, Throwable ex) { logger.info(message, ex); } + @Override public String getRealPath(String path) { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); try { @@ -411,19 +430,23 @@ public class MockServletContext implements ServletContext { } } + @Override public String getServerInfo() { return "MockServletContext"; } + @Override public String getInitParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.initParameters.get(name); } + @Override public Enumeration getInitParameterNames() { return Collections.enumeration(this.initParameters.keySet()); } + @Override public boolean setInitParameter(String name, String value) { Assert.notNull(name, "Parameter name must not be null"); if (this.initParameters.containsKey(name)) { @@ -438,15 +461,18 @@ public class MockServletContext implements ServletContext { this.initParameters.put(name, value); } + @Override public Object getAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); return this.attributes.get(name); } + @Override public Enumeration getAttributeNames() { return Collections.enumeration(this.attributes.keySet()); } + @Override public void setAttribute(String name, Object value) { Assert.notNull(name, "Attribute name must not be null"); if (value != null) { @@ -457,6 +483,7 @@ public class MockServletContext implements ServletContext { } } + @Override public void removeAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); this.attributes.remove(name); @@ -466,14 +493,17 @@ public class MockServletContext implements ServletContext { this.servletContextName = servletContextName; } + @Override public String getServletContextName() { return this.servletContextName; } + @Override public ClassLoader getClassLoader() { return ClassUtils.getDefaultClassLoader(); } + @Override public void declareRoles(String... roleNames) { Assert.notNull(roleNames, "Role names array must not be null"); for (String roleName : roleNames) { @@ -503,90 +533,111 @@ public class MockServletContext implements ServletContext { // Methods introduced in Servlet 3.0 //--------------------------------------------------------------------- + @Override public FilterRegistration.Dynamic addFilter(String filterName, String className) { throw new UnsupportedOperationException(); } + @Override public FilterRegistration.Dynamic addFilter(String filterName, Filter filter) { throw new UnsupportedOperationException(); } + @Override public FilterRegistration.Dynamic addFilter(String filterName, Class filterClass) { throw new UnsupportedOperationException(); } + @Override public void addListener(Class listenerClass) { throw new UnsupportedOperationException(); } + @Override public void addListener(String className) { throw new UnsupportedOperationException(); } + @Override public void addListener(T t) { throw new UnsupportedOperationException(); } + @Override public ServletRegistration.Dynamic addServlet(String servletName, String className) { throw new UnsupportedOperationException(); } + @Override public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) { throw new UnsupportedOperationException(); } + @Override public ServletRegistration.Dynamic addServlet(String servletName, Class servletClass) { throw new UnsupportedOperationException(); } + @Override public T createFilter(Class c) throws ServletException { throw new UnsupportedOperationException(); } + @Override public T createListener(Class c) throws ServletException { throw new UnsupportedOperationException(); } + @Override public T createServlet(Class c) throws ServletException { throw new UnsupportedOperationException(); } + @Override public Set getDefaultSessionTrackingModes() { throw new UnsupportedOperationException(); } + @Override public Set getEffectiveSessionTrackingModes() { throw new UnsupportedOperationException(); } + @Override public FilterRegistration getFilterRegistration(String filterName) { throw new UnsupportedOperationException(); } + @Override public Map getFilterRegistrations() { throw new UnsupportedOperationException(); } + @Override public JspConfigDescriptor getJspConfigDescriptor() { throw new UnsupportedOperationException(); } + @Override public ServletRegistration getServletRegistration(String servletName) { throw new UnsupportedOperationException(); } + @Override public Map getServletRegistrations() { throw new UnsupportedOperationException(); } + @Override public SessionCookieConfig getSessionCookieConfig() { throw new UnsupportedOperationException(); } + @Override public void setSessionTrackingModes(Set sessionTrackingModes) throws IllegalStateException, IllegalArgumentException { throw new UnsupportedOperationException(); diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/PassThroughFilterChain.java b/spring-web/src/test/java/org/springframework/mock/web/test/PassThroughFilterChain.java index 3e3b09b1595..505aa3f6bcd 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/PassThroughFilterChain.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/PassThroughFilterChain.java @@ -73,6 +73,7 @@ public class PassThroughFilterChain implements FilterChain { /** * Pass the call on to the Filter/Servlet. */ + @Override public void doFilter(ServletRequest request, ServletResponse response) throws ServletException, IOException { if (this.filter != null) { this.filter.doFilter(request, response, this.nextFilterChain); diff --git a/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java b/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java index b2ca68eb7f6..17369efaa5d 100644 --- a/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java +++ b/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java @@ -219,14 +219,17 @@ public class CauchoRemotingTests extends TestCase { private String password; private boolean overloadEnabled; + @Override public void setUser(String user) { this.user = user; } + @Override public void setPassword(String password) { this.password = password; } + @Override public void setOverloadEnabled(boolean overloadEnabled) { this.overloadEnabled = overloadEnabled; } @@ -239,14 +242,17 @@ public class CauchoRemotingTests extends TestCase { private String password; private boolean overloadEnabled; + @Override public void setUser(String user) { this.user = user; } + @Override public void setPassword(String password) { this.password = password; } + @Override public void setOverloadEnabled(boolean overloadEnabled) { this.overloadEnabled = overloadEnabled; } diff --git a/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java b/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java index 56569a8e042..71c463177a5 100644 --- a/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java +++ b/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java @@ -73,6 +73,7 @@ public class HttpInvokerTests extends TestCase { pfb.setServiceUrl("http://myurl"); pfb.setHttpInvokerRequestExecutor(new AbstractHttpInvokerRequestExecutor() { + @Override protected RemoteInvocationResult doExecuteRequest( HttpInvokerClientConfiguration config, ByteArrayOutputStream baos) throws Exception { assertEquals("http://myurl", config.getServiceUrl()); @@ -138,6 +139,7 @@ public class HttpInvokerTests extends TestCase { pfb.setServiceUrl("http://myurl"); pfb.setHttpInvokerRequestExecutor(new HttpInvokerRequestExecutor() { + @Override public RemoteInvocationResult executeRequest( HttpInvokerClientConfiguration config, RemoteInvocation invocation) throws IOException { throw new IOException("argh"); @@ -160,6 +162,7 @@ public class HttpInvokerTests extends TestCase { TestBean target = new TestBean("myname", 99); final HttpInvokerServiceExporter exporter = new HttpInvokerServiceExporter() { + @Override protected InputStream decorateInputStream(HttpServletRequest request, InputStream is) throws IOException { if ("gzip".equals(request.getHeader("Compression"))) { return new GZIPInputStream(is); @@ -168,6 +171,7 @@ public class HttpInvokerTests extends TestCase { return is; } } + @Override protected OutputStream decorateOutputStream( HttpServletRequest request, HttpServletResponse response, OutputStream os) throws IOException { if ("gzip".equals(request.getHeader("Compression"))) { @@ -187,6 +191,7 @@ public class HttpInvokerTests extends TestCase { pfb.setServiceUrl("http://myurl"); pfb.setHttpInvokerRequestExecutor(new AbstractHttpInvokerRequestExecutor() { + @Override protected RemoteInvocationResult doExecuteRequest( HttpInvokerClientConfiguration config, ByteArrayOutputStream baos) throws IOException, ClassNotFoundException { @@ -204,9 +209,11 @@ public class HttpInvokerTests extends TestCase { return readRemoteInvocationResult( new ByteArrayInputStream(response.getContentAsByteArray()), config.getCodebaseUrl()); } + @Override protected OutputStream decorateOutputStream(OutputStream os) throws IOException { return new GZIPOutputStream(os); } + @Override protected InputStream decorateInputStream(InputStream is) throws IOException { return new GZIPInputStream(is); } @@ -239,6 +246,7 @@ public class HttpInvokerTests extends TestCase { TestBean target = new TestBean("myname", 99); final HttpInvokerServiceExporter exporter = new HttpInvokerServiceExporter() { + @Override protected RemoteInvocation doReadRemoteInvocation(ObjectInputStream ois) throws IOException, ClassNotFoundException { Object obj = ois.readObject(); @@ -248,6 +256,7 @@ public class HttpInvokerTests extends TestCase { } return ((TestRemoteInvocationWrapper) obj).remoteInvocation; } + @Override protected void doWriteRemoteInvocationResult(RemoteInvocationResult result, ObjectOutputStream oos) throws IOException { oos.writeObject(new TestRemoteInvocationResultWrapper(result)); @@ -262,6 +271,7 @@ public class HttpInvokerTests extends TestCase { pfb.setServiceUrl("http://myurl"); pfb.setHttpInvokerRequestExecutor(new AbstractHttpInvokerRequestExecutor() { + @Override protected RemoteInvocationResult doExecuteRequest( HttpInvokerClientConfiguration config, ByteArrayOutputStream baos) throws Exception { assertEquals("http://myurl", config.getServiceUrl()); @@ -272,9 +282,11 @@ public class HttpInvokerTests extends TestCase { return readRemoteInvocationResult( new ByteArrayInputStream(response.getContentAsByteArray()), config.getCodebaseUrl()); } + @Override protected void doWriteRemoteInvocation(RemoteInvocation invocation, ObjectOutputStream oos) throws IOException { oos.writeObject(new TestRemoteInvocationWrapper(invocation)); } + @Override protected RemoteInvocationResult doReadRemoteInvocationResult(ObjectInputStream ois) throws IOException, ClassNotFoundException { Object obj = ois.readObject(); @@ -316,6 +328,7 @@ public class HttpInvokerTests extends TestCase { exporter.setServiceInterface(ITestBean.class); exporter.setService(target); exporter.setRemoteInvocationExecutor(new DefaultRemoteInvocationExecutor() { + @Override public Object invoke(RemoteInvocation invocation, Object targetObject) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException { assertNotNull(invocation.getAttributes()); @@ -331,6 +344,7 @@ public class HttpInvokerTests extends TestCase { pfb.setServiceInterface(ITestBean.class); pfb.setServiceUrl("http://myurl"); pfb.setRemoteInvocationFactory(new RemoteInvocationFactory() { + @Override public RemoteInvocation createRemoteInvocation(MethodInvocation methodInvocation) { RemoteInvocation invocation = new RemoteInvocation(methodInvocation); invocation.addAttribute("myKey", "myValue"); @@ -350,6 +364,7 @@ public class HttpInvokerTests extends TestCase { }); pfb.setHttpInvokerRequestExecutor(new AbstractHttpInvokerRequestExecutor() { + @Override protected RemoteInvocationResult doExecuteRequest( HttpInvokerClientConfiguration config, ByteArrayOutputStream baos) throws Exception { assertEquals("http://myurl", config.getServiceUrl()); @@ -375,6 +390,7 @@ public class HttpInvokerTests extends TestCase { exporter.setServiceInterface(ITestBean.class); exporter.setService(target); exporter.setRemoteInvocationExecutor(new DefaultRemoteInvocationExecutor() { + @Override public Object invoke(RemoteInvocation invocation, Object targetObject) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException { assertTrue(invocation instanceof TestRemoteInvocation); @@ -389,6 +405,7 @@ public class HttpInvokerTests extends TestCase { pfb.setServiceInterface(ITestBean.class); pfb.setServiceUrl("http://myurl"); pfb.setRemoteInvocationFactory(new RemoteInvocationFactory() { + @Override public RemoteInvocation createRemoteInvocation(MethodInvocation methodInvocation) { RemoteInvocation invocation = new TestRemoteInvocation(methodInvocation); assertNull(invocation.getAttributes()); @@ -398,6 +415,7 @@ public class HttpInvokerTests extends TestCase { }); pfb.setHttpInvokerRequestExecutor(new AbstractHttpInvokerRequestExecutor() { + @Override protected RemoteInvocationResult doExecuteRequest( HttpInvokerClientConfiguration config, ByteArrayOutputStream baos) throws Exception { assertEquals("http://myurl", config.getServiceUrl()); @@ -423,6 +441,7 @@ public class HttpInvokerTests extends TestCase { pfb.setServiceUrl(serviceUrl); pfb.setHttpInvokerRequestExecutor(new HttpInvokerRequestExecutor() { + @Override public RemoteInvocationResult executeRequest( HttpInvokerClientConfiguration config, RemoteInvocation invocation) throws IOException { throw new IOException("argh"); diff --git a/spring-web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java b/spring-web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java index 1f249589b51..ac50ac8d2e6 100644 --- a/spring-web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java +++ b/spring-web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java @@ -495,6 +495,7 @@ public class JaxRpcSupportTests extends TestCase { service1Control.setReturnValue(new RemoteBean()); } + @Override public Service createService(QName qName) throws ServiceException { if (!"myNamespace".equals(qName.getNamespaceURI()) || !"myService1".equals(qName.getLocalPart())) { throw new ServiceException("not supported"); @@ -503,6 +504,7 @@ public class JaxRpcSupportTests extends TestCase { return service1; } + @Override public Service createService(URL url, QName qName) throws ServiceException { try { if (!(new URL("http://myUrl1")).equals(url) || !"".equals(qName.getNamespaceURI()) || @@ -516,6 +518,7 @@ public class JaxRpcSupportTests extends TestCase { return service2; } + @Override public Service loadService(URL url, QName qName, Properties props) throws ServiceException { try { if (!(new URL("http://myUrl1")).equals(url) || !"".equals(qName.getNamespaceURI()) || @@ -532,6 +535,7 @@ public class JaxRpcSupportTests extends TestCase { return service1; } + @Override public Service loadService(Class ifc) throws ServiceException { if (!IRemoteBean.class.equals(ifc)) { throw new ServiceException("not supported"); @@ -540,6 +544,7 @@ public class JaxRpcSupportTests extends TestCase { return service2; } + @Override public Service loadService(URL url, Class ifc, Properties props) throws ServiceException { try { if (!(new URL("http://myUrl1")).equals(url) || !IRemoteBean.class.equals(ifc)) { @@ -563,6 +568,7 @@ public class JaxRpcSupportTests extends TestCase { super(); } + @Override protected void initMocks() throws Exception { super.initMocks(); service1.getPort(new QName("myNamespace", "myPort"), IRemoteBean.class); @@ -580,6 +586,7 @@ public class JaxRpcSupportTests extends TestCase { super(); } + @Override protected void initMocks() throws Exception { initStandardCall(1); } @@ -591,9 +598,11 @@ public class JaxRpcSupportTests extends TestCase { service1Control.setReturnValue(call1, count); call1.invoke(new Object[] {"myName"}); call1Control.setMatcher(new ArgumentsMatcher() { + @Override public boolean matches(Object[] objects, Object[] objects1) { return Arrays.equals((Object[]) objects[0], (Object[]) objects1[0]); } + @Override public String toString(Object[] objects) { return ObjectUtils.nullSafeToString(objects[0]); } @@ -616,6 +625,7 @@ public class JaxRpcSupportTests extends TestCase { public ExceptionCallMockServiceFactory() throws Exception { } + @Override protected void initMocks() throws Exception { initExceptionCall(); initStandardCall(2); @@ -628,9 +638,11 @@ public class JaxRpcSupportTests extends TestCase { service1Control.setReturnValue(call2); call2.invoke(new Object[] {"exception"}); call2Control.setMatcher(new ArgumentsMatcher() { + @Override public boolean matches(Object[] objects, Object[] objects1) { return Arrays.equals((Object[]) objects[0], (Object[]) objects1[0]); } + @Override public String toString(Object[] objects) { return ObjectUtils.nullSafeToString(objects[0]); } @@ -646,6 +658,7 @@ public class JaxRpcSupportTests extends TestCase { public CallWithPropertiesMockServiceFactory() throws Exception { } + @Override protected void extendStandardCall() { call1.setProperty(Call.USERNAME_PROPERTY, "user"); call1Control.setVoidCallable(); @@ -682,6 +695,7 @@ public class JaxRpcSupportTests extends TestCase { properties = new HashMap(); } + @Override public void setName(String nam) throws RemoteException { if ("exception".equals(nam)) { throw new RemoteException(); @@ -689,14 +703,17 @@ public class JaxRpcSupportTests extends TestCase { name = nam; } + @Override public void _setProperty(String key, Object o) { properties.put(key, o); } + @Override public Object _getProperty(String key) { return properties.get(key); } + @Override public Iterator _getPropertyNames() { return properties.keySet().iterator(); } diff --git a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java index 6c9ba364621..4cd69cbb416 100644 --- a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java +++ b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java @@ -31,6 +31,7 @@ public class OrderServiceImpl implements OrderService { @Resource private WebServiceContext webServiceContext; + @Override public String getOrder(int id) throws OrderNotFoundException { Assert.notNull(this.webServiceContext, "WebServiceContext has not been injected"); if (id == 0) { diff --git a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java index a34e3749b95..cf514b44b86 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java @@ -44,6 +44,7 @@ public class ServletRequestDataBinderTests { ServletRequestDataBinder binder = new ServletRequestDataBinder(tb, "person"); binder.registerCustomEditor(ITestBean.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean()); } @@ -168,6 +169,7 @@ public class ServletRequestDataBinderTests { ServletRequestDataBinder binder = new ServletRequestDataBinder(tb, "person"); binder.registerCustomEditor(ITestBean.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean()); } diff --git a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java index 49be202f580..3f194e9bd0f 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java @@ -46,6 +46,7 @@ public class WebRequestDataBinderTests { WebRequestDataBinder binder = new WebRequestDataBinder(tb, "person"); binder.registerCustomEditor(ITestBean.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean()); } diff --git a/spring-web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java index 55a115e2d42..6d9d28e0a7d 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/RequestContextListenerTests.java @@ -87,6 +87,7 @@ public class RequestContextListenerTests extends TestCase { // Execute requestDestroyed callback in different thread. Thread thread = new Thread() { + @Override public void run() { listener.requestDestroyed(new ServletRequestEvent(context, request)); } diff --git a/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java index 80a3a1b80c8..3b12ab2dbaf 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java @@ -38,6 +38,7 @@ public class RequestScopeTests extends TestCase { private DefaultListableBeanFactory beanFactory; + @Override protected void setUp() throws Exception { this.beanFactory = new DefaultListableBeanFactory(); this.beanFactory.registerScope("request", new RequestScope()); diff --git a/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java b/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java index cb45ad363a1..c6b0c656fae 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java @@ -40,6 +40,7 @@ public class SessionScopeTests extends TestCase { private DefaultListableBeanFactory beanFactory; + @Override protected void setUp() throws Exception { this.beanFactory = new DefaultListableBeanFactory(); this.beanFactory.registerScope("session", new SessionScope()); @@ -162,14 +163,17 @@ public class SessionScopeTests extends TestCase { private static class CustomDestructionAwareBeanPostProcessor implements DestructionAwareBeanPostProcessor { + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { return bean; } + @Override public void postProcessBeforeDestruction(Object bean, String beanName) throws BeansException { } } @@ -179,14 +183,17 @@ public class SessionScopeTests extends TestCase { private static class CustomSerializableDestructionAwareBeanPostProcessor implements DestructionAwareBeanPostProcessor, Serializable { + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { return bean; } + @Override public void postProcessBeforeDestruction(Object bean, String beanName) throws BeansException { if (bean instanceof BeanNameAware) { ((BeanNameAware) bean).setBeanName(null); diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/DeferredResultTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/DeferredResultTests.java index bcb780ae9a3..2590481d3d3 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/async/DeferredResultTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/async/DeferredResultTests.java @@ -86,6 +86,7 @@ public class DeferredResultTests { DeferredResult result = new DeferredResult(); result.onCompletion(new Runnable() { + @Override public void run() { sb.append("completion event"); } @@ -108,6 +109,7 @@ public class DeferredResultTests { DeferredResult result = new DeferredResult(null, "timeout result"); result.setResultHandler(handler); result.onTimeout(new Runnable() { + @Override public void run() { sb.append("timeout event"); } diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java index 50df5a3a35d..506201f5ba5 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java @@ -432,6 +432,7 @@ public class WebAsyncManagerTests { this.value = value; } + @Override public Object call() throws Exception { if (this.value instanceof Exception) { throw ((Exception) this.value); diff --git a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java index 6ffbec1d7a3..936be8d79aa 100644 --- a/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java +++ b/spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTimeoutTests.java @@ -104,6 +104,7 @@ public class WebAsyncManagerTimeoutTests { StubCallable callable = new StubCallable(); WebAsyncTask webAsyncTask = new WebAsyncTask(callable); webAsyncTask.onTimeout(new Callable() { + @Override public Object call() throws Exception { return 7; } @@ -207,6 +208,7 @@ public class WebAsyncManagerTimeoutTests { final DeferredResult deferredResult = new DeferredResult(); deferredResult.onTimeout(new Runnable() { + @Override public void run() { deferredResult.setResult(23); } @@ -228,6 +230,7 @@ public class WebAsyncManagerTimeoutTests { DeferredResult deferredResult = new DeferredResult(); DeferredResultProcessingInterceptor interceptor = new DeferredResultProcessingInterceptorAdapter() { + @Override public boolean handleTimeout(NativeWebRequest request, DeferredResult result) throws Exception { result.setErrorResult(23); return true; @@ -252,6 +255,7 @@ public class WebAsyncManagerTimeoutTests { final Exception exception = new Exception(); DeferredResultProcessingInterceptor interceptor = new DeferredResultProcessingInterceptorAdapter() { + @Override public boolean handleTimeout(NativeWebRequest request, DeferredResult result) throws Exception { throw exception; } @@ -270,6 +274,7 @@ public class WebAsyncManagerTimeoutTests { private final class StubCallable implements Callable { + @Override public Object call() throws Exception { return 21; } diff --git a/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java index 4f7d5451d3e..d55954f32e2 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java @@ -71,14 +71,17 @@ public class CompositeFilterTests { public FilterConfig filterConfig; + @Override public void init(FilterConfig filterConfig) throws ServletException { this.filterConfig = filterConfig; } + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws IOException, ServletException { request.setAttribute("called", Boolean.TRUE); } + @Override public void destroy() { this.filterConfig = null; } diff --git a/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java b/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java index 0d54f55d485..69df4dd5f1d 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java @@ -272,14 +272,17 @@ public class DelegatingFilterProxyTests { public FilterConfig filterConfig; + @Override public void init(FilterConfig filterConfig) throws ServletException { this.filterConfig = filterConfig; } + @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws IOException, ServletException { request.setAttribute("called", Boolean.TRUE); } + @Override public void destroy() { this.filterConfig = null; } diff --git a/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java b/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java index 13f74da0aa1..d1af1f1fcc0 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java +++ b/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java @@ -48,6 +48,7 @@ public class HiddenHttpMethodFilterTest { FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse) throws IOException, ServletException { assertEquals("Invalid method", "DELETE", ((HttpServletRequest) filterRequest).getMethod()); @@ -63,6 +64,7 @@ public class HiddenHttpMethodFilterTest { FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse) throws IOException, ServletException { assertEquals("Invalid method", "POST", ((HttpServletRequest) filterRequest).getMethod()); diff --git a/spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java index 5eed6a55ac7..d8c4128bf44 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/RequestContextFilterTests.java @@ -54,6 +54,7 @@ public class RequestContextFilterTests extends TestCase { // Expect one invocation by the filter being tested class DummyFilterChain implements FilterChain { public int invocations = 0; + @Override public void doFilter(ServletRequest req, ServletResponse resp) throws IOException, ServletException { ++invocations; if (invocations == 1) { diff --git a/spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java index a05f09a2fab..15ab9998a41 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java @@ -97,6 +97,7 @@ public class RequestLoggingFilterTests { request.setContent(requestBody); FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse) throws IOException, ServletException { ((HttpServletResponse) filterResponse).setStatus(HttpServletResponse.SC_OK); @@ -122,6 +123,7 @@ public class RequestLoggingFilterTests { request.setContent(requestBody.getBytes("UTF-8")); FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse) throws IOException, ServletException { ((HttpServletResponse) filterResponse).setStatus(HttpServletResponse.SC_OK); @@ -148,6 +150,7 @@ public class RequestLoggingFilterTests { request.setContent(requestBody); FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse) throws IOException, ServletException { ((HttpServletResponse) filterResponse).setStatus(HttpServletResponse.SC_OK); @@ -182,6 +185,7 @@ public class RequestLoggingFilterTests { private static class NoopFilterChain implements FilterChain { + @Override public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException { } } diff --git a/spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java index f5fdf084994..8ff31eb224a 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/ShallowEtagHeaderFilterTests.java @@ -58,6 +58,7 @@ public class ShallowEtagHeaderFilterTests { final byte[] responseBody = "Hello World".getBytes("UTF-8"); FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse) throws IOException, ServletException { assertEquals("Invalid request passed", request, filterRequest); @@ -83,6 +84,7 @@ public class ShallowEtagHeaderFilterTests { FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse) throws IOException, ServletException { assertEquals("Invalid request passed", request, filterRequest); @@ -109,6 +111,7 @@ public class ShallowEtagHeaderFilterTests { FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest filterRequest, ServletResponse filterResponse) throws IOException, ServletException { assertEquals("Invalid request passed", request, filterRequest); diff --git a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java index e106045cf92..0138ccd067e 100644 --- a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java +++ b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java @@ -36,12 +36,14 @@ public class DelegatingPhaseListenerTests extends TestCase { private StaticListableBeanFactory beanFactory; private DelegatingPhaseListenerMulticaster delPhaseListener; + @Override @SuppressWarnings("serial") protected void setUp() { facesContext = new MockFacesContext(); beanFactory = new StaticListableBeanFactory(); delPhaseListener = new DelegatingPhaseListenerMulticaster() { + @Override protected ListableBeanFactory getBeanFactory(FacesContext facesContext) { return beanFactory; } @@ -87,14 +89,17 @@ public class DelegatingPhaseListenerTests extends TestCase { boolean beforeCalled = false; boolean afterCalled = false; + @Override public PhaseId getPhaseId() { return PhaseId.ANY_PHASE; } + @Override public void beforePhase(PhaseEvent arg0) { beforeCalled = true; } + @Override public void afterPhase(PhaseEvent arg0) { afterCalled = true; } diff --git a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java index 76e8c829b14..0eefcba0c7e 100644 --- a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java @@ -42,6 +42,7 @@ public class DelegatingVariableResolverTests extends TestCase { // We need to override the getWebApplicationContext method here: // FacesContext and ExternalContext are hard to mock. DelegatingVariableResolver resolver = new DelegatingVariableResolver(new OriginalVariableResolver()) { + @Override protected WebApplicationContext getWebApplicationContext(FacesContext facesContext) { return wac; } @@ -61,6 +62,7 @@ public class DelegatingVariableResolverTests extends TestCase { // We need to override the getWebApplicationContext method here: // FacesContext and ExternalContext are hard to mock. SpringBeanVariableResolver resolver = new SpringBeanVariableResolver(new OriginalVariableResolver()) { + @Override protected WebApplicationContext getWebApplicationContext(FacesContext facesContext) { return wac; } @@ -72,6 +74,7 @@ public class DelegatingVariableResolverTests extends TestCase { private static class OriginalVariableResolver extends VariableResolver { + @Override public Object resolveVariable(FacesContext facesContext, String name) throws EvaluationException { if ("var1".equals(name)) { return "val1"; diff --git a/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java b/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java index 1e6c9d3f9ff..7faee579e7c 100644 --- a/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java +++ b/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java @@ -44,6 +44,7 @@ public class MockFacesContext extends FacesContext { private UIViewRoot viewRoot; + @Override public Application getApplication() { return application; } @@ -52,10 +53,12 @@ public class MockFacesContext extends FacesContext { this.application = application; } + @Override public Iterator getClientIdsWithMessages() { return null; } + @Override public ExternalContext getExternalContext() { return externalContext; } @@ -64,61 +67,77 @@ public class MockFacesContext extends FacesContext { this.externalContext = externalContext; } + @Override public Severity getMaximumSeverity() { return null; } + @Override public Iterator getMessages() { return null; } + @Override public Iterator getMessages(String arg0) { return null; } + @Override public RenderKit getRenderKit() { return null; } + @Override public boolean getRenderResponse() { return false; } + @Override public boolean getResponseComplete() { return false; } + @Override public ResponseStream getResponseStream() { return null; } + @Override public void setResponseStream(ResponseStream arg0) { } + @Override public ResponseWriter getResponseWriter() { return null; } + @Override public void setResponseWriter(ResponseWriter arg0) { } + @Override public UIViewRoot getViewRoot() { return viewRoot; } + @Override public void setViewRoot(UIViewRoot viewRoot) { this.viewRoot = viewRoot; } + @Override public void addMessage(String arg0, FacesMessage arg1) { } + @Override public void release() { } + @Override public void renderResponse() { } + @Override public void responseComplete() { } diff --git a/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java b/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java index 5cda13aead9..0ab7d46b39c 100644 --- a/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java +++ b/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java @@ -27,19 +27,24 @@ import javax.faces.lifecycle.Lifecycle; */ public class MockLifecycle extends Lifecycle { + @Override public void addPhaseListener(PhaseListener phaseListener) { } + @Override public void execute(FacesContext facesContext) throws FacesException { } + @Override public PhaseListener[] getPhaseListeners() { return null; } + @Override public void removePhaseListener(PhaseListener phaseListener) { } + @Override public void render(FacesContext facesContext) throws FacesException { } diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java index 573b1c54b30..986df7e9fa5 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java @@ -265,14 +265,17 @@ public class ModelAttributeMethodProcessorTests { return validateInvoked; } + @Override public void bind(WebRequest request) { bindInvoked = true; } + @Override public void validate() { validateInvoked = true; } + @Override public void validate(Object... validationHints) { validateInvoked = true; } diff --git a/spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java b/spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java index 9eb740031e4..d4e681abe38 100644 --- a/spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/support/InvocableHandlerMethodTests.java @@ -226,10 +226,12 @@ public class InvocableHandlerMethodTests { private static class ExceptionRaisingArgumentResolver implements HandlerMethodArgumentResolver { + @Override public boolean supportsParameter(MethodParameter parameter) { return true; } + @Override public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { throw new HttpMessageNotReadableException("oops, can't read"); diff --git a/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java b/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java index 45c84b353b2..918894fb5fd 100644 --- a/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java +++ b/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java @@ -46,10 +46,12 @@ public class StubArgumentResolver implements HandlerMethodArgumentResolver { return resolvedParameters; } + @Override public boolean supportsParameter(MethodParameter parameter) { return parameter.getParameterType().equals(this.parameterType); } + @Override public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { this.resolvedParameters.add(parameter); diff --git a/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java b/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java index 7f888093543..0320b886129 100644 --- a/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java +++ b/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java @@ -38,10 +38,12 @@ public class StubReturnValueHandler implements HandlerMethodReturnValueHandler { return this.returnValue; } + @Override public boolean supportsReturnType(MethodParameter returnType) { return returnType.getParameterType().equals(this.returnType); } + @Override public void handleReturnValue(Object returnValue, MethodParameter returnType, ModelAndViewContainer mavContainer, NativeWebRequest webRequest) throws Exception { this.returnValue = returnValue; diff --git a/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java b/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java index ae2f318b4ce..b3aa9beb689 100644 --- a/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java @@ -282,6 +282,7 @@ public class CommonsMultipartResolverTests { final List files = new ArrayList(); final FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse) { MultipartHttpServletRequest request = (MultipartHttpServletRequest) servletRequest; files.addAll(request.getFileMap().values()); @@ -319,6 +320,7 @@ public class CommonsMultipartResolverTests { final List files = new ArrayList(); FilterChain filterChain = new FilterChain() { + @Override public void doFilter(ServletRequest originalRequest, ServletResponse response) { if (originalRequest instanceof MultipartHttpServletRequest) { MultipartHttpServletRequest request = (MultipartHttpServletRequest) originalRequest; @@ -415,38 +417,47 @@ public class CommonsMultipartResolverTests { this.value = value; } + @Override public InputStream getInputStream() throws IOException { return new ByteArrayInputStream(value.getBytes()); } + @Override public String getContentType() { return contentType; } + @Override public String getName() { return name; } + @Override public boolean isInMemory() { return true; } + @Override public long getSize() { return value.length(); } + @Override public byte[] get() { return value.getBytes(); } + @Override public String getString(String encoding) throws UnsupportedEncodingException { return new String(get(), encoding); } + @Override public String getString() { return value; } + @Override public void write(File file) throws Exception { this.writtenFile = file; } @@ -455,6 +466,7 @@ public class CommonsMultipartResolverTests { return writtenFile; } + @Override public void delete() { this.deleted = true; } @@ -463,22 +475,27 @@ public class CommonsMultipartResolverTests { return deleted; } + @Override public String getFieldName() { return fieldName; } + @Override public void setFieldName(String s) { this.fieldName = s; } + @Override public boolean isFormField() { return (this.name == null); } + @Override public void setFormField(boolean b) { throw new UnsupportedOperationException(); } + @Override public OutputStream getOutputStream() throws IOException { throw new UnsupportedOperationException(); } diff --git a/spring-web/src/test/java/org/springframework/web/util/ExpressionEvaluationUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/ExpressionEvaluationUtilsTests.java index 72f1019cdc3..80bf92165b3 100644 --- a/spring-web/src/test/java/org/springframework/web/util/ExpressionEvaluationUtilsTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/ExpressionEvaluationUtilsTests.java @@ -270,6 +270,7 @@ public class ExpressionEvaluationUtilsTests { private ExpressionEvaluator eval = new CountingMockExpressionEvaluator(this); + @Override public ExpressionEvaluator getExpressionEvaluator() { return eval; } @@ -286,11 +287,13 @@ public class ExpressionEvaluationUtilsTests { super(pageContext); } + @Override public Expression parseExpression(String expression, Class expectedType, FunctionMapper functionMapper) throws ELException { this.parseExpressionCount++; return super.parseExpression(expression, expectedType, functionMapper); } + @Override public Object evaluate(String expression, Class expectedType, VariableResolver variableResolver, FunctionMapper functionMapper) throws ELException { this.evaluateCount++; return super.evaluate(expression, expectedType, variableResolver, functionMapper); diff --git a/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java b/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java index bb078da54c4..d2eab76bc3c 100644 --- a/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java +++ b/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java @@ -34,6 +34,7 @@ public class MockLog4jAppender extends AppenderSkeleton { /* (non-Javadoc) * @see org.apache.log4j.AppenderSkeleton#append(org.apache.log4j.spi.LoggingEvent) */ + @Override protected void append(LoggingEvent evt) { //System.out.println("Adding " + evt.getMessage()); loggingStrings.add(evt.getMessage()); @@ -42,6 +43,7 @@ public class MockLog4jAppender extends AppenderSkeleton { /* (non-Javadoc) * @see org.apache.log4j.Appender#close() */ + @Override public void close() { closeCalled = true; } @@ -49,6 +51,7 @@ public class MockLog4jAppender extends AppenderSkeleton { /* (non-Javadoc) * @see org.apache.log4j.Appender#requiresLayout() */ + @Override public boolean requiresLayout() { return false; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java index 0940539f54a..8ada7848fa9 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -51,12 +51,14 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void setBeanName(String beanName) { if (this.beanName == null || beanName == null) { this.beanName = beanName; } } + @Override public String getBeanName() { return beanName; } @@ -75,10 +77,12 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void destroy() { this.destroyed = true; } + @Override public boolean wasDestroyed() { return destroyed; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java index 7842bbfeacf..7a27cf0894e 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see org.springframework.beans.ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java index a04d1796443..9c8be8ac4c4 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java @@ -317,6 +317,7 @@ public abstract class AbstractBeanFactoryTests extends TestCase { public static class TestBeanEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) { TestBean tb = new TestBean(); StringTokenizer st = new StringTokenizer(text, "_"); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java index 006228975a7..f3d6eedefe1 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java @@ -74,6 +74,7 @@ public class DummyFactory * Return if the bean managed by this factory is a singleton. * @see FactoryBean#isSingleton() */ + @Override public boolean isSingleton() { return this.singleton; } @@ -85,6 +86,7 @@ public class DummyFactory this.singleton = singleton; } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -93,6 +95,7 @@ public class DummyFactory return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = (AutowireCapableBeanFactory) beanFactory; this.beanFactory.applyBeanPostProcessorsBeforeInitialization(this.testBean, this.beanName); @@ -119,6 +122,7 @@ public class DummyFactory return otherTestBean; } + @Override public void afterPropertiesSet() { if (initialized) { throw new RuntimeException("Cannot call afterPropertiesSet twice on the one bean"); @@ -144,6 +148,7 @@ public class DummyFactory * and prototype mode. * @see FactoryBean#getObject() */ + @Override public Object getObject() throws BeansException { if (isSingleton()) { return this.testBean; @@ -158,11 +163,13 @@ public class DummyFactory } } + @Override public Class getObjectType() { return TestBean.class; } + @Override public void destroy() { if (this.testBean != null) { this.testBean.setName(null); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java index 19b7da62f8d..191b3509c73 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java @@ -53,6 +53,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return initMethodDeclared; } + @Override public void setBeanName(String name) { this.beanName = name; } @@ -61,6 +62,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.owningFactory = beanFactory; } @@ -75,6 +77,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ this.postProcessedBeforeInit = true; } + @Override public void afterPropertiesSet() { if (this.owningFactory == null) { throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean"); @@ -126,6 +129,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ } } + @Override public void destroy() { if (this.destroyed) { throw new IllegalStateException("Already destroyed"); @@ -140,6 +144,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ public static class PostProcessor implements BeanPostProcessor { + @Override public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException { if (bean instanceof LifecycleBean) { ((LifecycleBean) bean).postProcessBeforeInit(); @@ -147,6 +152,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String name) throws BeansException { if (bean instanceof LifecycleBean) { ((LifecycleBean) bean).postProcessAfterInit(); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java index 4715fe448f6..17fd2145987 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java @@ -30,6 +30,7 @@ public class MustBeInitialized implements InitializingBean { /** * @see InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { this.inited = true; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java index 72c129ca4e3..2a624d5c97f 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java @@ -27,6 +27,7 @@ public class ACATester implements ApplicationContextAware { private ApplicationContext ac; + @Override public void setApplicationContext(ApplicationContext ctx) throws ApplicationContextException { // check reinitialization if (this.ac != null) { diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java index a0493b62ec2..fe8201644ba 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java @@ -39,10 +39,12 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe protected TestListener parentListener = new TestListener(); + @Override protected void setUp() throws Exception { this.applicationContext = createContext(); } + @Override protected BeanFactory getBeanFactory() { return applicationContext; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java index 8137de62f61..bd15215911b 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java @@ -29,6 +29,7 @@ public class BeanThatBroadcasts implements ApplicationContextAware { public int receivedCount; + @Override public void setApplicationContext(ApplicationContext applicationContext) { this.applicationContext = applicationContext; if (applicationContext.getDisplayName().indexOf("listener") != -1) { diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java index 9ab3f8ea40d..a4c79b2e2c0 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java @@ -43,6 +43,7 @@ public class BeanThatListens implements ApplicationListener { } + @Override public void onApplicationEvent(ApplicationEvent event) { eventCount++; if (beanThatBroadcasts != null) { diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java index 50c9936c444..14acac1ceb9 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java @@ -15,18 +15,21 @@ public class LifecycleContextBean extends LifecycleBean implements ApplicationCo protected ApplicationContext owningContext; + @Override public void setBeanFactory(BeanFactory beanFactory) { super.setBeanFactory(beanFactory); if (this.owningContext != null) throw new RuntimeException("Factory called setBeanFactory after setApplicationContext"); } + @Override public void afterPropertiesSet() { super.afterPropertiesSet(); if (this.owningContext == null) throw new RuntimeException("Factory didn't call setAppliationContext before afterPropertiesSet on lifecycle bean"); } + @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { if (this.owningFactory == null) throw new RuntimeException("Factory called setApplicationContext before setBeanFactory"); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/TestListener.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/TestListener.java index 29f375105ff..739222190fa 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/context/TestListener.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/TestListener.java @@ -21,6 +21,7 @@ public class TestListener implements ApplicationListener { eventCount = 0; } + @Override public void onApplicationEvent(ApplicationEvent e) { ++eventCount; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java index 784e160483a..c4d9b9ebb3d 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java @@ -54,15 +54,18 @@ public class DelegatingServletOutputStream extends ServletOutputStream { } + @Override public void write(int b) throws IOException { this.targetStream.write(b); } + @Override public void flush() throws IOException { super.flush(); this.targetStream.flush(); } + @Override public void close() throws IOException { super.close(); this.targetStream.close(); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java index c86e95a93a7..5a2b7fd1aa8 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java @@ -136,6 +136,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return this.writerAccessAllowed; } + @Override public void setCharacterEncoding(String characterEncoding) { this.characterEncoding = characterEncoding; this.charset = true; @@ -152,10 +153,12 @@ public class MockHttpServletResponse implements HttpServletResponse { } } + @Override public String getCharacterEncoding() { return this.characterEncoding; } + @Override public ServletOutputStream getOutputStream() { if (!this.outputStreamAccessAllowed) { throw new IllegalStateException("OutputStream access not allowed"); @@ -163,6 +166,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return this.outputStream; } + @Override public PrintWriter getWriter() throws UnsupportedEncodingException { if (!this.writerAccessAllowed) { throw new IllegalStateException("Writer access not allowed"); @@ -186,6 +190,7 @@ public class MockHttpServletResponse implements HttpServletResponse { this.content.toString(this.characterEncoding) : this.content.toString(); } + @Override public void setContentLength(int contentLength) { this.contentLength = contentLength; doAddHeaderValue(CONTENT_LENGTH_HEADER, contentLength, true); @@ -195,6 +200,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return this.contentLength; } + @Override public void setContentType(String contentType) { this.contentType = contentType; if (contentType != null) { @@ -208,22 +214,27 @@ public class MockHttpServletResponse implements HttpServletResponse { } } + @Override public String getContentType() { return this.contentType; } + @Override public void setBufferSize(int bufferSize) { this.bufferSize = bufferSize; } + @Override public int getBufferSize() { return this.bufferSize; } + @Override public void flushBuffer() { setCommitted(true); } + @Override public void resetBuffer() { if (isCommitted()) { throw new IllegalStateException("Cannot reset buffer - response is already committed"); @@ -242,10 +253,12 @@ public class MockHttpServletResponse implements HttpServletResponse { this.committed = committed; } + @Override public boolean isCommitted() { return this.committed; } + @Override public void reset() { resetBuffer(); this.characterEncoding = null; @@ -258,10 +271,12 @@ public class MockHttpServletResponse implements HttpServletResponse { this.errorMessage = null; } + @Override public void setLocale(Locale locale) { this.locale = locale; } + @Override public Locale getLocale() { return this.locale; } @@ -271,6 +286,7 @@ public class MockHttpServletResponse implements HttpServletResponse { // HttpServletResponse interface //--------------------------------------------------------------------- + @Override public void addCookie(Cookie cookie) { Assert.notNull(cookie, "Cookie must not be null"); this.cookies.add(cookie); @@ -290,6 +306,7 @@ public class MockHttpServletResponse implements HttpServletResponse { return null; } + @Override public boolean containsHeader(String name) { return (HeaderValueHolder.getByName(this.headers, name) != null); } @@ -365,6 +382,7 @@ public class MockHttpServletResponse implements HttpServletResponse { * The default implementation returns the given URL String as-is. *

Can be overridden in subclasses, appending a session id or the like. */ + @Override public String encodeURL(String url) { return url; } @@ -377,18 +395,22 @@ public class MockHttpServletResponse implements HttpServletResponse { * override the common {@link #encodeURL} method instead, applying * to redirect URLs as well as to general URLs. */ + @Override public String encodeRedirectURL(String url) { return encodeURL(url); } + @Override public String encodeUrl(String url) { return encodeURL(url); } + @Override public String encodeRedirectUrl(String url) { return encodeRedirectURL(url); } + @Override public void sendError(int status, String errorMessage) throws IOException { if (isCommitted()) { throw new IllegalStateException("Cannot set error status - response is already committed"); @@ -398,6 +420,7 @@ public class MockHttpServletResponse implements HttpServletResponse { setCommitted(true); } + @Override public void sendError(int status) throws IOException { if (isCommitted()) { throw new IllegalStateException("Cannot set error status - response is already committed"); @@ -406,6 +429,7 @@ public class MockHttpServletResponse implements HttpServletResponse { setCommitted(true); } + @Override public void sendRedirect(String url) throws IOException { if (isCommitted()) { throw new IllegalStateException("Cannot send redirect - response is already committed"); @@ -420,26 +444,32 @@ public class MockHttpServletResponse implements HttpServletResponse { return getHeader(LOCATION_HEADER); } + @Override public void setDateHeader(String name, long value) { setHeaderValue(name, value); } + @Override public void addDateHeader(String name, long value) { addHeaderValue(name, value); } + @Override public void setHeader(String name, String value) { setHeaderValue(name, value); } + @Override public void addHeader(String name, String value) { addHeaderValue(name, value); } + @Override public void setIntHeader(String name, int value) { setHeaderValue(name, value); } + @Override public void addIntHeader(String name, int value) { addHeaderValue(name, value); } @@ -487,10 +517,12 @@ public class MockHttpServletResponse implements HttpServletResponse { } } + @Override public void setStatus(int status) { this.status = status; } + @Override public void setStatus(int status, String errorMessage) { this.status = status; this.errorMessage = errorMessage; @@ -553,12 +585,14 @@ public class MockHttpServletResponse implements HttpServletResponse { super(out); } + @Override public void write(int b) throws IOException { super.write(b); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void flush() throws IOException { super.flush(); setCommitted(true); @@ -576,24 +610,28 @@ public class MockHttpServletResponse implements HttpServletResponse { super(out, true); } + @Override public void write(char buf[], int off, int len) { super.write(buf, off, len); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void write(String s, int off, int len) { super.write(s, off, len); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void write(int c) { super.write(c); super.flush(); setCommittedIfBufferSizeExceeded(); } + @Override public void flush() { super.flush(); setCommitted(true); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java index 1855230d2c5..82a89b61a38 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java @@ -98,10 +98,12 @@ public class MockHttpSession implements HttpSession { this.id = (id != null ? id : Integer.toString(nextId++)); } + @Override public long getCreationTime() { return this.creationTime; } + @Override public String getId() { return this.id; } @@ -111,43 +113,53 @@ public class MockHttpSession implements HttpSession { this.isNew = false; } + @Override public long getLastAccessedTime() { return this.lastAccessedTime; } + @Override public ServletContext getServletContext() { return this.servletContext; } + @Override public void setMaxInactiveInterval(int interval) { this.maxInactiveInterval = interval; } + @Override public int getMaxInactiveInterval() { return this.maxInactiveInterval; } + @Override public HttpSessionContext getSessionContext() { throw new UnsupportedOperationException("getSessionContext"); } + @Override public Object getAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); return this.attributes.get(name); } + @Override public Object getValue(String name) { return getAttribute(name); } + @Override public Enumeration getAttributeNames() { return Collections.enumeration(this.attributes.keySet()); } + @Override public String[] getValueNames() { return this.attributes.keySet().toArray(new String[this.attributes.size()]); } + @Override public void setAttribute(String name, Object value) { Assert.notNull(name, "Attribute name must not be null"); if (value != null) { @@ -161,10 +173,12 @@ public class MockHttpSession implements HttpSession { } } + @Override public void putValue(String name, Object value) { setAttribute(name, value); } + @Override public void removeAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); Object value = this.attributes.remove(name); @@ -173,6 +187,7 @@ public class MockHttpSession implements HttpSession { } } + @Override public void removeValue(String name) { removeAttribute(name); } @@ -197,6 +212,7 @@ public class MockHttpSession implements HttpSession { * * @throws IllegalStateException if this method is called on an already invalidated session */ + @Override public void invalidate() { if (this.invalid) { throw new IllegalStateException("The session has already been invalidated"); @@ -215,6 +231,7 @@ public class MockHttpSession implements HttpSession { this.isNew = value; } + @Override public boolean isNew() { return this.isNew; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java index f71992aed7e..dbcfa62be33 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java @@ -96,34 +96,42 @@ public class MockMultipartFile implements MultipartFile { } + @Override public String getName() { return this.name; } + @Override public String getOriginalFilename() { return this.originalFilename; } + @Override public String getContentType() { return this.contentType; } + @Override public boolean isEmpty() { return (this.content.length == 0); } + @Override public long getSize() { return this.content.length; } + @Override public byte[] getBytes() throws IOException { return this.content; } + @Override public InputStream getInputStream() throws IOException { return new ByteArrayInputStream(this.content); } + @Override public void transferTo(File dest) throws IOException, IllegalStateException { FileCopyUtils.copy(this.content, dest); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java index 88660bb3aed..e43172c1982 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java @@ -55,6 +55,7 @@ public class MockRequestDispatcher implements RequestDispatcher { } + @Override public void forward(ServletRequest request, ServletResponse response) { Assert.notNull(request, "Request must not be null"); Assert.notNull(response, "Response must not be null"); @@ -67,6 +68,7 @@ public class MockRequestDispatcher implements RequestDispatcher { } } + @Override public void include(ServletRequest request, ServletResponse response) { Assert.notNull(request, "Request must not be null"); Assert.notNull(response, "Response must not be null"); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockServletContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockServletContext.java index e3fa23eff3e..cf3e6e26c16 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockServletContext.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockServletContext.java @@ -195,6 +195,7 @@ public class MockServletContext implements ServletContext { } /* This is a Servlet API 2.5 method. */ + @Override public String getContextPath() { return this.contextPath; } @@ -203,6 +204,7 @@ public class MockServletContext implements ServletContext { this.contexts.put(contextPath, context); } + @Override public ServletContext getContext(String contextPath) { if (this.contextPath.equals(contextPath)) { return this; @@ -214,6 +216,7 @@ public class MockServletContext implements ServletContext { this.majorVersion = majorVersion; } + @Override public int getMajorVersion() { return this.majorVersion; } @@ -222,6 +225,7 @@ public class MockServletContext implements ServletContext { this.minorVersion = minorVersion; } + @Override public int getMinorVersion() { return this.minorVersion; } @@ -242,10 +246,12 @@ public class MockServletContext implements ServletContext { return this.effectiveMinorVersion; } + @Override public String getMimeType(String filePath) { return MimeTypeResolver.getMimeType(filePath); } + @Override public Set getResourcePaths(String path) { String actualPath = (path.endsWith("/") ? path : path + "/"); Resource resource = this.resourceLoader.getResource(getResourceLocation(actualPath)); @@ -271,6 +277,7 @@ public class MockServletContext implements ServletContext { } } + @Override public URL getResource(String path) throws MalformedURLException { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); if (!resource.exists()) { @@ -288,6 +295,7 @@ public class MockServletContext implements ServletContext { } } + @Override public InputStream getResourceAsStream(String path) { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); if (!resource.exists()) { @@ -302,6 +310,7 @@ public class MockServletContext implements ServletContext { } } + @Override public RequestDispatcher getRequestDispatcher(String path) { if (!path.startsWith("/")) { throw new IllegalArgumentException("RequestDispatcher path at ServletContext level must start with '/'"); @@ -309,6 +318,7 @@ public class MockServletContext implements ServletContext { return new MockRequestDispatcher(path); } + @Override public RequestDispatcher getNamedDispatcher(String path) { return this.namedRequestDispatchers.get(path); } @@ -366,30 +376,37 @@ public class MockServletContext implements ServletContext { registerNamedDispatcher(this.defaultServletName, new MockRequestDispatcher(this.defaultServletName)); } + @Override public Servlet getServlet(String name) { return null; } + @Override public Enumeration getServlets() { return Collections.enumeration(new HashSet()); } + @Override public Enumeration getServletNames() { return Collections.enumeration(new HashSet()); } + @Override public void log(String message) { logger.info(message); } + @Override public void log(Exception ex, String message) { logger.info(message, ex); } + @Override public void log(String message, Throwable ex) { logger.info(message, ex); } + @Override public String getRealPath(String path) { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); try { @@ -401,15 +418,18 @@ public class MockServletContext implements ServletContext { } } + @Override public String getServerInfo() { return "MockServletContext"; } + @Override public String getInitParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.initParameters.get(name); } + @Override public Enumeration getInitParameterNames() { return Collections.enumeration(this.initParameters.keySet()); } @@ -428,15 +448,18 @@ public class MockServletContext implements ServletContext { this.initParameters.put(name, value); } + @Override public Object getAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); return this.attributes.get(name); } + @Override public Enumeration getAttributeNames() { return new Vector(this.attributes.keySet()).elements(); } + @Override public void setAttribute(String name, Object value) { Assert.notNull(name, "Attribute name must not be null"); if (value != null) { @@ -447,6 +470,7 @@ public class MockServletContext implements ServletContext { } } + @Override public void removeAttribute(String name) { Assert.notNull(name, "Attribute name must not be null"); this.attributes.remove(name); @@ -456,6 +480,7 @@ public class MockServletContext implements ServletContext { this.servletContextName = servletContextName; } + @Override public String getServletContextName() { return this.servletContextName; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java index bec6687887c..2f5c773e0c2 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java @@ -59,6 +59,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action } + @Override public void setWindowState(WindowState windowState) throws WindowStateException { if (this.redirectedUrl != null) { throw new IllegalStateException("Cannot set WindowState after sendRedirect has been called"); @@ -67,6 +68,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action this.redirectAllowed = false; } + @Override public void setPortletMode(PortletMode portletMode) throws PortletModeException { if (this.redirectedUrl != null) { throw new IllegalStateException("Cannot set PortletMode after sendRedirect has been called"); @@ -75,6 +77,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action this.redirectAllowed = false; } + @Override public void setRenderParameters(Map parameters) { if (this.redirectedUrl != null) { throw new IllegalStateException("Cannot set render parameters after sendRedirect has been called"); @@ -83,6 +86,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action this.redirectAllowed = false; } + @Override public void setRenderParameter(String key, String value) { if (this.redirectedUrl != null) { throw new IllegalStateException("Cannot set render parameters after sendRedirect has been called"); @@ -91,6 +95,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action this.redirectAllowed = false; } + @Override public void setRenderParameter(String key, String[] values) { if (this.redirectedUrl != null) { throw new IllegalStateException("Cannot set render parameters after sendRedirect has been called"); @@ -99,6 +104,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action this.redirectAllowed = false; } + @Override public void sendRedirect(String location) throws IOException { if (!this.redirectAllowed) { throw new IllegalStateException( @@ -108,6 +114,7 @@ public class MockActionResponse extends MockStateAwareResponse implements Action this.redirectedUrl = location; } + @Override public void sendRedirect(String location, String renderUrlParamName) throws IOException { sendRedirect(location); if (renderUrlParamName != null) { diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java index aad992058b9..fcdc50acdc0 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java @@ -56,18 +56,21 @@ public abstract class MockBaseURL implements BaseURL { // BaseURL methods //--------------------------------------------------------------------- + @Override public void setParameter(String key, String value) { Assert.notNull(key, "Parameter key must be null"); Assert.notNull(value, "Parameter value must not be null"); this.parameters.put(key, new String[] {value}); } + @Override public void setParameter(String key, String[] values) { Assert.notNull(key, "Parameter key must be null"); Assert.notNull(values, "Parameter values must not be null"); this.parameters.put(key, values); } + @Override public void setParameters(Map parameters) { Assert.notNull(parameters, "Parameters Map must not be null"); this.parameters.clear(); @@ -87,10 +90,12 @@ public abstract class MockBaseURL implements BaseURL { return this.parameters.get(name); } + @Override public Map getParameterMap() { return Collections.unmodifiableMap(this.parameters); } + @Override public void setSecure(boolean secure) throws PortletSecurityException { this.secure = secure; } @@ -99,14 +104,17 @@ public abstract class MockBaseURL implements BaseURL { return this.secure; } + @Override public void write(Writer out) throws IOException { out.write(toString()); } + @Override public void write(Writer out, boolean escapeXML) throws IOException { out.write(toString()); } + @Override public void addProperty(String key, String value) { String[] values = this.properties.get(key); if (values != null) { @@ -117,6 +125,7 @@ public abstract class MockBaseURL implements BaseURL { } } + @Override public void setProperty(String key, String value) { this.properties.put(key, new String[] {value}); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java index 0ee9fbeb7c7..cac1a83d5ff 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java @@ -35,34 +35,42 @@ public class MockCacheControl implements CacheControl { private boolean useCachedContent = false; + @Override public int getExpirationTime() { return this.expirationTime; } + @Override public void setExpirationTime(int time) { this.expirationTime = time; } + @Override public boolean isPublicScope() { return this.publicScope; } + @Override public void setPublicScope(boolean publicScope) { this.publicScope = publicScope; } + @Override public String getETag() { return this.etag; } + @Override public void setETag(String token) { this.etag = token; } + @Override public boolean useCachedContent() { return this.useCachedContent; } + @Override public void setUseCachedContent(boolean useCachedContent) { this.useCachedContent = useCachedContent; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java index 8f36c3a7640..8fa396de4d5 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java @@ -76,6 +76,7 @@ public class MockClientDataRequest extends MockPortletRequest implements ClientD this.content = content; } + @Override public InputStream getPortletInputStream() throws IOException { if (this.content != null) { return new ByteArrayInputStream(this.content); @@ -85,10 +86,12 @@ public class MockClientDataRequest extends MockPortletRequest implements ClientD } } + @Override public void setCharacterEncoding(String characterEncoding) { this.characterEncoding = characterEncoding; } + @Override public BufferedReader getReader() throws UnsupportedEncodingException { if (this.content != null) { InputStream sourceStream = new ByteArrayInputStream(this.content); @@ -101,6 +104,7 @@ public class MockClientDataRequest extends MockPortletRequest implements ClientD } } + @Override public String getCharacterEncoding() { return this.characterEncoding; } @@ -109,10 +113,12 @@ public class MockClientDataRequest extends MockPortletRequest implements ClientD this.contentType = contentType; } + @Override public String getContentType() { return this.contentType; } + @Override public int getContentLength() { return (this.content != null ? content.length : -1); } @@ -121,6 +127,7 @@ public class MockClientDataRequest extends MockPortletRequest implements ClientD this.method = method; } + @Override public String getMethod() { return this.method; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java index 0dc7efaba8d..c2c82febae7 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java @@ -73,14 +73,17 @@ public class MockEvent implements Event { } + @Override public QName getQName() { return this.name; } + @Override public String getName() { return this.name.getLocalPart(); } + @Override public Serializable getValue() { return this.value; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java index 2406f18d01c..af4725dea72 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java @@ -73,6 +73,7 @@ public class MockEventRequest extends MockPortletRequest implements EventRequest return EVENT_PHASE; } + @Override public Event getEvent() { return this.event; } @@ -81,6 +82,7 @@ public class MockEventRequest extends MockPortletRequest implements EventRequest this.method = method; } + @Override public String getMethod() { return this.method; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java index 1a00e8b2d55..f7c846e028f 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java @@ -27,6 +27,7 @@ import javax.portlet.EventResponse; */ public class MockEventResponse extends MockStateAwareResponse implements EventResponse { + @Override public void setRenderParameters(EventRequest request) { setRenderParameters(request.getParameterMap()); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java index e606fc808d2..cbfb70bca1e 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java @@ -101,6 +101,7 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons // RenderResponse methods //--------------------------------------------------------------------- + @Override public void setContentType(String contentType) { if (this.request != null) { Enumeration supportedTypes = this.request.getResponseContentTypes(); @@ -112,6 +113,7 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons this.contentType = contentType; } + @Override public String getContentType() { return this.contentType; } @@ -120,10 +122,12 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons this.characterEncoding = characterEncoding; } + @Override public String getCharacterEncoding() { return this.characterEncoding; } + @Override public PrintWriter getWriter() throws UnsupportedEncodingException { if (this.writer == null) { Writer targetWriter = (this.characterEncoding != null @@ -150,18 +154,22 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons this.locale = locale; } + @Override public Locale getLocale() { return this.locale; } + @Override public void setBufferSize(int bufferSize) { this.bufferSize = bufferSize; } + @Override public int getBufferSize() { return this.bufferSize; } + @Override public void flushBuffer() { if (this.writer != null) { this.writer.flush(); @@ -177,6 +185,7 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons this.committed = true; } + @Override public void resetBuffer() { if (this.committed) { throw new IllegalStateException("Cannot reset buffer - response is already committed"); @@ -188,10 +197,12 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons this.committed = committed; } + @Override public boolean isCommitted() { return this.committed; } + @Override public void reset() { resetBuffer(); this.characterEncoding = null; @@ -199,22 +210,27 @@ public class MockMimeResponse extends MockPortletResponse implements MimeRespons this.locale = null; } + @Override public OutputStream getPortletOutputStream() throws IOException { return this.outputStream; } + @Override public PortletURL createRenderURL() { return new MockPortletURL(getPortalContext(), MockPortletURL.URL_TYPE_RENDER); } + @Override public PortletURL createActionURL() { return new MockPortletURL(getPortalContext(), MockPortletURL.URL_TYPE_ACTION); } + @Override public ResourceURL createResourceURL() { return new MockResourceURL(); } + @Override public CacheControl getCacheControl() { return this.cacheControl; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java index 7df8b547b09..54201b8ec8b 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java @@ -56,14 +56,17 @@ public class MockMultipartActionRequest extends MockActionRequest implements Mul this.multipartFiles.add(file.getName(), file); } + @Override public Iterator getFileNames() { return this.multipartFiles.keySet().iterator(); } + @Override public MultipartFile getFile(String name) { return this.multipartFiles.getFirst(name); } + @Override public List getFiles(String name) { List multipartFiles = this.multipartFiles.get(name); if (multipartFiles != null) { @@ -74,14 +77,17 @@ public class MockMultipartActionRequest extends MockActionRequest implements Mul } } + @Override public Map getFileMap() { return this.multipartFiles.toSingleValueMap(); } + @Override public MultiValueMap getMultiFileMap() { return new LinkedMultiValueMap(this.multipartFiles); } + @Override public String getMultipartContentType(String paramOrFileName) { MultipartFile file = getFile(paramOrFileName); if (file != null) { diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java index 949d077b9a2..8731438d70c 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java @@ -74,6 +74,7 @@ public class MockPortalContext implements PortalContext { } + @Override public String getPortalInfo() { return "MockPortal/1.0"; } @@ -82,18 +83,22 @@ public class MockPortalContext implements PortalContext { this.properties.put(name, value); } + @Override public String getProperty(String name) { return this.properties.get(name); } + @Override public Enumeration getPropertyNames() { return Collections.enumeration(this.properties.keySet()); } + @Override public Enumeration getSupportedPortletModes() { return Collections.enumeration(this.portletModes); } + @Override public Enumeration getSupportedWindowStates() { return Collections.enumeration(this.windowStates); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java index 985c1e20dca..8d9157e1d2f 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java @@ -96,10 +96,12 @@ public class MockPortletConfig implements PortletConfig { } + @Override public String getPortletName() { return this.portletName; } + @Override public PortletContext getPortletContext() { return this.portletContext; } @@ -109,6 +111,7 @@ public class MockPortletConfig implements PortletConfig { this.resourceBundles.put(locale, resourceBundle); } + @Override public ResourceBundle getResourceBundle(Locale locale) { Assert.notNull(locale, "Locale must not be null"); return this.resourceBundles.get(locale); @@ -119,11 +122,13 @@ public class MockPortletConfig implements PortletConfig { this.initParameters.put(name, value); } + @Override public String getInitParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.initParameters.get(name); } + @Override public Enumeration getInitParameterNames() { return Collections.enumeration(this.initParameters.keySet()); } @@ -132,6 +137,7 @@ public class MockPortletConfig implements PortletConfig { this.publicRenderParameterNames.add(name); } + @Override public Enumeration getPublicRenderParameterNames() { return Collections.enumeration(this.publicRenderParameterNames); } @@ -140,6 +146,7 @@ public class MockPortletConfig implements PortletConfig { this.defaultNamespace = defaultNamespace; } + @Override public String getDefaultNamespace() { return this.defaultNamespace; } @@ -148,6 +155,7 @@ public class MockPortletConfig implements PortletConfig { this.publishingEventQNames.add(name); } + @Override public Enumeration getPublishingEventQNames() { return Collections.enumeration(this.publishingEventQNames); } @@ -156,6 +164,7 @@ public class MockPortletConfig implements PortletConfig { this.processingEventQNames.add(name); } + @Override public Enumeration getProcessingEventQNames() { return Collections.enumeration(this.processingEventQNames); } @@ -164,6 +173,7 @@ public class MockPortletConfig implements PortletConfig { this.supportedLocales.add(locale); } + @Override public Enumeration getSupportedLocales() { return Collections.enumeration(this.supportedLocales); } @@ -176,6 +186,7 @@ public class MockPortletConfig implements PortletConfig { this.containerRuntimeOptions.put(key, values); } + @Override public Map getContainerRuntimeOptions() { return Collections.unmodifiableMap(this.containerRuntimeOptions); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java index cd8c997e37d..a37c747e12a 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java @@ -124,10 +124,12 @@ public class MockPortletContext implements PortletContext { } + @Override public String getServerInfo() { return "MockPortal/1.0"; } + @Override public PortletRequestDispatcher getRequestDispatcher(String path) { if (!path.startsWith("/")) { throw new IllegalArgumentException( @@ -136,10 +138,12 @@ public class MockPortletContext implements PortletContext { return new MockPortletRequestDispatcher(path); } + @Override public PortletRequestDispatcher getNamedDispatcher(String path) { return null; } + @Override public InputStream getResourceAsStream(String path) { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); try { @@ -151,18 +155,22 @@ public class MockPortletContext implements PortletContext { } } + @Override public int getMajorVersion() { return 2; } + @Override public int getMinorVersion() { return 0; } + @Override public String getMimeType(String filePath) { return null; } + @Override public String getRealPath(String path) { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); try { @@ -174,6 +182,7 @@ public class MockPortletContext implements PortletContext { } } + @Override public Set getResourcePaths(String path) { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); try { @@ -192,6 +201,7 @@ public class MockPortletContext implements PortletContext { } } + @Override public URL getResource(String path) throws MalformedURLException { Resource resource = this.resourceLoader.getResource(getResourceLocation(path)); try { @@ -203,14 +213,17 @@ public class MockPortletContext implements PortletContext { } } + @Override public Object getAttribute(String name) { return this.attributes.get(name); } + @Override public Enumeration getAttributeNames() { return Collections.enumeration(this.attributes.keySet()); } + @Override public void setAttribute(String name, Object value) { if (value != null) { this.attributes.put(name, value); @@ -220,6 +233,7 @@ public class MockPortletContext implements PortletContext { } } + @Override public void removeAttribute(String name) { this.attributes.remove(name); } @@ -229,19 +243,23 @@ public class MockPortletContext implements PortletContext { this.initParameters.put(name, value); } + @Override public String getInitParameter(String name) { Assert.notNull(name, "Parameter name must not be null"); return this.initParameters.get(name); } + @Override public Enumeration getInitParameterNames() { return Collections.enumeration(this.initParameters.keySet()); } + @Override public void log(String message) { logger.info(message); } + @Override public void log(String message, Throwable t) { logger.info(message, t); } @@ -250,6 +268,7 @@ public class MockPortletContext implements PortletContext { this.portletContextName = portletContextName; } + @Override public String getPortletContextName() { return this.portletContextName; } @@ -258,6 +277,7 @@ public class MockPortletContext implements PortletContext { this.containerRuntimeOptions.add(key); } + @Override public Enumeration getContainerRuntimeOptions() { return Collections.enumeration(this.containerRuntimeOptions); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java index b885f358526..d5dab011ced 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java @@ -171,10 +171,12 @@ public class MockPortletRequest implements PortletRequest { // PortletRequest methods //--------------------------------------------------------------------- + @Override public boolean isWindowStateAllowed(WindowState windowState) { return CollectionUtils.contains(this.portalContext.getSupportedWindowStates(), windowState); } + @Override public boolean isPortletModeAllowed(PortletMode portletMode) { return CollectionUtils.contains(this.portalContext.getSupportedPortletModes(), portletMode); } @@ -184,6 +186,7 @@ public class MockPortletRequest implements PortletRequest { this.portletMode = portletMode; } + @Override public PortletMode getPortletMode() { return this.portletMode; } @@ -193,6 +196,7 @@ public class MockPortletRequest implements PortletRequest { this.windowState = windowState; } + @Override public WindowState getWindowState() { return this.windowState; } @@ -202,6 +206,7 @@ public class MockPortletRequest implements PortletRequest { this.portletPreferences = preferences; } + @Override public PortletPreferences getPreferences() { return this.portletPreferences; } @@ -214,10 +219,12 @@ public class MockPortletRequest implements PortletRequest { } } + @Override public PortletSession getPortletSession() { return getPortletSession(true); } + @Override public PortletSession getPortletSession(boolean create) { checkActive(); // Reset session if invalidated. @@ -261,21 +268,25 @@ public class MockPortletRequest implements PortletRequest { } } + @Override public String getProperty(String key) { Assert.notNull(key, "Property key must not be null"); List list = this.properties.get(key); return (list != null && list.size() > 0 ? (String) list.get(0) : null); } + @Override public Enumeration getProperties(String key) { Assert.notNull(key, "property key must not be null"); return Collections.enumeration(this.properties.get(key)); } + @Override public Enumeration getPropertyNames() { return Collections.enumeration(this.properties.keySet()); } + @Override public PortalContext getPortalContext() { return this.portalContext; } @@ -284,6 +295,7 @@ public class MockPortletRequest implements PortletRequest { this.authType = authType; } + @Override public String getAuthType() { return this.authType; } @@ -292,6 +304,7 @@ public class MockPortletRequest implements PortletRequest { this.contextPath = contextPath; } + @Override public String getContextPath() { return this.contextPath; } @@ -300,6 +313,7 @@ public class MockPortletRequest implements PortletRequest { this.remoteUser = remoteUser; } + @Override public String getRemoteUser() { return this.remoteUser; } @@ -308,6 +322,7 @@ public class MockPortletRequest implements PortletRequest { this.userPrincipal = userPrincipal; } + @Override public Principal getUserPrincipal() { return this.userPrincipal; } @@ -316,15 +331,18 @@ public class MockPortletRequest implements PortletRequest { this.userRoles.add(role); } + @Override public boolean isUserInRole(String role) { return this.userRoles.contains(role); } + @Override public Object getAttribute(String name) { checkActive(); return this.attributes.get(name); } + @Override public Enumeration getAttributeNames() { checkActive(); return Collections.enumeration(this.attributes.keySet()); @@ -365,19 +383,23 @@ public class MockPortletRequest implements PortletRequest { } } + @Override public String getParameter(String name) { String[] arr = this.parameters.get(name); return (arr != null && arr.length > 0 ? arr[0] : null); } + @Override public Enumeration getParameterNames() { return Collections.enumeration(this.parameters.keySet()); } + @Override public String[] getParameterValues(String name) { return this.parameters.get(name); } + @Override public Map getParameterMap() { return Collections.unmodifiableMap(this.parameters); } @@ -386,10 +408,12 @@ public class MockPortletRequest implements PortletRequest { this.secure = secure; } + @Override public boolean isSecure() { return this.secure; } + @Override public void setAttribute(String name, Object value) { checkActive(); if (value != null) { @@ -400,11 +424,13 @@ public class MockPortletRequest implements PortletRequest { } } + @Override public void removeAttribute(String name) { checkActive(); this.attributes.remove(name); } + @Override public String getRequestedSessionId() { PortletSession session = this.getPortletSession(); return (session != null ? session.getId() : null); @@ -414,6 +440,7 @@ public class MockPortletRequest implements PortletRequest { this.requestedSessionIdValid = requestedSessionIdValid; } + @Override public boolean isRequestedSessionIdValid() { return this.requestedSessionIdValid; } @@ -426,10 +453,12 @@ public class MockPortletRequest implements PortletRequest { this.responseContentTypes.add(0, responseContentType); } + @Override public String getResponseContentType() { return this.responseContentTypes.get(0); } + @Override public Enumeration getResponseContentTypes() { return Collections.enumeration(this.responseContentTypes); } @@ -442,10 +471,12 @@ public class MockPortletRequest implements PortletRequest { this.locales.add(0, locale); } + @Override public Locale getLocale() { return this.locales.get(0); } + @Override public Enumeration getLocales() { return Collections.enumeration(this.locales); } @@ -454,6 +485,7 @@ public class MockPortletRequest implements PortletRequest { this.scheme = scheme; } + @Override public String getScheme() { return this.scheme; } @@ -462,6 +494,7 @@ public class MockPortletRequest implements PortletRequest { this.serverName = serverName; } + @Override public String getServerName() { return this.serverName; } @@ -470,6 +503,7 @@ public class MockPortletRequest implements PortletRequest { this.serverPort = serverPort; } + @Override public int getServerPort() { return this.serverPort; } @@ -478,6 +512,7 @@ public class MockPortletRequest implements PortletRequest { this.windowID = windowID; } + @Override public String getWindowID() { return this.windowID; } @@ -486,10 +521,12 @@ public class MockPortletRequest implements PortletRequest { this.cookies = cookies; } + @Override public Cookie[] getCookies() { return this.cookies; } + @Override public Map getPrivateParameterMap() { if (!this.publicParameterNames.isEmpty()) { Map filtered = new LinkedHashMap(); @@ -505,6 +542,7 @@ public class MockPortletRequest implements PortletRequest { } } + @Override public Map getPublicParameterMap() { if (!this.publicParameterNames.isEmpty()) { Map filtered = new LinkedHashMap(); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java index ca8695f90e2..5ba423ed0e5 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java @@ -53,10 +53,12 @@ public class MockPortletRequestDispatcher implements PortletRequestDispatcher { } + @Override public void include(RenderRequest request, RenderResponse response) throws PortletException, IOException { include((PortletRequest) request, (PortletResponse) response); } + @Override public void include(PortletRequest request, PortletResponse response) throws PortletException, IOException { Assert.notNull(request, "Request must not be null"); Assert.notNull(response, "Response must not be null"); @@ -69,6 +71,7 @@ public class MockPortletRequestDispatcher implements PortletRequestDispatcher { } } + @Override public void forward(PortletRequest request, PortletResponse response) throws PortletException, IOException { Assert.notNull(request, "Request must not be null"); Assert.notNull(response, "Response must not be null"); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java index b556209fcd3..9fe6d6315f7 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java @@ -85,6 +85,7 @@ public class MockPortletResponse implements PortletResponse { // PortletResponse methods //--------------------------------------------------------------------- + @Override public void addProperty(String key, String value) { Assert.notNull(key, "Property key must not be null"); String[] oldArr = this.properties.get(key); @@ -99,6 +100,7 @@ public class MockPortletResponse implements PortletResponse { } } + @Override public void setProperty(String key, String value) { Assert.notNull(key, "Property key must not be null"); this.properties.put(key, new String[] {value}); @@ -119,6 +121,7 @@ public class MockPortletResponse implements PortletResponse { return this.properties.get(key); } + @Override public String encodeURL(String path) { return path; } @@ -127,10 +130,12 @@ public class MockPortletResponse implements PortletResponse { this.namespace = namespace; } + @Override public String getNamespace() { return this.namespace; } + @Override public void addProperty(Cookie cookie) { Assert.notNull(cookie, "Cookie must not be null"); this.cookies.add(cookie); @@ -150,6 +155,7 @@ public class MockPortletResponse implements PortletResponse { return null; } + @Override public void addProperty(String key, Element value) { Assert.notNull(key, "Property key must not be null"); Element[] oldArr = this.xmlProperties.get(key); @@ -180,6 +186,7 @@ public class MockPortletResponse implements PortletResponse { return this.xmlProperties.get(key); } + @Override public Element createElement(String tagName) throws DOMException { if (this.xmlDocument == null) { try { diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java index d9632906f76..e589e6a1034 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java @@ -76,10 +76,12 @@ public class MockPortletSession implements PortletSession { } + @Override public Object getAttribute(String name) { return this.portletAttributes.get(name); } + @Override public Object getAttribute(String name, int scope) { if (scope == PortletSession.PORTLET_SCOPE) { return this.portletAttributes.get(name); @@ -90,10 +92,12 @@ public class MockPortletSession implements PortletSession { return null; } + @Override public Enumeration getAttributeNames() { return Collections.enumeration(this.portletAttributes.keySet()); } + @Override public Enumeration getAttributeNames(int scope) { if (scope == PortletSession.PORTLET_SCOPE) { return Collections.enumeration(this.portletAttributes.keySet()); @@ -104,10 +108,12 @@ public class MockPortletSession implements PortletSession { return null; } + @Override public long getCreationTime() { return this.creationTime; } + @Override public String getId() { return this.id; } @@ -117,10 +123,12 @@ public class MockPortletSession implements PortletSession { setNew(false); } + @Override public long getLastAccessedTime() { return this.lastAccessedTime; } + @Override public int getMaxInactiveInterval() { return this.maxInactiveInterval; } @@ -146,6 +154,7 @@ public class MockPortletSession implements PortletSession { } } + @Override public void invalidate() { this.invalid = true; clearAttributes(); @@ -159,14 +168,17 @@ public class MockPortletSession implements PortletSession { this.isNew = value; } + @Override public boolean isNew() { return this.isNew; } + @Override public void removeAttribute(String name) { this.portletAttributes.remove(name); } + @Override public void removeAttribute(String name, int scope) { if (scope == PortletSession.PORTLET_SCOPE) { this.portletAttributes.remove(name); @@ -176,6 +188,7 @@ public class MockPortletSession implements PortletSession { } } + @Override public void setAttribute(String name, Object value) { if (value != null) { this.portletAttributes.put(name, value); @@ -185,6 +198,7 @@ public class MockPortletSession implements PortletSession { } } + @Override public void setAttribute(String name, Object value, int scope) { if (scope == PortletSession.PORTLET_SCOPE) { if (value != null) { @@ -204,18 +218,22 @@ public class MockPortletSession implements PortletSession { } } + @Override public void setMaxInactiveInterval(int interval) { this.maxInactiveInterval = interval; } + @Override public PortletContext getPortletContext() { return this.portletContext; } + @Override public Map getAttributeMap() { return Collections.unmodifiableMap(this.portletAttributes); } + @Override public Map getAttributeMap(int scope) { if (scope == PortletSession.PORTLET_SCOPE) { return Collections.unmodifiableMap(this.portletAttributes); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java index 12abdf57c93..53deff09162 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java @@ -69,6 +69,7 @@ public class MockPortletURL extends MockBaseURL implements PortletURL { // PortletURL methods //--------------------------------------------------------------------- + @Override public void setWindowState(WindowState windowState) throws WindowStateException { if (!CollectionUtils.contains(this.portalContext.getSupportedWindowStates(), windowState)) { throw new WindowStateException("WindowState not supported", windowState); @@ -76,10 +77,12 @@ public class MockPortletURL extends MockBaseURL implements PortletURL { this.windowState = windowState; } + @Override public WindowState getWindowState() { return this.windowState; } + @Override public void setPortletMode(PortletMode portletMode) throws PortletModeException { if (!CollectionUtils.contains(this.portalContext.getSupportedPortletModes(), portletMode)) { throw new PortletModeException("PortletMode not supported", portletMode); @@ -87,10 +90,12 @@ public class MockPortletURL extends MockBaseURL implements PortletURL { this.portletMode = portletMode; } + @Override public PortletMode getPortletMode() { return this.portletMode; } + @Override public void removePublicRenderParameter(String name) { this.parameters.remove(name); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java index d86ba7f2ad4..672a51dcb72 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java @@ -86,6 +86,7 @@ public class MockRenderRequest extends MockPortletRequest implements RenderReque return RENDER_PHASE; } + @Override public String getETag() { return getProperty(RenderRequest.ETAG); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java index a2feeb3726d..7f70be9a051 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java @@ -69,6 +69,7 @@ public class MockRenderResponse extends MockMimeResponse implements RenderRespon // RenderResponse methods //--------------------------------------------------------------------- + @Override public void setTitle(String title) { this.title = title; } @@ -77,6 +78,7 @@ public class MockRenderResponse extends MockMimeResponse implements RenderRespon return this.title; } + @Override public void setNextPossiblePortletModes(Collection portletModes) { this.nextPossiblePortletModes = portletModes; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java index 7cce4ba3c6d..e889d923149 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java @@ -97,6 +97,7 @@ public class MockResourceRequest extends MockClientDataRequest implements Resour this.resourceID = resourceID; } + @Override public String getResourceID() { return this.resourceID; } @@ -105,10 +106,12 @@ public class MockResourceRequest extends MockClientDataRequest implements Resour this.cacheability = cacheLevel; } + @Override public String getCacheability() { return this.cacheability; } + @Override public String getETag() { return getProperty(RenderRequest.ETAG); } @@ -121,6 +124,7 @@ public class MockResourceRequest extends MockClientDataRequest implements Resour this.privateRenderParameterMap.put(key, values); } + @Override public Map getPrivateRenderParameterMap() { return Collections.unmodifiableMap(this.privateRenderParameterMap); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java index 297a19682ea..00a267b1d83 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java @@ -29,6 +29,7 @@ public class MockResourceResponse extends MockMimeResponse implements ResourceRe private int contentLength = 0; + @Override public void setContentLength(int len) { this.contentLength = len; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java index cce36b18d55..12b7fd4a39e 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java @@ -36,6 +36,7 @@ public class MockResourceURL extends MockBaseURL implements ResourceURL { // ResourceURL methods //--------------------------------------------------------------------- + @Override public void setResourceID(String resourceID) { this.resourceID = resourceID; } @@ -44,10 +45,12 @@ public class MockResourceURL extends MockBaseURL implements ResourceURL { return this.resourceID; } + @Override public void setCacheability(String cacheLevel) { this.cacheability = cacheLevel; } + @Override public String getCacheability() { return this.cacheability; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java index 68536584471..6d2f6d74faf 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java @@ -68,6 +68,7 @@ public class MockStateAwareResponse extends MockPortletResponse implements State } + @Override public void setWindowState(WindowState windowState) throws WindowStateException { if (!CollectionUtils.contains(getPortalContext().getSupportedWindowStates(), windowState)) { throw new WindowStateException("WindowState not supported", windowState); @@ -75,10 +76,12 @@ public class MockStateAwareResponse extends MockPortletResponse implements State this.windowState = windowState; } + @Override public WindowState getWindowState() { return this.windowState; } + @Override public void setPortletMode(PortletMode portletMode) throws PortletModeException { if (!CollectionUtils.contains(getPortalContext().getSupportedPortletModes(), portletMode)) { throw new PortletModeException("PortletMode not supported", portletMode); @@ -86,22 +89,26 @@ public class MockStateAwareResponse extends MockPortletResponse implements State this.portletMode = portletMode; } + @Override public PortletMode getPortletMode() { return this.portletMode; } + @Override public void setRenderParameters(Map parameters) { Assert.notNull(parameters, "Parameters Map must not be null"); this.renderParameters.clear(); this.renderParameters.putAll(parameters); } + @Override public void setRenderParameter(String key, String value) { Assert.notNull(key, "Parameter key must not be null"); Assert.notNull(value, "Parameter value must not be null"); this.renderParameters.put(key, new String[] {value}); } + @Override public void setRenderParameter(String key, String[] values) { Assert.notNull(key, "Parameter key must not be null"); Assert.notNull(values, "Parameter values must not be null"); @@ -123,18 +130,22 @@ public class MockStateAwareResponse extends MockPortletResponse implements State return this.renderParameters.keySet().iterator(); } + @Override public Map getRenderParameterMap() { return Collections.unmodifiableMap(this.renderParameters); } + @Override public void removePublicRenderParameter(String name) { this.renderParameters.remove(name); } + @Override public void setEvent(QName name, Serializable value) { this.events.put(name, value); } + @Override public void setEvent(String name, Serializable value) { this.events.put(new QName(name), value); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java index a333984f48a..bb7e68319ce 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java @@ -59,85 +59,105 @@ public class ServletWrappingPortletContext implements PortletContext { } + @Override public String getServerInfo() { return this.servletContext.getServerInfo(); } + @Override public PortletRequestDispatcher getRequestDispatcher(String path) { return null; } + @Override public PortletRequestDispatcher getNamedDispatcher(String name) { return null; } + @Override public InputStream getResourceAsStream(String path) { return this.servletContext.getResourceAsStream(path); } + @Override public int getMajorVersion() { return 2; } + @Override public int getMinorVersion() { return 0; } + @Override public String getMimeType(String file) { return this.servletContext.getMimeType(file); } + @Override public String getRealPath(String path) { return this.servletContext.getRealPath(path); } + @Override @SuppressWarnings("unchecked") public Set getResourcePaths(String path) { return this.servletContext.getResourcePaths(path); } + @Override public URL getResource(String path) throws MalformedURLException { return this.servletContext.getResource(path); } + @Override public Object getAttribute(String name) { return this.servletContext.getAttribute(name); } + @Override @SuppressWarnings("unchecked") public Enumeration getAttributeNames() { return this.servletContext.getAttributeNames(); } + @Override public String getInitParameter(String name) { return this.servletContext.getInitParameter(name); } + @Override @SuppressWarnings("unchecked") public Enumeration getInitParameterNames() { return this.servletContext.getInitParameterNames(); } + @Override public void log(String msg) { this.servletContext.log(msg); } + @Override public void log(String message, Throwable throwable) { this.servletContext.log(message, throwable); } + @Override public void removeAttribute(String name) { this.servletContext.removeAttribute(name); } + @Override public void setAttribute(String name, Object object) { this.servletContext.setAttribute(name, object); } + @Override public String getPortletContextName() { return this.servletContext.getServletContextName(); } + @Override public Enumeration getContainerRuntimeOptions() { return Collections.enumeration(new HashSet()); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java index f2fc531e763..0bed2747f11 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java @@ -80,6 +80,7 @@ import org.springframework.web.portlet.mvc.SimpleControllerHandlerAdapter; */ public class ComplexPortletApplicationContext extends StaticPortletApplicationContext { + @Override public void refresh() throws BeansException { registerSingleton("standardHandlerAdapter", SimpleControllerHandlerAdapter.class); registerSingleton("portletHandlerAdapter", SimplePortletHandlerAdapter.class); @@ -185,10 +186,12 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class TestController1 implements Controller { + @Override public void handleActionRequest(ActionRequest request, ActionResponse response) { response.setRenderParameter("result", "test1-action"); } + @Override public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws Exception { return null; } @@ -197,8 +200,10 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class TestController2 implements Controller { + @Override public void handleActionRequest(ActionRequest request, ActionResponse response) {} + @Override public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws Exception { response.setProperty("result", "test2-view"); return null; @@ -208,8 +213,10 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class ViewController implements Controller { + @Override public void handleActionRequest(ActionRequest request, ActionResponse response) {} + @Override public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws Exception { return new ModelAndView("someViewName", "result", "view was here"); } @@ -218,10 +225,12 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class EditController implements Controller { + @Override public void handleActionRequest(ActionRequest request, ActionResponse response) { response.setRenderParameter("param", "edit was here"); } + @Override public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws Exception { return new ModelAndView(request.getParameter("param")); } @@ -230,10 +239,12 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class HelpController1 implements Controller { + @Override public void handleActionRequest(ActionRequest request, ActionResponse response) { response.setRenderParameter("param", "help1 was here"); } + @Override public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws Exception { return new ModelAndView("help1-view"); } @@ -242,10 +253,12 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class HelpController2 implements Controller { + @Override public void handleActionRequest(ActionRequest request, ActionResponse response) { response.setRenderParameter("param", "help2 was here"); } + @Override public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws Exception { return new ModelAndView("help2-view"); } @@ -253,12 +266,14 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class RequestLocaleCheckingController implements Controller { + @Override public void handleActionRequest(ActionRequest request, ActionResponse response) throws PortletException { if (!Locale.CANADA.equals(request.getLocale())) { throw new PortletException("Incorrect Locale in ActionRequest"); } } + @Override public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws PortletException, IOException { if (!Locale.CANADA.equals(request.getLocale())) { @@ -272,12 +287,14 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class LocaleContextCheckingController implements Controller { + @Override public void handleActionRequest(ActionRequest request, ActionResponse response) throws PortletException { if (!Locale.CANADA.equals(LocaleContextHolder.getLocale())) { throw new PortletException("Incorrect Locale in LocaleContextHolder"); } } + @Override public ModelAndView handleRenderRequest(RenderRequest request, RenderResponse response) throws PortletException, IOException { if (!Locale.CANADA.equals(LocaleContextHolder.getLocale())) { @@ -293,14 +310,17 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo private PortletConfig portletConfig; + @Override public void init(PortletConfig portletConfig) throws PortletException { this.portletConfig = portletConfig; } + @Override public void processAction(ActionRequest request, ActionResponse response) throws PortletException { response.setRenderParameter("result", "myPortlet action called"); } + @Override public void render(RenderRequest request, RenderResponse response) throws PortletException, IOException { response.getWriter().write("myPortlet was here"); } @@ -309,6 +329,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo return this.portletConfig; } + @Override public void destroy() { this.portletConfig = null; } @@ -323,6 +344,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class ExceptionThrowingHandler implements MyHandler { + @Override public void doSomething(PortletRequest request) throws Exception { if (request.getParameter("fail") != null) { throw new ModelAndViewDefiningException(new ModelAndView("failed-modelandview")); @@ -346,28 +368,34 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class MyHandlerAdapter implements HandlerAdapter, Ordered { + @Override public int getOrder() { return 99; } + @Override public boolean supports(Object handler) { return handler != null && MyHandler.class.isAssignableFrom(handler.getClass()); } + @Override public void handleAction(ActionRequest request, ActionResponse response, Object delegate) throws Exception { ((MyHandler) delegate).doSomething(request); } + @Override public ModelAndView handleRender(RenderRequest request, RenderResponse response, Object delegate) throws Exception { ((MyHandler) delegate).doSomething(request); return null; } + @Override public ModelAndView handleResource(ResourceRequest request, ResourceResponse response, Object handler) throws Exception { return null; } + @Override public void handleEvent(EventRequest request, EventResponse response, Object handler) throws Exception { } } @@ -375,6 +403,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class MyHandlerInterceptor1 extends HandlerInterceptorAdapter { + @Override public boolean preHandleRender(RenderRequest request, RenderResponse response, Object handler) throws PortletException { if (request.getAttribute("test2-remove-never") != null) { @@ -386,6 +415,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo return true; } + @Override public void postHandleRender( RenderRequest request, RenderResponse response, Object handler, ModelAndView modelAndView) throws PortletException { @@ -398,6 +428,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo request.removeAttribute("test1-remove-post"); } + @Override public void afterRenderCompletion( RenderRequest request, RenderResponse response, Object handler, Exception ex) throws PortletException { @@ -411,6 +442,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class MyHandlerInterceptor2 extends HandlerInterceptorAdapter { + @Override public boolean preHandleRender(RenderRequest request, RenderResponse response, Object handler) throws PortletException { if (request.getAttribute("test1-remove-post") == null) { @@ -425,6 +457,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo return true; } + @Override public void postHandleRender( RenderRequest request, RenderResponse response, Object handler, ModelAndView modelAndView) throws PortletException { @@ -440,6 +473,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo request.removeAttribute("test2-remove-post"); } + @Override public void afterRenderCompletion( RenderRequest request, RenderResponse response, Object handler, Exception ex) throws Exception { @@ -453,6 +487,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class MultipartCheckingHandler implements MyHandler { + @Override public void doSomething(PortletRequest request) throws PortletException, IllegalAccessException { if (!(request instanceof MultipartActionRequest)) { throw new PortletException("Not in a MultipartActionRequest"); @@ -463,10 +498,12 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public static class MockMultipartResolver implements PortletMultipartResolver { + @Override public boolean isMultipart(ActionRequest request) { return true; } + @Override public MultipartActionRequest resolveMultipart(ActionRequest request) throws MultipartException { if (request.getAttribute("fail") != null) { throw new MaxUploadSizeExceededException(1000); @@ -485,6 +522,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo return new DefaultMultipartActionRequest(request, files, params, Collections.emptyMap()); } + @Override public void cleanupMultipart(MultipartActionRequest request) { if (request.getAttribute("cleanedUp") != null) { throw new IllegalStateException("Already cleaned up"); @@ -498,6 +536,7 @@ public class ComplexPortletApplicationContext extends StaticPortletApplicationCo public int counter = 0; + @Override public void onApplicationEvent(ApplicationEvent event) { if (event instanceof PortletRequestHandledEvent) { this.counter++; diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/DispatcherPortletTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/DispatcherPortletTests.java index b624737c1b0..46ea7b2ba04 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/DispatcherPortletTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/DispatcherPortletTests.java @@ -73,6 +73,7 @@ public class DispatcherPortletTests extends TestCase { private DispatcherPortlet complexDispatcherPortlet; + @Override protected void setUp() throws PortletException { simplePortletConfig = new MockPortletConfig(new MockPortletContext(), "simple"); complexPortletConfig = new MockPortletConfig(simplePortletConfig.getPortletContext(), "complex"); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java index b2bc75c7033..7bd390f9d29 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java @@ -44,6 +44,7 @@ public class SimplePortletApplicationContext extends StaticPortletApplicationCon private String renderCommandSessionAttributeName; private String formSessionAttributeName; + @Override public void refresh() throws BeansException { MutablePropertyValues pvs = new MutablePropertyValues(); registerSingleton("controller1", TestFormController.class, pvs); @@ -98,17 +99,20 @@ public class SimplePortletApplicationContext extends StaticPortletApplicationCon this.setFormView("form"); } + @Override public void doSubmitAction(Object command) { TestBean testBean = (TestBean) command; testBean.setAge(testBean.getAge() + 10); } + @Override public ModelAndView showForm(RenderRequest request, RenderResponse response, BindException errors) throws Exception { TestBean testBean = (TestBean) errors.getModel().get(getCommandName()); this.writeResponse(response, testBean, false); return null; } + @Override public ModelAndView onSubmitRender(RenderRequest request, RenderResponse response, Object command, BindException errors) throws IOException { TestBean testBean = (TestBean) command; @@ -128,6 +132,7 @@ public class SimplePortletApplicationContext extends StaticPortletApplicationCon response.getWriter().write((finished ? "finished" : "") + (testBean.getAge() + 5)); } + @Override public void handleEventRequest(EventRequest request, EventResponse response) throws Exception { response.setRenderParameter("event", request.getEvent().getName()); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java index da9b841c1b0..128f169bb82 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java @@ -70,6 +70,7 @@ public class PortletRequestDataBinderTests extends TestCase { PortletRequestDataBinder binder = new PortletRequestDataBinder(bean); binder.registerCustomEditor(ITestBean.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean(text)); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java index 98f3b178582..13fafe991a7 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java @@ -44,6 +44,7 @@ public abstract class AbstractXmlWebApplicationContextTests extends AbstractAppl * Overridden as we can't trust superclass method * @see org.springframework.context.AbstractApplicationContextTests#testEvents() */ + @Override public void testEvents() throws Exception { TestListener listener = (TestListener) this.applicationContext.getBean("testListener"); listener.zeroCounter(); @@ -58,6 +59,7 @@ public abstract class AbstractXmlWebApplicationContextTests extends AbstractAppl assertTrue("1 parent events after publication", parentListener.getEventCount() == 1); } + @Override public void testCount() { assertTrue("should have 14 beans, not "+ this.applicationContext.getBeanDefinitionCount(), this.applicationContext.getBeanDefinitionCount() == 14); @@ -104,6 +106,7 @@ public abstract class AbstractXmlWebApplicationContextTests extends AbstractAppl constructed = true; } + @Override public void afterPropertiesSet() { if (this.initMethodInvoked) fail(); @@ -117,6 +120,7 @@ public abstract class AbstractXmlWebApplicationContextTests extends AbstractAppl this.initMethodInvoked = true; } + @Override public void destroy() { if (this.customDestroyed) fail(); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java index 3492556e9a1..58118d77117 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java @@ -25,6 +25,7 @@ public class PortletConfigAwareBean implements PortletConfigAware { private PortletConfig portletConfig; + @Override public void setPortletConfig(PortletConfig portletConfig) { this.portletConfig = portletConfig; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java index b89b393ea78..405bc5d9fee 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java @@ -25,6 +25,7 @@ public class PortletContextAwareBean implements PortletContextAware { private PortletContext portletContext; + @Override public void setPortletContext(PortletContext portletContext) { this.portletContext = portletContext; } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java index 148943c06de..61a42a0257e 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java @@ -41,6 +41,7 @@ public class XmlPortletApplicationContextTests extends AbstractXmlWebApplication private ConfigurablePortletApplicationContext root; + @Override protected ConfigurableApplicationContext createContext() throws Exception { root = new XmlPortletApplicationContext(); PortletContext portletContext = new MockPortletContext(); @@ -48,8 +49,10 @@ public class XmlPortletApplicationContextTests extends AbstractXmlWebApplication root.setPortletConfig(portletConfig); root.setConfigLocations(new String[] {"/org/springframework/web/portlet/context/WEB-INF/applicationContext.xml"}); root.addBeanFactoryPostProcessor(new BeanFactoryPostProcessor() { + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { beanFactory.addBeanPostProcessor(new BeanPostProcessor() { + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { if(bean instanceof TestBean) { ((TestBean) bean).getFriends().add("myFriend"); @@ -57,6 +60,7 @@ public class XmlPortletApplicationContextTests extends AbstractXmlWebApplication return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { return bean; } @@ -101,6 +105,7 @@ public class XmlPortletApplicationContextTests extends AbstractXmlWebApplication * Overridden in order to access the root ApplicationContext * @see org.springframework.web.context.XmlWebApplicationContextTests#testContextNesting() */ + @Override public void testContextNesting() { TestBean father = (TestBean) this.applicationContext.getBean("father"); assertTrue("Bean from root context", father != null); @@ -116,6 +121,7 @@ public class XmlPortletApplicationContextTests extends AbstractXmlWebApplication assertTrue("Custom BeanPostProcessor applied", rod.getFriends().contains("myFriend")); } + @Override public void testCount() { assertTrue("should have 16 beans, not "+ this.applicationContext.getBeanDefinitionCount(), this.applicationContext.getBeanDefinitionCount() == 16); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java index 8f3c4a539d9..f260a375057 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java @@ -33,6 +33,7 @@ public class ParameterHandlerMappingTests extends TestCase { private ConfigurablePortletApplicationContext pac; + @Override public void setUp() throws Exception { MockPortletContext portletContext = new MockPortletContext(); pac = new XmlPortletApplicationContext(); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java index cff6418b88b..d1b9f80628b 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java @@ -35,6 +35,7 @@ public class PortletModeHandlerMappingTests extends TestCase { private ConfigurablePortletApplicationContext pac; + @Override public void setUp() throws Exception { MockPortletContext portletContext = new MockPortletContext(); pac = new XmlPortletApplicationContext(); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java index 687e4938e4a..09206812b03 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java @@ -35,6 +35,7 @@ public class PortletModeParameterHandlerMappingTests extends TestCase { private ConfigurablePortletApplicationContext pac; + @Override public void setUp() throws Exception { MockPortletContext portletContext = new MockPortletContext(); pac = new XmlPortletApplicationContext(); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java index aecf7ef773a..a1bd2834d91 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java @@ -43,6 +43,7 @@ public class SimpleMappingExceptionResolverTests extends TestCase { private Object handler2; private Exception genericException; + @Override protected void setUp() { exceptionResolver = new SimpleMappingExceptionResolver(); request = new MockRenderRequest(); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java index fdf57bb0af2..f68e3b8d2d1 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java @@ -212,6 +212,7 @@ public class CommandControllerTests extends TestCase { public void testSuppressBinding() throws Exception { TestController tc = new TestController() { + @Override protected boolean suppressBinding(PortletRequest request) { return true; } @@ -236,6 +237,7 @@ public class CommandControllerTests extends TestCase { public void testWithCustomDateEditor() throws Exception { final DateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy"); TestController tc = new TestController() { + @Override protected void initBinder(PortletRequest request, PortletRequestDataBinder binder) { binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, false)); } @@ -261,6 +263,7 @@ public class CommandControllerTests extends TestCase { public void testWithCustomDateEditorEmptyNotAllowed() throws Exception { final DateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy"); TestController tc = new TestController() { + @Override protected void initBinder(PortletRequest request, PortletRequestDataBinder binder) { binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, false)); } @@ -287,6 +290,7 @@ public class CommandControllerTests extends TestCase { public void testWithCustomDateEditorEmptyAllowed() throws Exception { final DateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy"); TestController tc = new TestController() { + @Override protected void initBinder(PortletRequest request, PortletRequestDataBinder binder) { binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true)); } @@ -310,8 +314,10 @@ public class CommandControllerTests extends TestCase { public void testNestedBindingWithPropertyEditor() throws Exception { TestController tc = new TestController() { + @Override protected void initBinder(PortletRequest request, PortletRequestDataBinder binder) { binder.registerCustomEditor(ITestBean.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean(text)); } @@ -341,9 +347,11 @@ public class CommandControllerTests extends TestCase { public void testWithValidatorNotSupportingCommandClass() throws Exception { Validator v = new Validator() { + @Override public boolean supports(Class c) { return false; } + @Override public void validate(Object o, Errors e) {} }; TestController tc = new TestController(); @@ -364,9 +372,11 @@ public class CommandControllerTests extends TestCase { final String defaultMessage = "validation error!"; TestController tc = new TestController(); tc.setValidator(new Validator() { + @Override public boolean supports(Class c) { return TestBean.class.isAssignableFrom(c); } + @Override public void validate(Object o, Errors e) { e.reject(errorCode, defaultMessage); } @@ -386,9 +396,11 @@ public class CommandControllerTests extends TestCase { final String defaultMessage = "validation error!"; TestController tc = new TestController(); tc.setValidator(new Validator() { + @Override public boolean supports(Class c) { return TestBean.class.isAssignableFrom(c); } + @Override public void validate(Object o, Errors e) { ValidationUtils.rejectIfEmpty(e, "name", errorCode, defaultMessage); } @@ -413,9 +425,11 @@ public class CommandControllerTests extends TestCase { final String defaultMessage = "validation error!"; TestController tc = new TestController(); tc.setValidator(new Validator() { + @Override public boolean supports(Class c) { return TestBean.class.isAssignableFrom(c); } + @Override public void validate(Object o, Errors e) { ValidationUtils.rejectIfEmptyOrWhitespace(e, "name", errorCode, defaultMessage); } @@ -444,10 +458,12 @@ public class CommandControllerTests extends TestCase { super(TestBean.class, "testBean"); } + @Override protected void handleAction(ActionRequest request, ActionResponse response, Object command, BindException errors) { ((TestBean)command).setJedi(true); } + @Override protected ModelAndView handleRender(RenderRequest request, RenderResponse response, Object command, BindException errors) { assertNotNull(command); assertNotNull(errors); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java index 008ccfaeeb6..af1d41ae3ec 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java @@ -34,6 +34,7 @@ public class PortletModeNameViewControllerTests extends TestCase { private PortletModeNameViewController controller; + @Override public void setUp() { controller = new PortletModeNameViewController(); } diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java index 1bda3ed3d29..93490aa4611 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java @@ -155,10 +155,12 @@ public final class PortletWrappingControllerTests { private PortletConfig portletConfig; + @Override public void init(PortletConfig portletConfig) { this.portletConfig = portletConfig; } + @Override public void processAction(ActionRequest request, ActionResponse response) throws PortletException { if (request.getParameter("test") != null) { response.setRenderParameter(RESULT_RENDER_PARAMETER_NAME, "myPortlet-action"); @@ -169,6 +171,7 @@ public final class PortletWrappingControllerTests { } } + @Override public void render(RenderRequest request, RenderResponse response) throws IOException { response.getWriter().write(RENDERED_RESPONSE_CONTENT); } @@ -177,6 +180,7 @@ public final class PortletWrappingControllerTests { return this.portletConfig; } + @Override public void destroy() { throw new IllegalStateException("Being destroyed..."); } @@ -185,6 +189,7 @@ public final class PortletWrappingControllerTests { private static final class MyApplicationContext extends StaticPortletApplicationContext { + @Override public void refresh() throws BeansException { MutablePropertyValues pvs = new MutablePropertyValues(); pvs.add("portletClass", MyPortlet.class); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java index 71fd56e812a..4705be2f542 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java @@ -104,6 +104,7 @@ public class Portlet20AnnotationControllerTests { @Test public void standardHandleMethod() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyController.class)); @@ -122,6 +123,7 @@ public class Portlet20AnnotationControllerTests { @Test public void standardHandleMethodWithResources() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { StaticPortletApplicationContext wac = new StaticPortletApplicationContext(); wac.setPortletConfig(getPortletConfig()); @@ -173,6 +175,7 @@ public class Portlet20AnnotationControllerTests { private void doTestAdaptedHandleMethods(final Class controllerClass) throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(controllerClass)); @@ -217,12 +220,14 @@ public class Portlet20AnnotationControllerTests { @Test public void formController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyFormController.class)); wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -240,12 +245,14 @@ public class Portlet20AnnotationControllerTests { @Test public void modelFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyModelFormController.class)); wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -263,6 +270,7 @@ public class Portlet20AnnotationControllerTests { @Test public void commandProvidingFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyCommandProvidingFormController.class)); @@ -272,6 +280,7 @@ public class Portlet20AnnotationControllerTests { wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -290,6 +299,7 @@ public class Portlet20AnnotationControllerTests { @Test public void typedCommandProvidingFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyTypedCommandProvidingFormController.class)); @@ -301,6 +311,7 @@ public class Portlet20AnnotationControllerTests { wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -338,12 +349,14 @@ public class Portlet20AnnotationControllerTests { @Test public void binderInitializingCommandProvidingFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyBinderInitializingCommandProvidingFormController.class)); wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -362,12 +375,14 @@ public class Portlet20AnnotationControllerTests { @Test public void specificBinderInitializingCommandProvidingFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { StaticPortletApplicationContext wac = new StaticPortletApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MySpecificBinderInitializingCommandProvidingFormController.class)); wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -386,6 +401,7 @@ public class Portlet20AnnotationControllerTests { @Test public void parameterDispatchingController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { StaticPortletApplicationContext wac = new StaticPortletApplicationContext(); wac.setPortletContext(new MockPortletContext()); @@ -427,6 +443,7 @@ public class Portlet20AnnotationControllerTests { @Test public void typeLevelParameterDispatchingController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { StaticPortletApplicationContext wac = new StaticPortletApplicationContext(); wac.setPortletContext(new MockPortletContext()); @@ -513,6 +530,7 @@ public class Portlet20AnnotationControllerTests { @Test public void portlet20DispatchingController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { StaticPortletApplicationContext wac = new StaticPortletApplicationContext(); wac.setPortletContext(new MockPortletContext()); @@ -613,6 +631,7 @@ public class Portlet20AnnotationControllerTests { @Test public void eventDispatchingController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { StaticPortletApplicationContext wac = new StaticPortletApplicationContext(); wac.setPortletContext(new MockPortletContext()); @@ -697,6 +716,7 @@ public class Portlet20AnnotationControllerTests { @Test public void testPredicatePriorityComparisonAcrossControllers() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { StaticPortletApplicationContext wac = new StaticPortletApplicationContext(); // The order of handler registration is important to get @@ -762,6 +782,7 @@ public class Portlet20AnnotationControllerTests { @RequestMapping("VIEW") private static class MyController extends AbstractController { + @Override protected ModelAndView handleRenderRequestInternal(RenderRequest request, RenderResponse response) throws Exception { response.getWriter().write("test"); return null; @@ -950,6 +971,7 @@ public class Portlet20AnnotationControllerTests { return new TestBean(defaultName.getClass().getSimpleName() + ":" + defaultName.toString()); } + @Override @RequestMapping("VIEW") @RenderMapping public String myHandle(@ModelAttribute("myCommand") TestBean tb, BindingResult errors, ModelMap model) { @@ -996,6 +1018,7 @@ public class Portlet20AnnotationControllerTests { private static class MyOtherTypedCommandProvidingFormController extends MyCommandProvidingFormController { + @Override @RequestMapping("VIEW") @RenderMapping public String myHandle(@ModelAttribute("myCommand") TestBean tb, BindingResult errors, ModelMap model) { @@ -1034,6 +1057,7 @@ public class Portlet20AnnotationControllerTests { private static class MyWebBindingInitializer implements WebBindingInitializer { + @Override public void initBinder(WebDataBinder binder, WebRequest request) { assertNotNull(request.getLocale()); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); @@ -1045,6 +1069,7 @@ public class Portlet20AnnotationControllerTests { private static class MySpecialArgumentResolver implements WebArgumentResolver { + @Override public Object resolveArgument(MethodParameter methodParameter, NativeWebRequest webRequest) { if (methodParameter.getParameterType().equals(MySpecialArg.class)) { return new MySpecialArg("myValue"); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java index 88cec558020..c1bc5ab6763 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java @@ -86,6 +86,7 @@ public class PortletAnnotationControllerTests extends TestCase { public void testStandardHandleMethod() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyController.class)); @@ -115,6 +116,7 @@ public class PortletAnnotationControllerTests extends TestCase { public void doTestAdaptedHandleMethods(final Class controllerClass) throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(controllerClass)); @@ -153,12 +155,14 @@ public class PortletAnnotationControllerTests extends TestCase { public void testFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyFormController.class)); wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -175,12 +179,14 @@ public class PortletAnnotationControllerTests extends TestCase { public void testModelFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyModelFormController.class)); wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -197,6 +203,7 @@ public class PortletAnnotationControllerTests extends TestCase { public void testCommandProvidingFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyCommandProvidingFormController.class)); @@ -206,6 +213,7 @@ public class PortletAnnotationControllerTests extends TestCase { wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -223,6 +231,7 @@ public class PortletAnnotationControllerTests extends TestCase { public void testTypedCommandProvidingFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyTypedCommandProvidingFormController.class)); @@ -234,6 +243,7 @@ public class PortletAnnotationControllerTests extends TestCase { wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -270,12 +280,14 @@ public class PortletAnnotationControllerTests extends TestCase { public void testBinderInitializingCommandProvidingFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { GenericWebApplicationContext wac = new GenericWebApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MyBinderInitializingCommandProvidingFormController.class)); wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -293,12 +305,14 @@ public class PortletAnnotationControllerTests extends TestCase { public void testSpecificBinderInitializingCommandProvidingFormController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { StaticPortletApplicationContext wac = new StaticPortletApplicationContext(); wac.registerBeanDefinition("controller", new RootBeanDefinition(MySpecificBinderInitializingCommandProvidingFormController.class)); wac.refresh(); return wac; } + @Override protected void render(ModelAndView mv, PortletRequest request, MimeResponse response) throws Exception { new TestView().render(mv.getViewName(), mv.getModel(), request, response); } @@ -316,6 +330,7 @@ public class PortletAnnotationControllerTests extends TestCase { public void testParameterDispatchingController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { StaticPortletApplicationContext wac = new StaticPortletApplicationContext(); wac.setPortletContext(new MockPortletContext()); @@ -356,6 +371,7 @@ public class PortletAnnotationControllerTests extends TestCase { public void testTypeLevelParameterDispatchingController() throws Exception { DispatcherPortlet portlet = new DispatcherPortlet() { + @Override protected ApplicationContext createPortletApplicationContext(ApplicationContext parent) throws BeansException { StaticPortletApplicationContext wac = new StaticPortletApplicationContext(); wac.setPortletContext(new MockPortletContext()); @@ -465,6 +481,7 @@ public class PortletAnnotationControllerTests extends TestCase { @RequestMapping("VIEW") private static class MyController extends AbstractController { + @Override protected ModelAndView handleRenderRequestInternal(RenderRequest request, RenderResponse response) throws Exception { response.getWriter().write("test"); return null; @@ -600,6 +617,7 @@ public class PortletAnnotationControllerTests extends TestCase { return new TestBean(defaultName.getClass().getSimpleName() + ":" + defaultName.toString()); } + @Override @RequestMapping("VIEW") public String myHandle(@ModelAttribute("myCommand") TestBean tb, BindingResult errors, ModelMap model) { if (!model.containsKey("myKey")) { @@ -644,6 +662,7 @@ public class PortletAnnotationControllerTests extends TestCase { private static class MyOtherTypedCommandProvidingFormController extends MyCommandProvidingFormController { + @Override @RequestMapping("VIEW") public String myHandle(@ModelAttribute("myCommand") TestBean tb, BindingResult errors, ModelMap model) { if (!model.containsKey("myKey")) { @@ -681,6 +700,7 @@ public class PortletAnnotationControllerTests extends TestCase { private static class MyWebBindingInitializer implements WebBindingInitializer { + @Override public void initBinder(WebDataBinder binder, WebRequest request) { assertNotNull(request.getLocale()); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); @@ -692,6 +712,7 @@ public class PortletAnnotationControllerTests extends TestCase { private static class MySpecialArgumentResolver implements WebArgumentResolver { + @Override public Object resolveArgument(MethodParameter methodParameter, NativeWebRequest webRequest) { if (methodParameter.getParameterType().equals(MySpecialArg.class)) { return new MySpecialArg("myValue"); @@ -807,6 +828,7 @@ public class PortletAnnotationControllerTests extends TestCase { public static class MyModelAndViewResolver implements ModelAndViewResolver { + @Override public org.springframework.web.servlet.ModelAndView resolveModelAndView(Method handlerMethod, Class handlerType, Object returnValue, @@ -814,10 +836,12 @@ public class PortletAnnotationControllerTests extends TestCase { NativeWebRequest webRequest) { if (returnValue instanceof MySpecialArg) { return new org.springframework.web.servlet.ModelAndView(new View() { + @Override public String getContentType() { return "text/html"; } + @Override public void render(Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { response.getWriter().write("myValue"); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java index a55e0d8e964..66903c3b910 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java @@ -83,6 +83,7 @@ public final class PortletUtilsTests { @Test(expected=FileNotFoundException.class) public void testGetRealPathWithPathThatCannotBeResolvedToFile() throws Exception { PortletUtils.getRealPath(new MockPortletContext() { + @Override public String getRealPath(String path) { return null; } @@ -221,6 +222,7 @@ public final class PortletUtilsTests { request.setParameter("William", "Baskerville"); request.setParameter("Adso", "Melk"); MockActionResponse response = new MockActionResponse() { + @Override public void setRenderParameter(String key, String[] values) { throw new IllegalStateException(); } @@ -243,6 +245,7 @@ public final class PortletUtilsTests { @Test public void testClearAllRenderParametersDoesNotPropagateExceptionIfRedirectAlreadySentAtTimeOfCall() throws Exception { MockActionResponse response = new MockActionResponse() { + @Override @SuppressWarnings("unchecked") public void setRenderParameters(Map parameters) { throw new IllegalStateException(); diff --git a/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java index 0940539f54a..8ada7848fa9 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -51,12 +51,14 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void setBeanName(String beanName) { if (this.beanName == null || beanName == null) { this.beanName = beanName; } } + @Override public String getBeanName() { return beanName; } @@ -75,10 +77,12 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA } + @Override public void destroy() { this.destroyed = true; } + @Override public boolean wasDestroyed() { return destroyed; } diff --git a/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..e136978f9e6 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java index 13c2c5447a5..9a2a3193df2 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java @@ -31,22 +31,27 @@ public class SerializablePerson implements Person, Serializable { private String name; private int age; + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } + @Override public Object echo(Object o) throws Throwable { if (o instanceof Throwable) { throw (Throwable) o; diff --git a/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java index 7842bbfeacf..7a27cf0894e 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see org.springframework.beans.ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see org.springframework.beans.IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java index 006228975a7..f3d6eedefe1 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java @@ -74,6 +74,7 @@ public class DummyFactory * Return if the bean managed by this factory is a singleton. * @see FactoryBean#isSingleton() */ + @Override public boolean isSingleton() { return this.singleton; } @@ -85,6 +86,7 @@ public class DummyFactory this.singleton = singleton; } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -93,6 +95,7 @@ public class DummyFactory return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = (AutowireCapableBeanFactory) beanFactory; this.beanFactory.applyBeanPostProcessorsBeforeInitialization(this.testBean, this.beanName); @@ -119,6 +122,7 @@ public class DummyFactory return otherTestBean; } + @Override public void afterPropertiesSet() { if (initialized) { throw new RuntimeException("Cannot call afterPropertiesSet twice on the one bean"); @@ -144,6 +148,7 @@ public class DummyFactory * and prototype mode. * @see FactoryBean#getObject() */ + @Override public Object getObject() throws BeansException { if (isSingleton()) { return this.testBean; @@ -158,11 +163,13 @@ public class DummyFactory } } + @Override public Class getObjectType() { return TestBean.class; } + @Override public void destroy() { if (this.testBean != null) { this.testBean.setName(null); diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java index 19b7da62f8d..191b3509c73 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java @@ -53,6 +53,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return initMethodDeclared; } + @Override public void setBeanName(String name) { this.beanName = name; } @@ -61,6 +62,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.owningFactory = beanFactory; } @@ -75,6 +77,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ this.postProcessedBeforeInit = true; } + @Override public void afterPropertiesSet() { if (this.owningFactory == null) { throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean"); @@ -126,6 +129,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ } } + @Override public void destroy() { if (this.destroyed) { throw new IllegalStateException("Already destroyed"); @@ -140,6 +144,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ public static class PostProcessor implements BeanPostProcessor { + @Override public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException { if (bean instanceof LifecycleBean) { ((LifecycleBean) bean).postProcessBeforeInit(); @@ -147,6 +152,7 @@ public class LifecycleBean implements BeanNameAware, BeanFactoryAware, Initializ return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String name) throws BeansException { if (bean instanceof LifecycleBean) { ((LifecycleBean) bean).postProcessAfterInit(); diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java index 4715fe448f6..17fd2145987 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java @@ -30,6 +30,7 @@ public class MustBeInitialized implements InitializingBean { /** * @see InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { this.inited = true; } diff --git a/spring-webmvc/src/test/java/org/springframework/context/ACATester.java b/spring-webmvc/src/test/java/org/springframework/context/ACATester.java index 72c129ca4e3..2a624d5c97f 100644 --- a/spring-webmvc/src/test/java/org/springframework/context/ACATester.java +++ b/spring-webmvc/src/test/java/org/springframework/context/ACATester.java @@ -27,6 +27,7 @@ public class ACATester implements ApplicationContextAware { private ApplicationContext ac; + @Override public void setApplicationContext(ApplicationContext ctx) throws ApplicationContextException { // check reinitialization if (this.ac != null) { diff --git a/spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java b/spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java index 8137de62f61..bd15215911b 100644 --- a/spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java +++ b/spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java @@ -29,6 +29,7 @@ public class BeanThatBroadcasts implements ApplicationContextAware { public int receivedCount; + @Override public void setApplicationContext(ApplicationContext applicationContext) { this.applicationContext = applicationContext; if (applicationContext.getDisplayName().indexOf("listener") != -1) { diff --git a/spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java b/spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java index 9ab3f8ea40d..a4c79b2e2c0 100644 --- a/spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java +++ b/spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java @@ -43,6 +43,7 @@ public class BeanThatListens implements ApplicationListener { } + @Override public void onApplicationEvent(ApplicationEvent event) { eventCount++; if (beanThatBroadcasts != null) { diff --git a/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java index 50c9936c444..14acac1ceb9 100644 --- a/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java +++ b/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java @@ -15,18 +15,21 @@ public class LifecycleContextBean extends LifecycleBean implements ApplicationCo protected ApplicationContext owningContext; + @Override public void setBeanFactory(BeanFactory beanFactory) { super.setBeanFactory(beanFactory); if (this.owningContext != null) throw new RuntimeException("Factory called setBeanFactory after setApplicationContext"); } + @Override public void afterPropertiesSet() { super.afterPropertiesSet(); if (this.owningContext == null) throw new RuntimeException("Factory didn't call setAppliationContext before afterPropertiesSet on lifecycle bean"); } + @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { if (this.owningFactory == null) throw new RuntimeException("Factory called setApplicationContext before setBeanFactory"); diff --git a/spring-webmvc/src/test/java/org/springframework/context/TestListener.java b/spring-webmvc/src/test/java/org/springframework/context/TestListener.java index 29f375105ff..739222190fa 100644 --- a/spring-webmvc/src/test/java/org/springframework/context/TestListener.java +++ b/spring-webmvc/src/test/java/org/springframework/context/TestListener.java @@ -21,6 +21,7 @@ public class TestListener implements ApplicationListener { eventCount = 0; } + @Override public void onApplicationEvent(ApplicationEvent e) { ++eventCount; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java index ce3c45d2e72..facc86bace1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java @@ -45,10 +45,12 @@ public abstract class AbstractApplicationContextTests extends AbstractListableBe protected TestListener parentListener = new TestListener(); + @Override protected void setUp() throws Exception { this.applicationContext = createContext(); } + @Override protected BeanFactory getBeanFactory() { return applicationContext; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java index cd81c78fa6e..2e0e3a0d3cd 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java @@ -325,6 +325,7 @@ public abstract class AbstractBeanFactoryTests extends TestCase { public static class TestBeanEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) { TestBean tb = new TestBean(); StringTokenizer st = new StringTokenizer(text, "_"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java index 8169998a93e..a84b83f7ad6 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java @@ -105,6 +105,7 @@ public final class ContextLoaderTests { sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, "/org/springframework/web/context/WEB-INF/applicationContext.xml"); final ServletContextListener listener = new ContextLoaderListener() { + @Override protected void customizeContext(ServletContext servletContext, ConfigurableWebApplicationContext applicationContext) { assertNotNull("The ServletContext should not be null.", servletContext); assertEquals("Verifying that we received the expected ServletContext.", sc, servletContext); @@ -301,6 +302,7 @@ public final class ContextLoaderTests { "/org/springframework/web/context/WEB-INF/applicationContext.xml", "/org/springframework/web/context/WEB-INF/fail.xml" }) { + @Override public void refresh() throws BeansException { try { super.refresh(); @@ -320,6 +322,7 @@ public final class ContextLoaderTests { } private static class TestContextInitializer implements ApplicationContextInitializer { + @Override public void initialize(ConfigurableApplicationContext applicationContext) { ConfigurableEnvironment environment = applicationContext.getEnvironment(); environment.getPropertySources().addFirst(new PropertySource("testPropertySource") { @@ -332,6 +335,7 @@ public final class ContextLoaderTests { } private static class TestWebContextInitializer implements ApplicationContextInitializer { + @Override public void initialize(ConfigurableWebApplicationContext applicationContext) { ServletContext ctx = applicationContext.getServletContext(); // type-safe access to servlet-specific methods ctx.setAttribute("initialized", true); @@ -339,6 +343,7 @@ public final class ContextLoaderTests { } private static class EnvApplicationContextInitializer implements ApplicationContextInitializer { + @Override public void initialize(ConfigurableWebApplicationContext applicationContext) { // test that ApplicationContextInitializers can access ServletContext properties // via the environment (SPR-8991) @@ -352,6 +357,7 @@ public final class ContextLoaderTests { } private static class UnknownContextInitializer implements ApplicationContextInitializer { + @Override public void initialize(UnknownApplicationContext applicationContext) { applicationContext.unheardOf(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ResourceBundleMessageSourceTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ResourceBundleMessageSourceTests.java index ff462f3650f..b9710dd7980 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/ResourceBundleMessageSourceTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/ResourceBundleMessageSourceTests.java @@ -60,6 +60,7 @@ public class ResourceBundleMessageSourceTests extends AbstractApplicationContext private MessageSource themeMsgSource; + @Override protected ConfigurableApplicationContext createContext() throws Exception { root = new XmlWebApplicationContext(); MockServletContext sc = new MockServletContext(); @@ -82,6 +83,7 @@ public class ResourceBundleMessageSourceTests extends AbstractApplicationContext return wac; } + @Override public void testCount() { assertTrue("should have 14 beans, not " + this.applicationContext.getBeanDefinitionCount(), @@ -92,6 +94,7 @@ public class ResourceBundleMessageSourceTests extends AbstractApplicationContext * Overridden as we can't trust superclass method. * @see org.springframework.context.AbstractApplicationContextTests#testEvents() */ + @Override public void testEvents() throws Exception { // Do nothing } diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java b/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java index c3dc6275e1b..018dd1cfeb8 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java @@ -25,6 +25,7 @@ public class ServletConfigAwareBean implements ServletConfigAware { private ServletConfig servletConfig; + @Override public void setServletConfig(ServletConfig servletConfig) { this.servletConfig = servletConfig; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java b/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java index a868f2f30d9..2272378104b 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java @@ -25,6 +25,7 @@ public class ServletContextAwareBean implements ServletContextAware { private ServletContext servletContext; + @Override public void setServletContext(ServletContext servletContext) { this.servletContext = servletContext; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java index cca608e9f19..3423fd8e884 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java @@ -45,6 +45,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes private ConfigurableWebApplicationContext root; + @Override protected ConfigurableApplicationContext createContext() throws Exception { InitAndIB.constructed = false; root = new XmlWebApplicationContext(); @@ -53,8 +54,10 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes root.setServletContext(sc); root.setConfigLocations(new String[] {"/org/springframework/web/context/WEB-INF/applicationContext.xml"}); root.addBeanFactoryPostProcessor(new BeanFactoryPostProcessor() { + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) { beanFactory.addBeanPostProcessor(new BeanPostProcessor() { + @Override @SuppressWarnings("unchecked") public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException { if (bean instanceof TestBean) { @@ -62,6 +65,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes } return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String name) throws BeansException { return bean; } @@ -90,6 +94,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes * Overridden as we can't trust superclass method * @see org.springframework.context.AbstractApplicationContextTests#testEvents() */ + @Override public void testEvents() throws Exception { TestListener listener = (TestListener) this.applicationContext.getBean("testListener"); listener.zeroCounter(); @@ -104,6 +109,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes assertTrue("1 parent events after publication", parentListener.getEventCount() == 1); } + @Override public void testCount() { assertTrue("should have 14 beans, not "+ this.applicationContext.getBeanDefinitionCount(), this.applicationContext.getBeanDefinitionCount() == 14); @@ -169,6 +175,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes constructed = true; } + @Override public void afterPropertiesSet() { if (this.initMethodInvoked) fail(); @@ -182,6 +189,7 @@ public class XmlWebApplicationContextTests extends AbstractApplicationContextTes this.initMethodInvoked = true; } + @Override public void destroy() { if (this.customDestroyed) fail(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java index 96429a28cda..c6a5025c137 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/support/HttpRequestHandlerTests.java @@ -48,6 +48,7 @@ public class HttpRequestHandlerTests { StaticWebApplicationContext wac = new StaticWebApplicationContext(); wac.getBeanFactory().registerSingleton("myHandler", new HttpRequestHandler() { + @Override public void handleRequest(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException { assertSame(request, req); assertSame(response, res); diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java index 75af2c0b5a4..2bf2ee7edbc 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java @@ -371,6 +371,7 @@ public class ServletContextSupportTests { paths.add("/WEB-INF/context2.xml"); MockServletContext sc = new MockServletContext("classpath:org/springframework/web/context") { + @Override public Set getResourcePaths(String path) { if ("/WEB-INF/".equals(path)) { return paths; @@ -397,6 +398,7 @@ public class ServletContextSupportTests { dirs.add("/WEB-INF/mydir2/"); MockServletContext sc = new MockServletContext("classpath:org/springframework/web/context") { + @Override public Set getResourcePaths(String path) { if ("/WEB-INF/".equals(path)) { return dirs; @@ -433,6 +435,7 @@ public class ServletContextSupportTests { paths.add("/WEB-INF/mydir2/mydir3/"); MockServletContext sc = new MockServletContext("classpath:org/springframework/web/context") { + @Override public Set getResourcePaths(String path) { if ("/WEB-INF/".equals(path)) { return dirs; @@ -470,6 +473,7 @@ public class ServletContextSupportTests { paths.add("C:/webroot/someOtherDirThatDoesntContainPath"); MockServletContext sc = new MockServletContext("classpath:org/springframework/web/context") { + @Override public Set getResourcePaths(String path) { if ("/WEB-INF/".equals(path)) { return paths; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java index cae15040058..17bbabaa3db 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java @@ -73,6 +73,7 @@ import org.springframework.web.servlet.view.ResourceBundleViewResolver; */ public class ComplexWebApplicationContext extends StaticWebApplicationContext { + @Override public void refresh() throws BeansException { registerSingleton(DispatcherServlet.LOCALE_RESOLVER_BEAN_NAME, SessionLocaleResolver.class); registerSingleton(DispatcherServlet.THEME_RESOLVER_BEAN_NAME, SessionThemeResolver.class); @@ -179,6 +180,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class HeadController implements Controller { + @Override public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception { if ("HEAD".equals(request.getMethod())) { response.setContentLength(5); @@ -190,6 +192,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class BodyController implements Controller { + @Override public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception { response.getOutputStream().write("body".getBytes()); return null; @@ -199,6 +202,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class NoViewController implements Controller { + @Override public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception { return new ModelAndView(); } @@ -209,22 +213,27 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { private ServletConfig servletConfig; + @Override public void init(ServletConfig servletConfig) throws ServletException { this.servletConfig = servletConfig; } + @Override public ServletConfig getServletConfig() { return servletConfig; } + @Override public void service(ServletRequest servletRequest, ServletResponse servletResponse) throws IOException { servletResponse.getOutputStream().write("body".getBytes()); } + @Override public String getServletInfo() { return null; } + @Override public void destroy() { this.servletConfig = null; } @@ -241,20 +250,24 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class MyHandlerAdapter extends ApplicationObjectSupport implements HandlerAdapter, Ordered { + @Override public int getOrder() { return 99; } + @Override public boolean supports(Object handler) { return handler != null && MyHandler.class.isAssignableFrom(handler.getClass()); } + @Override public ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object delegate) throws ServletException, IllegalAccessException { ((MyHandler) delegate).doSomething(request); return null; } + @Override public long getLastModified(HttpServletRequest request, Object delegate) { return ((MyHandler) delegate).lastModified(); } @@ -263,15 +276,18 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class MyDummyAdapter extends ApplicationObjectSupport implements HandlerAdapter { + @Override public boolean supports(Object handler) { return handler != null && MyHandler.class.isAssignableFrom(handler.getClass()); } + @Override public ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object delegate) throws IOException, ServletException { throw new ServletException("dummy"); } + @Override public long getLastModified(HttpServletRequest request, Object delegate) { return -1; } @@ -280,6 +296,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class MyHandlerInterceptor1 implements HandlerInterceptor { + @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException { if (request.getAttribute("test2") != null) { @@ -291,6 +308,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { return true; } + @Override public void postHandle( HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws ServletException { @@ -303,6 +321,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { request.removeAttribute("test1x"); } + @Override public void afterCompletion( HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws ServletException { @@ -316,6 +335,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class MyHandlerInterceptor2 implements HandlerInterceptor { + @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException { if (request.getAttribute("test1x") == null) { @@ -330,6 +350,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { return true; } + @Override public void postHandle( HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws ServletException { @@ -345,6 +366,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { request.removeAttribute("test2x"); } + @Override public void afterCompletion( HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { @@ -358,14 +380,17 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class MyWebRequestInterceptor implements WebRequestInterceptor { + @Override public void preHandle(WebRequest request) throws Exception { request.setAttribute("test3", "test3", WebRequest.SCOPE_REQUEST); } + @Override public void postHandle(WebRequest request, ModelMap model) throws Exception { request.setAttribute("test3x", "test3x", WebRequest.SCOPE_REQUEST); } + @Override public void afterCompletion(WebRequest request, Exception ex) throws Exception { request.setAttribute("test3y", "test3y", WebRequest.SCOPE_REQUEST); } @@ -374,6 +399,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class ComplexLocaleChecker implements MyHandler { + @Override public void doSomething(HttpServletRequest request) throws ServletException, IllegalAccessException { WebApplicationContext wac = RequestContextUtils.getWebApplicationContext(request); if (!(wac instanceof ComplexWebApplicationContext)) { @@ -411,6 +437,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { } } + @Override public long lastModified() { return 99; } @@ -419,10 +446,12 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public static class MockMultipartResolver implements MultipartResolver { + @Override public boolean isMultipart(HttpServletRequest request) { return true; } + @Override public MultipartHttpServletRequest resolveMultipart(HttpServletRequest request) throws MultipartException { if (request.getAttribute("fail") != null) { throw new MaxUploadSizeExceededException(1000); @@ -435,15 +464,18 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { } request.setAttribute("resolved", Boolean.TRUE); return new AbstractMultipartHttpServletRequest(request) { + @Override public HttpHeaders getMultipartHeaders(String paramOrFileName) { return null; } + @Override public String getMultipartContentType(String paramOrFileName) { return null; } }; } + @Override public void cleanupMultipart(MultipartHttpServletRequest request) { if (request.getAttribute("cleanedUp") != null) { throw new IllegalStateException("Already cleaned up"); @@ -457,6 +489,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { public int counter = 0; + @Override public void onApplicationEvent(ApplicationEvent event) { if (event instanceof RequestHandledEvent) { this.counter++; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java index 9eadbf64610..635b8e0ba8c 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java @@ -81,6 +81,7 @@ public class DispatcherServletTests extends TestCase { private DispatcherServlet complexDispatcherServlet; + @Override protected void setUp() throws ServletException { servletConfig = new MockServletConfig(new MockServletContext(), "simple"); MockServletConfig complexConfig = new MockServletConfig(servletConfig.getServletContext(), "complex"); @@ -869,6 +870,7 @@ public class DispatcherServletTests extends TestCase { public static class ControllerFromParent implements Controller { + @Override public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception { return new ModelAndView(ControllerFromParent.class.getName()); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java index 70c40be9fd1..85a0756fb7a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java @@ -47,6 +47,7 @@ import org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping; */ public class SimpleWebApplicationContext extends StaticWebApplicationContext { + @Override public void refresh() throws BeansException { MutablePropertyValues pvs = new MutablePropertyValues(); pvs.add("commandClass", "org.springframework.beans.TestBean"); @@ -75,6 +76,7 @@ public class SimpleWebApplicationContext extends StaticWebApplicationContext { public static class LocaleChecker implements Controller, LastModified { + @Override public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { if (!(RequestContextUtils.getWebApplicationContext(request) instanceof SimpleWebApplicationContext)) { @@ -89,6 +91,7 @@ public class SimpleWebApplicationContext extends StaticWebApplicationContext { return null; } + @Override public long getLastModified(HttpServletRequest request) { return 98; } @@ -105,6 +108,7 @@ public class SimpleWebApplicationContext extends StaticWebApplicationContext { this.messageSource.addMessage("themetestArgs", Locale.ENGLISH, "theme test message {0}"); } + @Override public Theme getTheme(String themeName) { if (AbstractThemeResolver.ORIGINAL_DEFAULT_THEME_NAME.equals(themeName)) { return new SimpleTheme(AbstractThemeResolver.ORIGINAL_DEFAULT_THEME_NAME, this.messageSource); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java index e1c8898604f..c55aeb7d0ca 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java @@ -148,6 +148,7 @@ public class AnnotationDrivenBeanDefinitionParserTests { class TestWebArgumentResolver implements WebArgumentResolver { + @Override public Object resolveArgument(MethodParameter methodParameter, NativeWebRequest webRequest) throws Exception { return null; } @@ -156,10 +157,12 @@ class TestWebArgumentResolver implements WebArgumentResolver { class TestHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver { + @Override public boolean supportsParameter(MethodParameter parameter) { return false; } + @Override public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { return null; @@ -168,10 +171,12 @@ class TestHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver class TestHandlerMethodReturnValueHandler implements HandlerMethodReturnValueHandler { + @Override public boolean supportsReturnType(MethodParameter returnType) { return false; } + @Override public void handleReturnValue(Object returnValue, MethodParameter returnType, ModelAndViewContainer mavContainer, NativeWebRequest webRequest) throws Exception { @@ -181,10 +186,12 @@ class TestHandlerMethodReturnValueHandler implements HandlerMethodReturnValueHan class TestMessageCodesResolver implements MessageCodesResolver { + @Override public String[] resolveMessageCodes(String errorCode, String objectName) { return new String[] { "test.foo.bar" }; } + @Override @SuppressWarnings("rawtypes") public String[] resolveMessageCodes(String errorCode, String objectName, String field, Class fieldType) { return new String[] { "test.foo.bar" }; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java index 9ced7b5ddd9..8ff997204f1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java @@ -516,10 +516,12 @@ public class MvcNamespaceTests { boolean validatorInvoked; + @Override public boolean supports(Class clazz) { return true; } + @Override public void validate(Object target, Errors errors) { this.validatorInvoked = true; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java index 6c43c1ea0fd..b1433e2986e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java @@ -161,13 +161,16 @@ public class InterceptorRegistryTests { private boolean preHandleInvoked = false; + @Override public void preHandle(WebRequest request) throws Exception { preHandleInvoked = true; } + @Override public void postHandle(WebRequest request, ModelMap model) throws Exception { } + @Override public void afterCompletion(WebRequest request, Exception ex) throws Exception { } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java index c14ad7735ca..1c270ae5716 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java @@ -222,6 +222,7 @@ public class WebMvcConfigurationSupportExtensionTests { @Override public void addFormatters(FormatterRegistry registry) { registry.addConverter(new Converter() { + @Override public String convert(TestBean source) { return "converted"; } @@ -236,9 +237,11 @@ public class WebMvcConfigurationSupportExtensionTests { @Override public Validator getValidator() { return new Validator() { + @Override public void validate(Object target, Errors errors) { errors.reject("invalid"); } + @Override public boolean supports(Class clazz) { return true; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java index 6e018218fd7..c8e3a860d70 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/BeanNameUrlHandlerMappingTests.java @@ -38,6 +38,7 @@ public class BeanNameUrlHandlerMappingTests extends TestCase { private ConfigurableWebApplicationContext wac; + @Override public void setUp() throws Exception { MockServletContext sc = new MockServletContext(""); wac = new XmlWebApplicationContext(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java index d066e44525f..ea1b09ed217 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java @@ -183,6 +183,7 @@ public class CancellableFormControllerTests extends TestCase { final String reason = "Because I wanted to"; TestController ctl = new TestController() { + @Override protected ModelAndView onCancel(HttpServletRequest request, HttpServletResponse response, Object command) { return new ModelAndView(getCancelView(), "reason", reason); } @@ -221,9 +222,11 @@ public class CancellableFormControllerTests extends TestCase { private boolean invoked = false; + @Override public boolean supports(Class clazz) { return TestBean.class.isAssignableFrom(clazz); } + @Override public void validate(Object target, Errors errors) { this.invoked = true; TestBean tb = (TestBean) target; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java index 26b73b097fd..4749c85df72 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java @@ -208,6 +208,7 @@ public class CommandControllerTests extends TestCase { public void testCachingWithLastModified() throws Exception { class LastModifiedTestController extends TestController implements LastModified { + @Override public long getLastModified(HttpServletRequest request) { return 0; } @@ -223,6 +224,7 @@ public class CommandControllerTests extends TestCase { public void testCachingWithCustomCacheForSecondsCall() throws Exception { TestController mc = new TestController() { + @Override protected ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) { cacheForSeconds(response, 5); return super.handle(request, response, command, errors); @@ -237,6 +239,7 @@ public class CommandControllerTests extends TestCase { public void testCachingWithCustomApplyCacheSecondsCall1() throws Exception { TestController mc = new TestController() { + @Override protected ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) { applyCacheSeconds(response, 5); return super.handle(request, response, command, errors); @@ -251,6 +254,7 @@ public class CommandControllerTests extends TestCase { public void testCachingWithCustomApplyCacheSecondsCall2() throws Exception { TestController mc = new TestController() { + @Override protected ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) { applyCacheSeconds(response, 0); return super.handle(request, response, command, errors); @@ -267,6 +271,7 @@ public class CommandControllerTests extends TestCase { public void testCachingWithCustomApplyCacheSecondsCall3() throws Exception { TestController mc = new TestController() { + @Override protected ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) { applyCacheSeconds(response, -1); return super.handle(request, response, command, errors); @@ -282,6 +287,7 @@ public class CommandControllerTests extends TestCase { public void testCustomDateEditorWithAllowEmpty() throws Exception { final DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.GERMAN); TestController mc = new TestController() { + @Override protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) { binder.registerCustomEditor(Date.class, new CustomDateEditor(df, true)); } @@ -311,6 +317,7 @@ public class CommandControllerTests extends TestCase { public void testCustomDateEditorWithoutAllowEmpty() throws Exception { final DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.GERMAN); TestController mc = new TestController() { + @Override protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) { binder.registerCustomEditor(Date.class, new CustomDateEditor(df, false)); } @@ -341,6 +348,7 @@ public class CommandControllerTests extends TestCase { final NumberFormat nf = NumberFormat.getNumberInstance(Locale.GERMAN); TestController mc = new TestController() { + @Override protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) { binder.registerCustomEditor(Float.class, new CustomNumberEditor(Float.class, nf, true)); } @@ -371,6 +379,7 @@ public class CommandControllerTests extends TestCase { final NumberFormat nf = NumberFormat.getNumberInstance(Locale.GERMAN); TestController mc = new TestController() { + @Override protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) { binder.registerCustomEditor(Float.class, new CustomNumberEditor(Float.class, nf, false)); } @@ -463,9 +472,11 @@ public class CommandControllerTests extends TestCase { public void testResetEmptyFieldsTurnedOff() throws Exception { TestController mc = new TestController() { + @Override protected Object getCommand(HttpServletRequest request) throws Exception { return new TestBean("original", 99); } + @Override protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) { binder.setFieldMarkerPrefix(null); } @@ -497,6 +508,7 @@ public class CommandControllerTests extends TestCase { super(TestBean.class, "person"); } + @Override protected ModelAndView handle(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) { Map m = new HashMap(); assertTrue("Command not null", command != null); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java index 584e03d14ca..208225c4333 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/ControllerTests.java @@ -178,23 +178,28 @@ public class ControllerTests extends TestCase { destroyed = false; } + @Override public void init(ServletConfig servletConfig) { config = servletConfig; } + @Override public ServletConfig getServletConfig() { return config; } + @Override public void service(ServletRequest servletRequest, ServletResponse servletResponse) { request = servletRequest; response = servletResponse; } + @Override public String getServletInfo() { return "TestServlet"; } + @Override public void destroy() { destroyed = true; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java index ac926b224f5..26b84eff653 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java @@ -122,6 +122,7 @@ public class FormControllerTests extends TestCase { final Integer someNumber = new Integer(12); TestController mc = new TestController() { + @Override protected void onBindOnNewForm(HttpServletRequest request, Object command) throws Exception { TestBean testBean = (TestBean)command; testBean.setSomeNumber(new Integer(12)); @@ -370,6 +371,7 @@ public class FormControllerTests extends TestCase { String successView = "s"; TestController mc = new TestController() { + @Override protected ModelAndView handleInvalidSubmit(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { throw new ServletException("invalid submit"); @@ -438,10 +440,12 @@ public class FormControllerTests extends TestCase { final Float myFloat = new Float("123.45"); TestController mc = new TestController() { + @Override protected boolean isFormChangeRequest(HttpServletRequest request) { return (request.getParameter("formChange") != null); } + @Override protected void onFormChange(HttpServletRequest request, HttpServletResponse response, Object command) { assertNotNull("Command should not be null", command); assertEquals("Incorrect command class", TestBean.class, command.getClass()); @@ -513,8 +517,10 @@ public class FormControllerTests extends TestCase { public static String TOOSHORT = "tooshort"; + @Override public boolean supports(Class clazz) { return true; } + @Override public void validate(Object obj, Errors errors) { TestBean tb = (TestBean) obj; if (tb.getName() == null || "".equals(tb.getName())) @@ -529,8 +535,10 @@ public class FormControllerTests extends TestCase { public static String TOOSHORT = "tooshort"; + @Override public boolean supports(Class clazz) { return true; } + @Override public void validate(Object obj, Errors errors) { errors.reject("test", "testmessage"); } @@ -548,12 +556,14 @@ public class FormControllerTests extends TestCase { setCommandName(BEAN_NAME); } + @Override protected Object formBackingObject(HttpServletRequest request) throws ServletException { TestBean person = new TestBean(); person.setAge(DEFAULT_AGE); return person; } + @Override protected boolean isFormChangeRequest(HttpServletRequest request) { return (request.getParameter("formChange") != null); } @@ -562,6 +572,7 @@ public class FormControllerTests extends TestCase { private static class TestControllerWithCustomOnSubmit extends TestController { + @Override protected ModelAndView onSubmit(Object command) throws Exception { return new ModelAndView("mySuccess"); } @@ -580,6 +591,7 @@ public class FormControllerTests extends TestCase { setCommandClass(TestBean.class); } + @Override protected Map referenceData(HttpServletRequest request) { ++refDataCount; Map m = new HashMap(); @@ -595,6 +607,7 @@ public class FormControllerTests extends TestCase { public static class BooleanBindingFormController extends AbstractFormController { + @Override protected ModelAndView processFormSubmission (HttpServletRequest req, HttpServletResponse resp, Object command, BindException errors) throws Exception { ModelAndView mav = new ModelAndView(); @@ -602,6 +615,7 @@ public class FormControllerTests extends TestCase { return mav; } + @Override protected ModelAndView showForm( HttpServletRequest req, HttpServletResponse resp, BindException err) throws Exception { return null; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java index 1d48f052d56..5249a82cdda 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java @@ -105,9 +105,11 @@ public class WizardFormControllerTests extends TestCase { public void testCustomSessionAttributes() throws Exception { AbstractWizardFormController wizard = new TestWizardController() { + @Override protected String getFormSessionAttributeName() { return "myFormAttr"; } + @Override protected String getPageSessionAttributeName() { return "myPageAttr"; } @@ -140,9 +142,11 @@ public class WizardFormControllerTests extends TestCase { public void testCustomRequestDependentSessionAttributes() throws Exception { AbstractWizardFormController wizard = new TestWizardController() { + @Override protected String getFormSessionAttributeName(HttpServletRequest request) { return "myFormAttr" + request.getParameter("formAttr"); } + @Override protected String getPageSessionAttributeName(HttpServletRequest request) { return "myPageAttr" + request.getParameter("pageAttr"); } @@ -383,15 +387,18 @@ public class WizardFormControllerTests extends TestCase { setPages(new String[] {"page0", "page1"}); } + @Override protected Map referenceData(HttpServletRequest request, int page) throws Exception { assertEquals(new Integer(page), request.getAttribute("target")); return super.referenceData(request, page); } + @Override protected boolean suppressValidation(HttpServletRequest request, Object command) { return (request.getParameter("formChange") != null); } + @Override protected void validatePage(Object command, Errors errors, int page) { TestBean tb = (TestBean) command; switch (page) { @@ -410,6 +417,7 @@ public class WizardFormControllerTests extends TestCase { } } + @Override protected ModelAndView processFinish( HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) throws ServletException, IOException { @@ -417,6 +425,7 @@ public class WizardFormControllerTests extends TestCase { return new ModelAndView("success", getCommandName(), command); } + @Override protected ModelAndView processCancel( HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) throws ServletException, IOException { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ControllerClassNameHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ControllerClassNameHandlerMappingTests.java index cbf9da30612..6c495b31ab7 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ControllerClassNameHandlerMappingTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ControllerClassNameHandlerMappingTests.java @@ -41,6 +41,7 @@ public class ControllerClassNameHandlerMappingTests extends TestCase { private HandlerMapping hm4; + @Override public void setUp() throws Exception { MockServletContext sc = new MockServletContext(""); this.wac = new XmlWebApplicationContext(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java index bac4f505bb2..45249d3e4b1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java @@ -110,6 +110,7 @@ public class JdkProxyServletAnnotationTests { public static class TypeLevelImpl implements TypeLevel { + @Override public void doIt(Writer writer) throws IOException { writer.write("doIt"); } @@ -126,6 +127,7 @@ public class JdkProxyServletAnnotationTests { public static class MethodLevelImpl implements MethodLevel { + @Override public void doIt(Writer writer) throws IOException { writer.write("doIt"); } @@ -142,6 +144,7 @@ public class JdkProxyServletAnnotationTests { public static class TypeAndMethodLevelImpl implements TypeAndMethodLevel { + @Override public void doIt(Writer writer) throws IOException { writer.write("doIt"); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/RequestSpecificMappingInfoComparatorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/RequestSpecificMappingInfoComparatorTests.java index 22299a891f6..e85d4aafa5e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/RequestSpecificMappingInfoComparatorTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/RequestSpecificMappingInfoComparatorTests.java @@ -124,6 +124,7 @@ public class RequestSpecificMappingInfoComparatorTests { private static class MockComparator implements Comparator { + @Override public int compare(String s1, String s2) { return 0; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java index cd36fa25088..07d68187be2 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java @@ -1964,6 +1964,7 @@ public class ServletAnnotationControllerTests { public static class ListEditorRegistrar implements PropertyEditorRegistrar { + @Override public void registerCustomEditors(PropertyEditorRegistry registry) { registry.registerCustomEditor(Set.class, new ListEditor()); } @@ -2190,12 +2191,14 @@ public class ServletAnnotationControllerTests { @Controller public static class MySessionAttributesControllerImpl implements MySessionAttributesControllerIfc { + @Override public String get(Model model) { model.addAttribute("object1", new Object()); model.addAttribute("object2", new Object()); return "page1"; } + @Override public String post(@ModelAttribute("object1") Object object1) { //do something with object1 return "page2"; @@ -2222,6 +2225,7 @@ public class ServletAnnotationControllerTests { @Controller public static class MyParameterizedControllerImpl implements MyEditableParameterizedControllerIfc { + @Override public List getTestBeans() { List list = new LinkedList(); list.add(new TestBean("tb1")); @@ -2229,12 +2233,14 @@ public class ServletAnnotationControllerTests { return list; } + @Override public String get(Model model) { model.addAttribute("object1", new TestBean()); model.addAttribute("object2", new TestBean()); return "page1"; } + @Override public String post(TestBean object) { //do something with object1 return "page2"; @@ -2244,6 +2250,7 @@ public class ServletAnnotationControllerTests { @Controller public static class MyParameterizedControllerImplWithOverriddenMappings implements MyEditableParameterizedControllerIfc { + @Override @ModelAttribute("testBeanList") public List getTestBeans() { List list = new LinkedList(); @@ -2252,6 +2259,7 @@ public class ServletAnnotationControllerTests { return list; } + @Override @RequestMapping(method = RequestMethod.GET) public String get(Model model) { model.addAttribute("object1", new TestBean()); @@ -2259,6 +2267,7 @@ public class ServletAnnotationControllerTests { return "page1"; } + @Override @RequestMapping(method = RequestMethod.POST) public String post(@ModelAttribute("object1") TestBean object1) { //do something with object1 @@ -2428,6 +2437,7 @@ public class ServletAnnotationControllerTests { private static class MyWebBindingInitializer implements WebBindingInitializer { + @Override public void initBinder(WebDataBinder binder, WebRequest request) { LocalValidatorFactoryBean vf = new LocalValidatorFactoryBean(); vf.afterPropertiesSet(); @@ -2441,6 +2451,7 @@ public class ServletAnnotationControllerTests { private static class MySpecialArgumentResolver implements WebArgumentResolver { + @Override public Object resolveArgument(MethodParameter methodParameter, NativeWebRequest webRequest) { if (methodParameter.getParameterType().equals(MySpecialArg.class)) { return new MySpecialArg("myValue"); @@ -2599,6 +2610,7 @@ public class ServletAnnotationControllerTests { private static class TestPrincipal implements Principal { + @Override public String getName() { return "test"; } @@ -2606,6 +2618,7 @@ public class ServletAnnotationControllerTests { private static class OtherPrincipal implements Principal { + @Override public String getName() { return "other"; } @@ -2613,12 +2626,15 @@ public class ServletAnnotationControllerTests { private static class TestViewResolver implements ViewResolver { + @Override public View resolveViewName(final String viewName, Locale locale) throws Exception { return new View() { + @Override public String getContentType() { return null; } + @Override @SuppressWarnings({"unchecked", "deprecation"}) public void render(Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -2657,11 +2673,14 @@ public class ServletAnnotationControllerTests { public static class ModelExposingViewResolver implements ViewResolver { + @Override public View resolveViewName(final String viewName, Locale locale) throws Exception { return new View() { + @Override public String getContentType() { return null; } + @Override public void render(Map model, HttpServletRequest request, HttpServletResponse response) { request.setAttribute("viewName", viewName); request.getSession().setAttribute("model", model); @@ -2758,6 +2777,7 @@ public class ServletAnnotationControllerTests { public static class TestBeanConverter implements Converter { + @Override public ITestBean convert(String source) { return new TestBean(source); } @@ -2849,23 +2869,28 @@ public class ServletAnnotationControllerTests { public static class NotReadableMessageConverter implements HttpMessageConverter { + @Override public boolean canRead(Class clazz, MediaType mediaType) { return true; } + @Override public boolean canWrite(Class clazz, MediaType mediaType) { return true; } + @Override public List getSupportedMediaTypes() { return Collections.singletonList(new MediaType("application", "pdf")); } + @Override public Object read(Class clazz, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException { throw new HttpMessageNotReadableException("Could not read"); } + @Override public void write(Object o, MediaType contentType, HttpOutputMessage outputMessage) throws IOException, HttpMessageNotWritableException { throw new UnsupportedOperationException("Not implemented"); @@ -2880,23 +2905,28 @@ public class ServletAnnotationControllerTests { this.supportedMediaTypes = Arrays.asList(supportedMediaTypes); } + @Override public boolean canRead(Class clazz, MediaType mediaType) { return supportedMediaTypes.contains(mediaType); } + @Override public boolean canWrite(Class clazz, MediaType mediaType) { return supportedMediaTypes.contains(mediaType); } + @Override public List getSupportedMediaTypes() { return supportedMediaTypes; } + @Override public Object read(Class clazz, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException { return null; } + @Override public void write(Object o, MediaType contentType, HttpOutputMessage outputMessage) throws IOException, HttpMessageNotWritableException { outputMessage.getHeaders().setContentType(contentType); @@ -2968,6 +2998,7 @@ public class ServletAnnotationControllerTests { public static class MyModelAndViewResolver implements ModelAndViewResolver { + @Override public ModelAndView resolveModelAndView(Method handlerMethod, Class handlerType, Object returnValue, @@ -2975,10 +3006,12 @@ public class ServletAnnotationControllerTests { NativeWebRequest webRequest) { if (returnValue instanceof MySpecialArg) { return new ModelAndView(new View() { + @Override public String getContentType() { return "text/html"; } + @Override public void render(Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { response.getWriter().write("myValue"); @@ -3036,6 +3069,7 @@ public class ServletAnnotationControllerTests { @Controller public static class TestControllerImpl implements TestController { + @Override @RequestMapping("/method") public ModelAndView method(MyEntity object) { return new ModelAndView("/something"); @@ -3131,6 +3165,7 @@ public class ServletAnnotationControllerTests { @Controller public static class IMyControllerImpl implements IMyController { + @Override public void handle(Writer writer, @RequestParam(value="p", required=false) String param) throws IOException { writer.write("handle " + param); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java index b88c10fa9f7..bd2ac2fccf8 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java @@ -46,6 +46,7 @@ public class Spr7766Tests { } public class ColorConverter implements Converter { + @Override public Color convert(String source) { if (!source.startsWith("#")) source = "#" + source; return Color.decode(source); } } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java index f9c1b200c24..555dbd89b66 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java @@ -48,6 +48,7 @@ public class Spr7839Tests { ConfigurableWebBindingInitializer binder = new ConfigurableWebBindingInitializer(); GenericConversionService service = new DefaultConversionService(); service.addConverter(new Converter() { + @Override public NestedBean convert(String source) { return new NestedBean(source); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java index 307b6ab80d8..53cb85a215e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java @@ -26,6 +26,7 @@ import org.springframework.web.servlet.ModelAndView; */ public class Controller implements org.springframework.web.servlet.mvc.Controller { + @Override public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) { return new ModelAndView("indexView"); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerBeanNameHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerBeanNameHandlerMappingTests.java index fce0eca69ae..a0822913bcf 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerBeanNameHandlerMappingTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerBeanNameHandlerMappingTests.java @@ -35,6 +35,7 @@ public class ControllerBeanNameHandlerMappingTests extends TestCase { private HandlerMapping hm; + @Override public void setUp() throws Exception { MockServletContext sc = new MockServletContext(""); this.wac = new XmlWebApplicationContext(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerClassNameHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerClassNameHandlerMappingTests.java index bb2ee10976c..15cdacd232b 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerClassNameHandlerMappingTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/ControllerClassNameHandlerMappingTests.java @@ -42,6 +42,7 @@ public class ControllerClassNameHandlerMappingTests extends TestCase { private HandlerMapping hm4; + @Override public void setUp() throws Exception { MockServletContext sc = new MockServletContext(""); this.wac = new XmlWebApplicationContext(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java index 5c36b0989d3..b8fa5d7e662 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java @@ -27,6 +27,7 @@ import org.springframework.web.servlet.mvc.Controller; */ public class WelcomeController implements Controller { + @Override public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) { return new ModelAndView("welcomeView"); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java index ea7e21b24f1..676e44729df 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java @@ -195,6 +195,7 @@ public class RequestMappingInfoTests { new ParamsRequestCondition("foo"), null, null, null, null); Comparator comparator = new Comparator() { + @Override public int compare(RequestMappingInfo info, RequestMappingInfo otherInfo) { return info.compareTo(otherInfo, new MockHttpServletRequest()); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java index eaabf4c2d92..fa7a9f81303 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HandlerMethodAnnotationDetectionTests.java @@ -114,6 +114,7 @@ public class HandlerMethodAnnotationDetectionTests { } class TestPointcut extends StaticMethodMatcherPointcut { + @Override public boolean matches(Method method, Class clazz) { return method.getName().equals("hashCode"); } @@ -202,19 +203,23 @@ public class HandlerMethodAnnotationDetectionTests { */ static class AbstractClassController extends MappingAbstractClass { + @Override public void initBinder(WebDataBinder dataBinder, @RequestParam("datePattern") String pattern) { CustomDateEditor dateEditor = new CustomDateEditor(new SimpleDateFormat(pattern), false); dataBinder.registerCustomEditor(Date.class, dateEditor); } + @Override public void initModel(@RequestHeader("header1") Date date, Model model) { model.addAttribute("attr1", date); } + @Override public Date handle(@RequestHeader("header2") Date date, Model model) throws Exception { return date; } + @Override public String handleException(Exception exception) { return exception.getMessage(); } @@ -251,19 +256,23 @@ public class HandlerMethodAnnotationDetectionTests { */ static class InterfaceController implements MappingInterface { + @Override public void initBinder(WebDataBinder dataBinder, @RequestParam("datePattern") String thePattern) { CustomDateEditor dateEditor = new CustomDateEditor(new SimpleDateFormat(thePattern), false); dataBinder.registerCustomEditor(Date.class, dateEditor); } + @Override public void initModel(@RequestHeader("header1") Date date, Model model) { model.addAttribute("attr1", date); } + @Override public Date handle(@RequestHeader("header2") Date date, Model model) throws Exception { return date; } + @Override public String handleException(Exception exception) { return exception.getMessage(); } @@ -295,19 +304,23 @@ public class HandlerMethodAnnotationDetectionTests { */ static class ParameterizedAbstractClassController extends MappingParameterizedAbstractClass { + @Override public void initBinder(WebDataBinder dataBinder, @RequestParam("datePattern") String thePattern) { CustomDateEditor dateEditor = new CustomDateEditor(new SimpleDateFormat(thePattern), false); dataBinder.registerCustomEditor(Date.class, dateEditor); } + @Override public void initModel(@RequestHeader("header1") Date date, Model model) { model.addAttribute("attr1", date); } + @Override public Date handle(@RequestHeader("header2") Date date, Model model) throws Exception { return date; } + @Override public String handleException(Exception exception) { return exception.getMessage(); } @@ -340,23 +353,27 @@ public class HandlerMethodAnnotationDetectionTests { */ static class ParameterizedInterfaceController implements MappingParameterizedInterface { + @Override @InitBinder public void initBinder(WebDataBinder dataBinder, @RequestParam("datePattern") String thePattern) { CustomDateEditor dateEditor = new CustomDateEditor(new SimpleDateFormat(thePattern), false); dataBinder.registerCustomEditor(Date.class, dateEditor); } + @Override @ModelAttribute public void initModel(@RequestHeader("header1") Date date, Model model) { model.addAttribute("attr1", date); } + @Override @RequestMapping(value="/path1/path2", method=RequestMethod.POST) @ModelAttribute("attr2") public Date handle(@RequestHeader("header2") Date date, Model model) throws Exception { return date; } + @Override @ExceptionHandler(Exception.class) @ResponseBody public String handleException(Exception exception) { @@ -412,6 +429,7 @@ public class HandlerMethodAnnotationDetectionTests { private static StaticMethodMatcherPointcut getControllerPointcut() { return new StaticMethodMatcherPointcut() { + @Override public boolean matches(Method method, Class targetClass) { return ((AnnotationUtils.findAnnotation(targetClass, Controller.class) != null) || (AnnotationUtils.findAnnotation(targetClass, RequestMapping.class) != null)); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java index 467fff6dcfa..cd431d61541 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java @@ -159,10 +159,12 @@ public class HttpEntityMethodProcessorTests { private Long id; private String name; + @Override public Long getId() { return id; } + @Override public void setId(Long id) { this.id = id; } @@ -177,6 +179,7 @@ public class HttpEntityMethodProcessorTests { } private final class ValidatingBinderFactory implements WebDataBinderFactory { + @Override public WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName) throws Exception { LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); validator.afterPropertiesSet(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java index 1ff5a6303ee..54d187f91a1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java @@ -124,6 +124,7 @@ public class ModelAndViewResolverMethodReturnValueHandlerTests { this.returnValueType = returnValueType; } + @Override @SuppressWarnings("rawtypes") public ModelAndView resolveModelAndView(Method method, Class handlerType, Object returnValue, ExtendedModelMap model, NativeWebRequest request) { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java index e86b96b3732..450315e6de4 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java @@ -394,28 +394,33 @@ public class RequestMappingHandlerAdapterIntegrationTests { } private static class StubValidator implements Validator { + @Override public boolean supports(Class clazz) { return true; } + @Override public void validate(Object target, Errors errors) { errors.reject("error"); } } private static class ColorArgumentResolver implements WebArgumentResolver { + @Override public Object resolveArgument(MethodParameter methodParameter, NativeWebRequest webRequest) throws Exception { return new Color(0); } } private static class User implements Principal { + @Override public String getName() { return "user"; } } private static class OtherUser implements Principal { + @Override public String getName() { return "other user"; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java index 813c7819a9f..5f9869e1dc8 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java @@ -275,6 +275,7 @@ public class RequestPartMethodArgumentResolverTests { } private final class ValidatingBinderFactory implements WebDataBinderFactory { + @Override public WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName) throws Exception { LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); validator.afterPropertiesSet(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java index 85ab677a0a7..315040419e9 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java @@ -323,6 +323,7 @@ public class RequestResponseBodyMethodProcessorMockTests { } private final class ValidatingBinderFactory implements WebDataBinderFactory { + @Override public WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName) throws Exception { LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); validator.afterPropertiesSet(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java index e42a2aa9679..5c69b6f4245 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java @@ -259,10 +259,12 @@ public class RequestResponseBodyMethodProcessorTests { private Long id; private String name; + @Override public Long getId() { return id; } + @Override public void setId(Long id) { this.id = id; } @@ -277,6 +279,7 @@ public class RequestResponseBodyMethodProcessorTests { } private final class ValidatingBinderFactory implements WebDataBinderFactory { + @Override public WebDataBinder createBinder(NativeWebRequest webRequest, Object target, String objectName) throws Exception { LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); validator.afterPropertiesSet(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java index d1872128cbe..e42ccb29693 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java @@ -243,6 +243,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void defaultExpressionParameters() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext context) { RootBeanDefinition ppc = new RootBeanDefinition(PropertyPlaceholderConfigurer.class); ppc.getPropertyValues().add("properties", "myKey=foo"); @@ -266,6 +267,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void typeNestedSetBinding() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext context) { RootBeanDefinition csDef = new RootBeanDefinition(FormattingConversionServiceFactoryBean.class); csDef.getPropertyValues().add("converters", new TestBeanConverter()); @@ -308,6 +310,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void emptyParameterListHandleMethod() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext context) { RootBeanDefinition vrDef = new RootBeanDefinition(InternalResourceViewResolver.class); vrDef.getPropertyValues().add("suffix", ".jsp"); @@ -328,6 +331,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void sessionAttributeExposure() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext context) { context.registerBeanDefinition("viewResolver", new RootBeanDefinition(ModelExposingViewResolver.class)); } @@ -358,6 +362,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void sessionAttributeExposureWithInterface() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext context) { context.registerBeanDefinition("viewResolver", new RootBeanDefinition(ModelExposingViewResolver.class)); DefaultAdvisorAutoProxyCreator autoProxyCreator = new DefaultAdvisorAutoProxyCreator(); @@ -392,6 +397,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void parameterizedAnnotatedInterface() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext context) { context.registerBeanDefinition("viewResolver", new RootBeanDefinition(ModelExposingViewResolver.class)); } @@ -424,6 +430,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void parameterizedAnnotatedInterfaceWithOverriddenMappingsInImpl() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext context) { context.registerBeanDefinition("viewResolver", new RootBeanDefinition(ModelExposingViewResolver.class)); } @@ -508,6 +515,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void formController() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { wac.registerBeanDefinition("viewResolver", new RootBeanDefinition(TestViewResolver.class)); } @@ -524,6 +532,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void modelFormController() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { wac.registerBeanDefinition("viewResolver", new RootBeanDefinition(TestViewResolver.class)); } @@ -540,6 +549,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void proxiedFormController() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { wac.registerBeanDefinition("viewResolver", new RootBeanDefinition(TestViewResolver.class)); DefaultAdvisorAutoProxyCreator autoProxyCreator = new DefaultAdvisorAutoProxyCreator(); @@ -561,6 +571,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void commandProvidingFormControllerWithCustomEditor() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { wac.registerBeanDefinition("viewResolver", new RootBeanDefinition(TestViewResolver.class)); RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class); @@ -581,6 +592,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void typedCommandProvidingFormController() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { wac.registerBeanDefinition("viewResolver", new RootBeanDefinition(TestViewResolver.class)); RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class); @@ -620,6 +632,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void binderInitializingCommandProvidingFormController() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { wac.registerBeanDefinition("viewResolver", new RootBeanDefinition(TestViewResolver.class)); } @@ -637,6 +650,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void specificBinderInitializingCommandProvidingFormController() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { wac.registerBeanDefinition("viewResolver", new RootBeanDefinition(TestViewResolver.class)); } @@ -658,6 +672,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl WebApplicationContext webAppContext = initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { wac.setServletContext(servletContext); AnnotationConfigUtils.registerAnnotationConfigProcessors(wac); @@ -831,6 +846,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void responseBodyNoAcceptableMediaType() throws ServletException, IOException { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class); StringHttpMessageConverter converter = new StringHttpMessageConverter(); @@ -866,6 +882,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void unsupportedRequestBody() throws ServletException, IOException { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class); adapterDef.getPropertyValues().add("messageConverters", new ByteArrayHttpMessageConverter()); @@ -900,6 +917,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void badRequestRequestBody() throws ServletException, IOException { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class); adapterDef.getPropertyValues().add("messageConverters", new NotReadableMessageConverter()); @@ -946,6 +964,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void overlappingMessageConvertersRequestBody() throws ServletException, IOException { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class); List> messageConverters = new ArrayList>(); @@ -980,6 +999,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void responseBodyArgMismatch() throws ServletException, IOException { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { Jaxb2Marshaller marshaller = new Jaxb2Marshaller(); marshaller.setClassesToBeBound(A.class, B.class); @@ -1155,6 +1175,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void mavResolver() throws ServletException, IOException { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { RootBeanDefinition adapterDef = new RootBeanDefinition(RequestMappingHandlerAdapter.class); ModelAndViewResolver[] mavResolvers = new ModelAndViewResolver[] {new MyModelAndViewResolver()}; @@ -1283,6 +1304,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void requestMappingInterfaceWithProxy() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { DefaultAdvisorAutoProxyCreator autoProxyCreator = new DefaultAdvisorAutoProxyCreator(); autoProxyCreator.setBeanFactory(wac.getBeanFactory()); @@ -1420,6 +1442,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void parameterCsvAsStringArray() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext wac) { RootBeanDefinition csDef = new RootBeanDefinition(FormattingConversionServiceFactoryBean.class); RootBeanDefinition wbiDef = new RootBeanDefinition(ConfigurableWebBindingInitializer.class); @@ -1525,6 +1548,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Test public void prototypeController() throws Exception { initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext context) { RootBeanDefinition beanDef = new RootBeanDefinition(PrototypeController.class); beanDef.setScope(BeanDefinition.SCOPE_PROTOTYPE); @@ -1727,12 +1751,14 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl public static class MySessionAttributesControllerImpl implements MySessionAttributesControllerIfc { + @Override public String get(Model model) { model.addAttribute("object1", new Object()); model.addAttribute("object2", new Object()); return "page1"; } + @Override public String post(@ModelAttribute("object1") Object object1) { //do something with object1 return "page2"; @@ -1759,6 +1785,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Controller public static class MyParameterizedControllerImpl implements MyEditableParameterizedControllerIfc { + @Override public List getTestBeans() { List list = new LinkedList(); list.add(new TestBean("tb1")); @@ -1766,12 +1793,14 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl return list; } + @Override public String get(Model model) { model.addAttribute("object1", new TestBean()); model.addAttribute("object2", new TestBean()); return "page1"; } + @Override public String post(TestBean object) { //do something with object1 return "page2"; @@ -1781,6 +1810,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Controller public static class MyParameterizedControllerImplWithOverriddenMappings implements MyEditableParameterizedControllerIfc { + @Override @ModelAttribute("testBeanList") public List getTestBeans() { List list = new LinkedList(); @@ -1789,6 +1819,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl return list; } + @Override @RequestMapping(method = RequestMethod.GET) public String get(Model model) { model.addAttribute("object1", new TestBean()); @@ -1796,6 +1827,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl return "page1"; } + @Override @RequestMapping(method = RequestMethod.POST) public String post(@ModelAttribute("object1") TestBean object1) { //do something with object1 @@ -1966,6 +1998,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl static class MyWebBindingInitializer implements WebBindingInitializer { + @Override public void initBinder(WebDataBinder binder, WebRequest request) { LocalValidatorFactoryBean vf = new LocalValidatorFactoryBean(); vf.afterPropertiesSet(); @@ -1979,6 +2012,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl static class MySpecialArgumentResolver implements WebArgumentResolver { + @Override public Object resolveArgument(MethodParameter methodParameter, NativeWebRequest webRequest) { if (methodParameter.getParameterType().equals(MySpecialArg.class)) { return new MySpecialArg("myValue"); @@ -2132,6 +2166,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl static class TestPrincipal implements Principal { + @Override public String getName() { return "test"; } @@ -2139,6 +2174,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl static class OtherPrincipal implements Principal { + @Override public String getName() { return "other"; } @@ -2146,12 +2182,15 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl static class TestViewResolver implements ViewResolver { + @Override public View resolveViewName(final String viewName, Locale locale) throws Exception { return new View() { + @Override public String getContentType() { return null; } + @Override @SuppressWarnings({"unchecked", "deprecation", "rawtypes"}) public void render(Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -2190,11 +2229,14 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl public static class ModelExposingViewResolver implements ViewResolver { + @Override public View resolveViewName(final String viewName, Locale locale) throws Exception { return new View() { + @Override public String getContentType() { return null; } + @Override public void render(Map model, HttpServletRequest request, HttpServletResponse response) { request.setAttribute("viewName", viewName); request.getSession().setAttribute("model", model); @@ -2291,6 +2333,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl public static class TestBeanConverter implements Converter { + @Override public ITestBean convert(String source) { return new TestBean(source); } @@ -2398,23 +2441,28 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl public static class NotReadableMessageConverter implements HttpMessageConverter { + @Override public boolean canRead(Class clazz, MediaType mediaType) { return true; } + @Override public boolean canWrite(Class clazz, MediaType mediaType) { return true; } + @Override public List getSupportedMediaTypes() { return Collections.singletonList(new MediaType("application", "pdf")); } + @Override public Object read(Class clazz, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException { throw new HttpMessageNotReadableException("Could not read"); } + @Override public void write(Object o, MediaType contentType, HttpOutputMessage outputMessage) throws IOException, HttpMessageNotWritableException { throw new UnsupportedOperationException("Not implemented"); @@ -2429,23 +2477,28 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl this.supportedMediaTypes = Arrays.asList(supportedMediaTypes); } + @Override public boolean canRead(Class clazz, MediaType mediaType) { return supportedMediaTypes.contains(mediaType); } + @Override public boolean canWrite(Class clazz, MediaType mediaType) { return supportedMediaTypes.contains(mediaType); } + @Override public List getSupportedMediaTypes() { return supportedMediaTypes; } + @Override public Object read(Class clazz, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException { return null; } + @Override public void write(Object o, MediaType contentType, HttpOutputMessage outputMessage) throws IOException, HttpMessageNotWritableException { outputMessage.getHeaders().setContentType(contentType); @@ -2545,6 +2598,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl public static class MyModelAndViewResolver implements ModelAndViewResolver { + @Override @SuppressWarnings("rawtypes") public ModelAndView resolveModelAndView(Method handlerMethod, Class handlerType, @@ -2553,10 +2607,12 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl NativeWebRequest webRequest) { if (returnValue instanceof MySpecialArg) { return new ModelAndView(new View() { + @Override public String getContentType() { return "text/html"; } + @Override public void render(Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { response.getWriter().write("myValue"); @@ -2628,6 +2684,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Controller public static class TestControllerImpl implements TestController { + @Override @RequestMapping("/method") public ModelAndView method(MyEntity object) { return new ModelAndView("/something"); @@ -2723,6 +2780,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl @Controller public static class IMyControllerImpl implements IMyController { + @Override public void handle(Writer writer, @RequestParam(value="p", required=false) String param) throws IOException { writer.write("handle " + param); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java index 50d30583af1..5365749ed5d 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java @@ -185,10 +185,12 @@ public class ServletInvocableHandlerMethodTests { private static class ExceptionRaisingReturnValueHandler implements HandlerMethodReturnValueHandler { + @Override public boolean supportsReturnType(MethodParameter returnType) { return true; } + @Override public void handleReturnValue(Object returnValue, MethodParameter returnType, ModelAndViewContainer mavContainer, NativeWebRequest webRequest) throws Exception { throw new HttpMessageNotWritableException("oops, can't write"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java index f3c51db5a8b..0b0afcee8d9 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java @@ -95,6 +95,7 @@ public class ServletRequestMethodArgumentResolverTests { @Test public void principal() throws Exception { Principal principal = new Principal() { + @Override public String getName() { return "Foo"; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java index 22e924e600f..3739046c597 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriTemplateServletAnnotationControllerHandlerMethodTests.java @@ -107,6 +107,7 @@ public class UriTemplateServletAnnotationControllerHandlerMethodTests extends Ab WebApplicationContext wac = initServlet(new ApplicationContextInitializer() { + @Override public void initialize(GenericWebApplicationContext context) { RootBeanDefinition beanDef = new RootBeanDefinition(ModelValidatingViewResolver.class); beanDef.getConstructorArgumentValues().addGenericArgumentValue(pathVars); @@ -671,8 +672,10 @@ public class UriTemplateServletAnnotationControllerHandlerMethodTests extends Ab this.attrsToValidate = attrsToValidate; } + @Override public View resolveViewName(final String viewName, Locale locale) throws Exception { return new AbstractView () { + @Override public String getContentType() { return null; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java index e229bac169a..43c83b7ef41 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java @@ -139,6 +139,7 @@ public class RedirectAttributesModelMapTests { public static class TestBeanConverter implements Converter { + @Override public String convert(TestBean source) { return "[" + source.getName() + "]"; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java index 92b5d65487a..d3d0547fba8 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockFilterRegistration.java @@ -39,10 +39,12 @@ class MockFilterRegistration implements Dynamic { return this.asyncSupported; } + @Override public void setAsyncSupported(boolean isAsyncSupported) { this.asyncSupported = isAsyncSupported; } + @Override public void addMappingForServletNames(EnumSet dispatcherTypes, boolean isMatchAfter, String... servletNames) { @@ -53,38 +55,47 @@ class MockFilterRegistration implements Dynamic { // Not implemented + @Override public String getName() { return null; } + @Override public Collection getServletNameMappings() { return null; } + @Override public void addMappingForUrlPatterns(EnumSet dispatcherTypes, boolean isMatchAfter, String... urlPatterns) { } + @Override public Collection getUrlPatternMappings() { return null; } + @Override public String getClassName() { return null; } + @Override public boolean setInitParameter(String name, String value) { return false; } + @Override public String getInitParameter(String name) { return null; } + @Override public Set setInitParameters(Map initParameters) { return null; } + @Override public Map getInitParameters() { return null; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockServletRegistration.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockServletRegistration.java index 2b0e15a4db5..958f1755b49 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockServletRegistration.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/MockServletRegistration.java @@ -40,27 +40,33 @@ class MockServletRegistration implements ServletRegistration.Dynamic { return loadOnStartup; } + @Override public void setLoadOnStartup(int loadOnStartup) { this.loadOnStartup = loadOnStartup; } + @Override public void setRunAsRole(String roleName) { this.roleName = roleName; } + @Override public Set addMapping(String... urlPatterns) { mappings.addAll(Arrays.asList(urlPatterns)); return mappings; } + @Override public Collection getMappings() { return mappings; } + @Override public String getRunAsRole() { return roleName; } + @Override public void setAsyncSupported(boolean isAsyncSupported) { this.asyncSupported = isAsyncSupported; } @@ -71,33 +77,41 @@ class MockServletRegistration implements ServletRegistration.Dynamic { // not implemented + @Override public String getName() { return null; } + @Override public void setMultipartConfig(MultipartConfigElement multipartConfig) { } + @Override public Set setServletSecurity(ServletSecurityElement constraint) { return null; } + @Override public String getClassName() { return null; } + @Override public boolean setInitParameter(String name, String value) { return false; } + @Override public String getInitParameter(String name) { return null; } + @Override public Set setInitParameters(Map initParameters) { return null; } + @Override public Map getInitParameters() { return null; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java index 84e940352ac..2fcc677126b 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java @@ -30,18 +30,22 @@ public class RequestDataValueProcessorWrapper implements RequestDataValueProcess this.processor = processor; } + @Override public String processUrl(HttpServletRequest request, String url) { return (this.processor != null) ? this.processor.processUrl(request, url) : url; } + @Override public String processFormFieldValue(HttpServletRequest request, String name, String value, String type) { return (this.processor != null) ? this.processor.processFormFieldValue(request, name, value, type) : value; } + @Override public String processAction(HttpServletRequest request, String action) { return (this.processor != null) ? this.processor.processAction(request, action) : action; } + @Override public Map getExtraHiddenFields(HttpServletRequest request) { return (this.processor != null) ? this.processor.getExtraHiddenFields(request) : null; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java index e4fce1213fc..976fcb923e6 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java @@ -22,6 +22,7 @@ package org.springframework.web.servlet.tags; */ public class BindTagOutsideDispatcherServletTests extends BindTagTests { + @Override protected boolean inDispatcherServlet() { return false; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java index 03c39fa8def..6f22532bdc5 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java @@ -509,6 +509,7 @@ public class BindTagTests extends AbstractTagTests { IndexedTestBean tb = new IndexedTestBean(); DataBinder binder = new ServletRequestDataBinder(tb, "tb"); binder.registerCustomEditor(TestBean.class, null, new PropertyEditorSupport() { + @Override public String getAsText() { return "something"; } @@ -987,6 +988,7 @@ public class BindTagTests extends AbstractTagTests { pc.getRequest().setAttribute(BindingResult.MODEL_KEY_PREFIX + "tb", binder.getBindingResult()); FormTag formTag = new FormTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(new StringWriter()); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java index 9dbbf6416f2..1cec18763fc 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java @@ -40,6 +40,7 @@ public class EvalTagTests extends AbstractTagTests { private MockPageContext context; + @Override protected void setUp() throws Exception { context = createPageContext(); FormattingConversionServiceFactoryBean factory = new FormattingConversionServiceFactoryBean(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java index 4d3e4c9f76a..3795717267e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java @@ -22,6 +22,7 @@ package org.springframework.web.servlet.tags; */ public class HtmlEscapeTagOutsideDispatcherServletTests extends HtmlEscapeTagTests { + @Override protected boolean inDispatcherServlet() { return false; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java index 51820dc8394..f33101a3b85 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java @@ -37,6 +37,7 @@ public class HtmlEscapeTagTests extends AbstractTagTests { tag.setPageContext(pc); tag.doStartTag(); HtmlEscapingAwareTag testTag = new HtmlEscapingAwareTag() { + @Override public int doStartTagInternal() throws Exception { return EVAL_BODY_INCLUDE; } @@ -113,9 +114,11 @@ public class HtmlEscapeTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer result = new StringBuffer(); EscapeBodyTag tag = new EscapeBodyTag() { + @Override protected String readBodyContent() { return "test text"; } + @Override protected void writeBodyContent(String content) { result.append(content); } @@ -131,9 +134,11 @@ public class HtmlEscapeTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer result = new StringBuffer(); EscapeBodyTag tag = new EscapeBodyTag() { + @Override protected String readBodyContent() { return "test & text"; } + @Override protected void writeBodyContent(String content) { result.append(content); } @@ -150,9 +155,11 @@ public class HtmlEscapeTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer result = new StringBuffer(); EscapeBodyTag tag = new EscapeBodyTag() { + @Override protected String readBodyContent() { return "' test & text \\"; } + @Override protected void writeBodyContent(String content) { result.append(content); } @@ -169,9 +176,11 @@ public class HtmlEscapeTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer result = new StringBuffer(); EscapeBodyTag tag = new EscapeBodyTag() { + @Override protected String readBodyContent() { return "' test & text \\"; } + @Override protected void writeBodyContent(String content) { result.append(content); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java index d2205f8fcc0..8148682f0f8 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java @@ -22,6 +22,7 @@ package org.springframework.web.servlet.tags; */ public class MessageTagOutsideDispatcherServletTests extends MessageTagTests { + @Override protected boolean inDispatcherServlet() { return false; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java index 8e737c22578..8aa294af9ac 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java @@ -43,6 +43,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -58,6 +59,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -74,6 +76,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -91,6 +94,7 @@ public class MessageTagTests extends AbstractTagTests { request.addPreferredLocale(Locale.CANADA); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -108,6 +112,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -123,6 +128,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -139,6 +145,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -155,6 +162,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -172,6 +180,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -188,6 +197,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -204,6 +214,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -221,6 +232,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -239,6 +251,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -256,6 +269,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -274,6 +288,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -290,6 +305,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -307,6 +323,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -323,6 +340,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -341,6 +359,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } @@ -357,6 +376,7 @@ public class MessageTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); MessageTag tag = new MessageTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java index cbd498112e3..bff2b1eef95 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java @@ -97,6 +97,7 @@ public class ParamTagTests extends AbstractTagTests { private Param param; + @Override public void addParam(Param param) { this.param = param; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java index fc92aeaa46c..9beea85f112 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java @@ -40,6 +40,7 @@ public class ThemeTagTests extends AbstractTagTests { PageContext pc = createPageContext(); final StringBuffer message = new StringBuffer(); ThemeTag tag = new ThemeTag() { + @Override protected void writeMessage(String msg) { message.append(msg); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java index 4d9df5c6481..e380397ed48 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java @@ -31,12 +31,14 @@ public abstract class AbstractFormTagTests extends AbstractHtmlElementTagTests { private FormTag formTag = new FormTag(); + @Override protected void extendRequest(MockHttpServletRequest request) { request.setAttribute(COMMAND_NAME, createTestBean()); } protected abstract TestBean createTestBean(); + @Override protected void extendPageContext(MockPageContext pageContext) throws JspException { this.formTag.setCommandName(COMMAND_NAME); this.formTag.setAction("myAction"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java index e101be304be..a114680a942 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTagTests.java @@ -53,6 +53,7 @@ public abstract class AbstractHtmlElementTagTests extends AbstractTagTests { private MockPageContext pageContext; + @Override protected final void setUp() throws Exception { // set up a writer for the tag content to be written to this.writer = new StringWriter(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java index 431f85d03d2..ebe0e344a27 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java @@ -29,6 +29,7 @@ public class ButtonTagTests extends AbstractFormTagTests { private ButtonTag tag; + @Override protected void onSetUp() { this.tag = createTag(getWriter()); this.tag.setParent(getFormTag()); @@ -82,6 +83,7 @@ public class ButtonTagTests extends AbstractFormTagTests { @SuppressWarnings("serial") protected ButtonTag createTag(final Writer writer) { return new ButtonTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(writer); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java index 1ac1ea619e3..77e0a6fa315 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java @@ -50,9 +50,11 @@ public class CheckboxTagTests extends AbstractFormTagTests { private TestBean bean; + @Override @SuppressWarnings("serial") protected void onSetUp() { this.tag = new CheckboxTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } @@ -636,6 +638,7 @@ public class CheckboxTagTests extends AbstractFormTagTests { return cal.getTime(); } + @Override protected TestBean createTestBean() { List colours = new ArrayList(); colours.add(Colour.BLUE); @@ -678,6 +681,7 @@ public class CheckboxTagTests extends AbstractFormTagTests { super(false); } + @Override public void setAsText(String text) { this.count++; super.setAsText(text); @@ -689,6 +693,7 @@ public class CheckboxTagTests extends AbstractFormTagTests { public int count = 0; + @Override public void setAsText(String text) { this.count++; setValue(new Integer(text.trim())); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java index 96bae8946cc..b0baea78846 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java @@ -59,9 +59,11 @@ public class CheckboxesTagTests extends AbstractFormTagTests { private TestBean bean; + @Override @SuppressWarnings("serial") protected void onSetUp() { this.tag = new CheckboxesTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } @@ -426,9 +428,11 @@ public class CheckboxesTagTests extends AbstractFormTagTests { BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(this.bean, COMMAND_NAME); FormattingConversionService cs = new FormattingConversionService(); cs.addFormatterForFieldType(String.class, new Formatter() { + @Override public String print(String object, Locale locale) { return object; } + @Override public String parse(String text, Locale locale) throws ParseException { return text.trim(); } @@ -728,6 +732,7 @@ public class CheckboxesTagTests extends AbstractFormTagTests { return cal.getTime(); } + @Override protected TestBean createTestBean() { List colours = new ArrayList(); colours.add(Colour.BLUE); @@ -770,6 +775,7 @@ public class CheckboxesTagTests extends AbstractFormTagTests { super(false); } + @Override public void setAsText(String text) { super.setAsText(text); this.allProcessedValues.add(getValue()); @@ -779,10 +785,12 @@ public class CheckboxesTagTests extends AbstractFormTagTests { private static class MyLowerCaseEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(text.toLowerCase()); } + @Override public String getAsText() { return ObjectUtils.nullSafeToString(getValue()).toUpperCase(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java index 90cdd281d20..6e11e063319 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java @@ -48,9 +48,11 @@ public class ErrorsTagTests extends AbstractFormTagTests { private ErrorsTag tag; + @Override @SuppressWarnings("serial") protected void onSetUp() { this.tag = new ErrorsTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } @@ -60,6 +62,7 @@ public class ErrorsTagTests extends AbstractFormTagTests { this.tag.setPageContext(getPageContext()); } + @Override protected TestBean createTestBean() { return new TestBean(); } @@ -434,6 +437,7 @@ public class ErrorsTagTests extends AbstractFormTagTests { assertTrue(output.contains("field error")); } + @Override protected void exposeBindingResult(Errors errors) { // wrap errors in a Model Map model = new HashMap(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java index f8023dffb23..3bd879a1eac 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java @@ -47,9 +47,11 @@ public class FormTagTests extends AbstractHtmlElementTagTests { private MockHttpServletRequest request; + @Override @SuppressWarnings("serial") protected void onSetUp() { this.tag = new FormTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java index 4058788ffd9..26828da7bd3 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java @@ -31,9 +31,11 @@ public class HiddenInputTagTests extends AbstractFormTagTests { private TestBean bean; + @Override @SuppressWarnings("serial") protected void onSetUp() { this.tag = new HiddenInputTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } @@ -120,6 +122,7 @@ public class HiddenInputTagTests extends AbstractFormTagTests { assertTrue(output.startsWith("")); } + @Override protected void extendRequest(MockHttpServletRequest request) { TestBean bean = new TestBean(); bean.setName("foo"); @@ -520,10 +529,12 @@ public class OptionTagTests extends AbstractHtmlElementTagTests { private static class TestBeanPropertyEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean(text + "k", 123)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } @@ -589,10 +600,12 @@ public class OptionTagTests extends AbstractHtmlElementTagTests { public class RulesVariantEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(RulesVariant.fromId(text)); } + @Override public String getAsText() { RulesVariant rulesVariant = (RulesVariant) getValue(); return rulesVariant.toId(); @@ -602,11 +615,13 @@ public class OptionTagTests extends AbstractHtmlElementTagTests { private static class FriendEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new TestBean(text)); } + @Override public String getAsText() { return ((TestBean) getValue()).getName(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java index accbc09cf4d..92290c23cc9 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java @@ -54,17 +54,21 @@ public final class OptionsTagTests extends AbstractHtmlElementTagTests { private SelectTag selectTag; private OptionsTag tag; + @Override @SuppressWarnings("serial") protected void onSetUp() { this.tag = new OptionsTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } }; selectTag = new SelectTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } + @Override public String getName() { // Should not be used other than to delegate to // RequestDataValueDataProcessor @@ -276,6 +280,7 @@ public final class OptionsTagTests extends AbstractHtmlElementTagTests { assertEquals(value2, rootElement.selectSingleNode("option[@selected]")); } + @Override protected void extendRequest(MockHttpServletRequest request) { TestBean bean = new TestBean(); bean.setName("foo"); @@ -295,6 +300,7 @@ public final class OptionsTagTests extends AbstractHtmlElementTagTests { request.setAttribute("floats", floats); } + @Override protected void exposeBindingResult(Errors errors) { // wrap errors in a Model Map model = new HashMap(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java index 242135cb760..50485dec42b 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java @@ -78,6 +78,7 @@ public class PasswordInputTagTests extends InputTagTests { assertValueAttribute(output, ""); } + @Override public void testDynamicTypeAttribute() throws JspException { try { this.getTag().setDynamicAttribute(null, "type", "email"); @@ -88,6 +89,7 @@ public class PasswordInputTagTests extends InputTagTests { } } + @Override protected void assertValueAttribute(String output, String expectedValue) { if (this.getPasswordTag().isShowPassword()) { super.assertValueAttribute(output, expectedValue); @@ -96,13 +98,16 @@ public class PasswordInputTagTests extends InputTagTests { } } + @Override protected String getType() { return "password"; } + @Override @SuppressWarnings("serial") protected InputTag createTag(final Writer writer) { return new PasswordInputTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(writer); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java index 2c372aa6da0..12652ed2e6a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java @@ -43,9 +43,11 @@ public class RadioButtonTagTests extends AbstractFormTagTests { private TestBean bean; + @Override @SuppressWarnings("serial") protected void onSetUp() { this.tag = new RadioButtonTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } @@ -251,6 +253,7 @@ public class RadioButtonTagTests extends AbstractFormTagTests { return new Float("12.99"); } + @Override protected TestBean createTestBean() { this.bean = new TestBean(); bean.setSex("M"); @@ -262,10 +265,12 @@ public class RadioButtonTagTests extends AbstractFormTagTests { private static class MyFloatEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(text.substring(1)); } + @Override public String getAsText() { return "F" + getValue(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java index 8ac60397714..de6e902eb2a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java @@ -53,9 +53,11 @@ public final class RadioButtonsTagTests extends AbstractFormTagTests { private TestBean bean; + @Override @SuppressWarnings("serial") protected void onSetUp() { this.tag = new RadioButtonsTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } @@ -582,6 +584,7 @@ public final class RadioButtonsTagTests extends AbstractFormTagTests { return cal.getTime(); } + @Override protected TestBean createTestBean() { List colours = new ArrayList(); colours.add(Colour.BLUE); @@ -619,6 +622,7 @@ public final class RadioButtonsTagTests extends AbstractFormTagTests { super(false); } + @Override public void setAsText(String text) { super.setAsText(text); this.allProcessedValues.add(getValue()); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java index dc9b9404e2a..8786a091fae 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java @@ -64,9 +64,11 @@ public class SelectTagTests extends AbstractFormTagTests { private TestBeanWithRealCountry bean; + @Override @SuppressWarnings("serial") protected void onSetUp() { this.tag = new SelectTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } @@ -175,9 +177,11 @@ public class SelectTagTests extends AbstractFormTagTests { this.tag.setItems("${countries}"); BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(getTestBean(), "testBean"); bindingResult.getPropertyAccessor().registerCustomEditor(Country.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(Country.getCountryWithIsoCode(text)); } + @Override public String getAsText() { return ((Country) getValue()).getName(); } @@ -203,9 +207,11 @@ public class SelectTagTests extends AbstractFormTagTests { this.tag.setItemLabel("name"); BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(getTestBean(), "testBean"); bindingResult.getPropertyAccessor().registerCustomEditor(Country.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(Country.getCountryWithIsoCode(text)); } + @Override public String getAsText() { return ((Country) getValue()).getName(); } @@ -230,6 +236,7 @@ public class SelectTagTests extends AbstractFormTagTests { testBean.setBean(withCountry); BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(testBean , "testBean"); bindingResult.getPropertyAccessor().registerCustomEditor(Country.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { if (text==null || text.length()==0) { setValue(null); @@ -237,6 +244,7 @@ public class SelectTagTests extends AbstractFormTagTests { } setValue(Country.getCountryWithIsoCode(text)); } + @Override public String getAsText() { Country value = (Country) getValue(); if (value==null) { @@ -263,9 +271,11 @@ public class SelectTagTests extends AbstractFormTagTests { testBean.setBean(getTestBean()); BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(testBean , "testBean"); bindingResult.getPropertyAccessor().registerCustomEditor(Country.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(Country.getCountryWithIsoCode(text)); } + @Override public String getAsText() { return ((Country) getValue()).getName(); } @@ -287,9 +297,11 @@ public class SelectTagTests extends AbstractFormTagTests { testBean.setRealCountry(null); BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(testBean, "testBean"); bindingResult.getPropertyAccessor().registerCustomEditor(Country.class, new PropertyEditorSupport() { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(Country.getCountryWithIsoCode(text)); } + @Override public String getAsText() { Country value = (Country) getValue(); if (value==null) { @@ -470,9 +482,11 @@ public class SelectTagTests extends AbstractFormTagTests { BeanPropertyBindingResult errors = new BeanPropertyBindingResult(this.bean, COMMAND_NAME); FormattingConversionService cs = new FormattingConversionService(); cs.addFormatterForFieldType(Country.class, new Formatter() { + @Override public String print(Country object, Locale locale) { return object.getName(); } + @Override public Country parse(String text, Locale locale) throws ParseException { return new Country(text, text); } @@ -515,9 +529,11 @@ public class SelectTagTests extends AbstractFormTagTests { BeanPropertyBindingResult errors = new BeanPropertyBindingResult(this.bean, COMMAND_NAME); FormattingConversionService cs = new FormattingConversionService(); cs.addFormatterForFieldType(Country.class, new Formatter() { + @Override public String print(Country object, Locale locale) { return object.getName(); } + @Override public Country parse(String text, Locale locale) throws ParseException { return new Country(text, text); } @@ -563,6 +579,7 @@ public class SelectTagTests extends AbstractFormTagTests { BeanPropertyBindingResult errors = new BeanPropertyBindingResult(this.bean, COMMAND_NAME); errors.getPropertyAccessor().registerCustomEditor(List.class, new CustomCollectionEditor(LinkedList.class) { + @Override public String getAsText() { return getValue().toString(); } @@ -671,10 +688,12 @@ public class SelectTagTests extends AbstractFormTagTests { BeanPropertyBindingResult bindingResult = new BeanPropertyBindingResult(getTestBean(), COMMAND_NAME); bindingResult.getPropertyAccessor().registerCustomEditor(Country.class, new PropertyEditorSupport() { + @Override public void setAsText(final String text) throws IllegalArgumentException { setValue(Country.getCountryWithIsoCode(text)); } + @Override public String getAsText() { return ((Country) getValue()).getIsoCode(); } @@ -772,6 +791,7 @@ public class SelectTagTests extends AbstractFormTagTests { private Map getCountryToLocaleMap() { Map map = new TreeMap(new Comparator() { + @Override public int compare(Object o1, Object o2) { return ((Country)o1).getName().compareTo(((Country)o2).getName()); } @@ -793,6 +813,7 @@ public class SelectTagTests extends AbstractFormTagTests { return sexes; } + @Override protected void extendRequest(MockHttpServletRequest request) { super.extendRequest(request); request.setAttribute("countries", Country.getCountries()); @@ -834,6 +855,7 @@ public class SelectTagTests extends AbstractFormTagTests { } } + @Override protected TestBean createTestBean() { this.bean = new TestBeanWithRealCountry(); this.bean.setName("Rob"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java index 075ea9e0114..127656b9789 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java @@ -24,10 +24,12 @@ import java.beans.PropertyEditorSupport; */ class SimpleFloatEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(new Float(text)); } + @Override public String getAsText() { return getValue() + "f"; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java index 965bd06a41f..82de492c307 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java @@ -31,6 +31,7 @@ public class TagWriterTests extends TestCase { private StringWriter data; + @Override protected void setUp() throws Exception { this.data = new StringWriter(); this.writer = new TagWriter(this.data); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java index 44521f112d9..2fc7c3100e8 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java @@ -33,9 +33,11 @@ public class TextareaTagTests extends AbstractFormTagTests { private TestBean rob; + @Override @SuppressWarnings("serial") protected void onSetUp() { this.tag = new TextareaTag() { + @Override protected TagWriter createTagWriter() { return new TagWriter(getWriter()); } @@ -110,6 +112,7 @@ public class TextareaTagTests extends AbstractFormTagTests { assertBlockTagContains(output, "12.34f"); } + @Override protected TestBean createTestBean() { // set up test data this.rob = new TestBean(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java index d3e02cc7c28..289fcbf064c 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java @@ -309,6 +309,7 @@ public class BaseViewTests extends TestCase { */ private class ConcreteView extends AbstractView { // Do-nothing concrete subclass + @Override protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { throw new UnsupportedOperationException(); @@ -330,6 +331,7 @@ public class BaseViewTests extends TestCase { this.wac = wac; } + @Override protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { // do nothing @@ -338,6 +340,7 @@ public class BaseViewTests extends TestCase { /** * @see org.springframework.context.support.ApplicationObjectSupport#initApplicationContext() */ + @Override protected void initApplicationContext() throws ApplicationContextException { if (inited) throw new RuntimeException("Already initialized"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java index 46d34e7b335..e46aa5449e5 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/InternalResourceViewTests.java @@ -73,6 +73,7 @@ public class InternalResourceViewTests extends TestCase { InternalResourceView view = new InternalResourceView(); view.setUrl(url); view.setServletContext(new MockServletContext() { + @Override public int getMinorVersion() { return 4; } @@ -118,6 +119,7 @@ public class InternalResourceViewTests extends TestCase { InternalResourceView view = new InternalResourceView(); view.setUrl(url); view.setServletContext(new MockServletContext() { + @Override public int getMinorVersion() { return 4; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java index 1695bd0c540..56feded2d67 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java @@ -21,6 +21,7 @@ package org.springframework.web.servlet.view; */ public class ResourceBundleViewResolverNoCacheTests extends ResourceBundleViewResolverTests { + @Override protected boolean getCache() { return false; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java index 117063f7af5..b100a6a68eb 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverTests.java @@ -46,6 +46,7 @@ public class ResourceBundleViewResolverTests extends TestCase { private StaticWebApplicationContext wac; + @Override protected void setUp() throws Exception { rb = new ResourceBundleViewResolver(); rb.setBasename(PROPS_FILE); @@ -170,9 +171,11 @@ public class ResourceBundleViewResolverTests extends TestCase { } } + @Override protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) { } + @Override protected void initApplicationContext() { ++initCount; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java index 286f628e22f..fadc6063737 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java @@ -249,8 +249,10 @@ public class ViewResolverTests { vr.setApplicationContext(wac); MockHttpServletRequest request = new MockHttpServletRequest(sc) { + @Override public RequestDispatcher getRequestDispatcher(String path) { return new MockRequestDispatcher(path) { + @Override public void forward(ServletRequest forwardRequest, ServletResponse forwardResponse) { assertTrue("Correct rc attribute", forwardRequest.getAttribute("rc") == null); assertEquals("value1", forwardRequest.getAttribute("key1")); @@ -287,8 +289,10 @@ public class ViewResolverTests { vr.setApplicationContext(wac); MockHttpServletRequest request = new MockHttpServletRequest(sc) { + @Override public RequestDispatcher getRequestDispatcher(String path) { return new MockRequestDispatcher(path) { + @Override public void forward(ServletRequest forwardRequest, ServletResponse forwardResponse) { assertTrue("Correct rc attribute", forwardRequest.getAttribute("rc") == null); assertEquals("value1", forwardRequest.getAttribute("key1")); @@ -432,6 +436,7 @@ public class ViewResolverTests { @Test public void testXmlViewResolverDefaultLocation() { StaticWebApplicationContext wac = new StaticWebApplicationContext() { + @Override protected Resource getResourceByPath(String path) { assertTrue("Correct default location", XmlViewResolver.DEFAULT_LOCATION.equals(path)); return super.getResourceByPath(path); @@ -453,6 +458,7 @@ public class ViewResolverTests { @Test public void testXmlViewResolverWithoutCache() throws Exception { StaticWebApplicationContext wac = new StaticWebApplicationContext() { + @Override protected Resource getResourceByPath(String path) { assertTrue("Correct default location", XmlViewResolver.DEFAULT_LOCATION.equals(path)); return super.getResourceByPath(path); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java index 5f44339cbde..62ba99fb7bf 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java @@ -57,6 +57,7 @@ public class ExcelViewTests extends TestCase { private MockHttpServletResponse response; private StaticWebApplicationContext webAppCtx; + @Override public void setUp() { servletCtx = new MockServletContext("org/springframework/web/servlet/view/document"); request = new MockHttpServletRequest(servletCtx); @@ -67,6 +68,7 @@ public class ExcelViewTests extends TestCase { public void testExcel() throws Exception { AbstractExcelView excelView = new AbstractExcelView() { + @Override protected void buildExcelDocument(Map model, HSSFWorkbook wb, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -101,6 +103,7 @@ public class ExcelViewTests extends TestCase { newDummyLocaleResolver("nl", "nl")); AbstractExcelView excelView = new AbstractExcelView() { + @Override protected void buildExcelDocument(Map model, HSSFWorkbook wb, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -135,6 +138,7 @@ public class ExcelViewTests extends TestCase { newDummyLocaleResolver("en", "US")); AbstractExcelView excelView = new AbstractExcelView() { + @Override protected void buildExcelDocument(Map model, HSSFWorkbook wb, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -169,6 +173,7 @@ public class ExcelViewTests extends TestCase { newDummyLocaleResolver("de", "")); AbstractExcelView excelView = new AbstractExcelView() { + @Override protected void buildExcelDocument(Map model, HSSFWorkbook wb, HttpServletRequest request, HttpServletResponse response) throws Exception { @@ -200,6 +205,7 @@ public class ExcelViewTests extends TestCase { public void testJExcel() throws Exception { AbstractJExcelView excelView = new AbstractJExcelView() { + @Override protected void buildExcelDocument(Map model, WritableWorkbook wb, HttpServletRequest request, @@ -229,6 +235,7 @@ public class ExcelViewTests extends TestCase { newDummyLocaleResolver("nl", "nl")); AbstractJExcelView excelView = new AbstractJExcelView() { + @Override protected void buildExcelDocument(Map model, WritableWorkbook wb, HttpServletRequest request, @@ -259,6 +266,7 @@ public class ExcelViewTests extends TestCase { newDummyLocaleResolver("en", "US")); AbstractJExcelView excelView = new AbstractJExcelView() { + @Override protected void buildExcelDocument(Map model, WritableWorkbook wb, HttpServletRequest request, @@ -289,6 +297,7 @@ public class ExcelViewTests extends TestCase { newDummyLocaleResolver("de", "")); AbstractJExcelView excelView = new AbstractJExcelView() { + @Override protected void buildExcelDocument(Map model, WritableWorkbook wb, HttpServletRequest request, @@ -316,10 +325,12 @@ public class ExcelViewTests extends TestCase { private LocaleResolver newDummyLocaleResolver(final String lang, final String country) { return new LocaleResolver() { + @Override public Locale resolveLocale(HttpServletRequest request) { return new Locale(lang, country); } + @Override public void setLocale(HttpServletRequest request, HttpServletResponse response, Locale locale) { // not supported! diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/PdfViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/PdfViewTests.java index c0b9938bb5a..933b8e0129e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/PdfViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/PdfViewTests.java @@ -44,6 +44,7 @@ public class PdfViewTests extends TestCase { MockHttpServletResponse response = new MockHttpServletResponse(); AbstractPdfView pdfView = new AbstractPdfView() { + @Override protected void buildPdfDocument(Map model, Document document, PdfWriter writer, HttpServletRequest request, HttpServletResponse response) throws Exception { document.add(new Paragraph(text)); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java index 8da83022c48..8b49f3ba55f 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java @@ -85,12 +85,14 @@ public class FreeMarkerConfigurerTests extends TestCase { settings.setProperty("localized_lookup", "false"); fcfb.setFreemarkerSettings(settings); fcfb.setResourceLoader(new ResourceLoader() { + @Override public Resource getResource(String location) { if (!("file:/mydir".equals(location) || "file:/mydir/test".equals(location))) { throw new IllegalArgumentException(location); } return new ByteArrayResource("test".getBytes(), "test"); } + @Override public ClassLoader getClassLoader() { return getClass().getClassLoader(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java index d3a6bfab40a..ff233b9be2f 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerViewTests.java @@ -202,9 +202,11 @@ public class FreeMarkerViewTests { private class TestConfiguration extends Configuration { + @Override public Template getTemplate(String name, final Locale locale) throws IOException { if (name.equals("templateName") || name.equals("prefix_test_suffix")) { return new Template(name, new StringReader("test")) { + @Override public void process(Object model, Writer writer) throws TemplateException, IOException { assertEquals(Locale.US, locale); assertTrue(model instanceof AllHttpScopesHashModel); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsTests.java index 5638a35db6c..f78a5f1b022 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsTests.java @@ -54,6 +54,7 @@ public abstract class AbstractJasperReportsTests extends TestCase { protected MockHttpServletResponse response; + @Override public void setUp() { request = new MockHttpServletRequest(); response = new MockHttpServletResponse(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsViewTests.java index a4a9fb610a6..5350f159999 100755 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/AbstractJasperReportsViewTests.java @@ -411,10 +411,12 @@ public abstract class AbstractJasperReportsViewTests extends AbstractJasperRepor super(clazz); } + @Override public JRDataSource create(JasperReport jasperReport) throws JRException { return new JRBeanCollectionDataSource(getData()); } + @Override public void dispose(JRDataSource jrDataSource) throws JRException { } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithStreamTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithStreamTests.java index 85ce6ff5ffc..046d3cfc55e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithStreamTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithStreamTests.java @@ -23,6 +23,7 @@ import net.sf.jasperreports.engine.export.JRHtmlExporter; */ public class ConfigurableJasperReportsViewWithStreamTests extends AbstractConfigurableJasperReportsViewTests { + @Override protected AbstractJasperReportsView getViewImplementation() { ConfigurableJasperReportsView view = new ConfigurableJasperReportsView(); view.setExporterClass(JRHtmlExporter.class); @@ -31,6 +32,7 @@ public class ConfigurableJasperReportsViewWithStreamTests extends AbstractConfig return view; } + @Override protected String getDesiredContentType() { return "application/pdf"; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithWriterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithWriterTests.java index e35f3e93a88..349f455f3e2 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithWriterTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithWriterTests.java @@ -23,6 +23,7 @@ import net.sf.jasperreports.engine.export.JRPdfExporter; */ public class ConfigurableJasperReportsViewWithWriterTests extends AbstractConfigurableJasperReportsViewTests { + @Override protected AbstractJasperReportsView getViewImplementation() { ConfigurableJasperReportsView view = new ConfigurableJasperReportsView(); view.setExporterClass(JRPdfExporter.class); @@ -31,6 +32,7 @@ public class ConfigurableJasperReportsViewWithWriterTests extends AbstractConfig return view; } + @Override protected String getDesiredContentType() { return "text/html"; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ExporterParameterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ExporterParameterTests.java index 18e25e2cd8c..0cd2f131f29 100755 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ExporterParameterTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ExporterParameterTests.java @@ -41,6 +41,7 @@ public class ExporterParameterTests extends AbstractJasperReportsTests { params.put("net.sf.jasperreports.engine.export.JRHtmlExporterParameter.IMAGES_URI", "/foo/bar"); AbstractJasperReportsView view = new AbstractJasperReportsView() { + @Override protected void renderReport(JasperPrint filledReport, Map model, HttpServletResponse response) throws Exception { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java index 2200bd3f6f8..09cb2aa70be 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java @@ -21,10 +21,12 @@ package org.springframework.web.servlet.view.jasperreports; */ public class JasperReportsCsvViewTests extends AbstractJasperReportsViewTests { + @Override protected AbstractJasperReportsView getViewImplementation() { return new JasperReportsCsvView(); } + @Override protected String getDesiredContentType() { return "text/csv"; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlViewTests.java index 0c38a3b2a8c..88d83e4fcb1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlViewTests.java @@ -30,10 +30,12 @@ import org.springframework.web.servlet.DispatcherServlet; */ public class JasperReportsHtmlViewTests extends AbstractJasperReportsViewTests { + @Override protected AbstractJasperReportsView getViewImplementation() { return new JasperReportsHtmlView(); } + @Override protected String getDesiredContentType() { return "text/html"; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewTests.java index e91dc32e572..093afd7853d 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewTests.java @@ -29,6 +29,7 @@ import net.sf.jasperreports.engine.JasperPrint; */ public class JasperReportsMultiFormatViewTests extends AbstractJasperReportsViewTests { + @Override protected void extendModel(Map model) { model.put(getDiscriminatorKey(), "csv"); } @@ -48,6 +49,7 @@ public class JasperReportsMultiFormatViewTests extends AbstractJasperReportsView assertEquals("Invalid content type", "text/html", response.getContentType()); } + @Override public void testOverrideContentDisposition() throws Exception { if (!canCompileReport) { return; @@ -101,10 +103,12 @@ public class JasperReportsMultiFormatViewTests extends AbstractJasperReportsView return "format"; } + @Override protected AbstractJasperReportsView getViewImplementation() { return new JasperReportsMultiFormatView(); } + @Override protected String getDesiredContentType() { return "text/csv"; } @@ -121,6 +125,7 @@ public class JasperReportsMultiFormatViewTests extends AbstractJasperReportsView public static final String TEST_PARAM = "net.sf.jasperreports.engine.export.JRHtmlExporterParameter.IMAGES_URI"; + @Override protected void renderReport(JasperPrint filledReport, Map parameters, HttpServletResponse response) { assertNotNull("Exporter parameters are null", getExporterParameters()); assertEquals("Incorrect number of exporter parameters", 1, getExporterParameters().size()); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewWithCustomMappingsTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewWithCustomMappingsTests.java index 3bb3b30bd04..b7b1e9ebea3 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewWithCustomMappingsTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewWithCustomMappingsTests.java @@ -25,6 +25,7 @@ import java.util.Map; */ public class JasperReportsMultiFormatViewWithCustomMappingsTests extends JasperReportsMultiFormatViewTests { + @Override protected AbstractJasperReportsView getViewImplementation() { JasperReportsMultiFormatView view = new JasperReportsMultiFormatView(); view.setFormatKey("fmt"); @@ -37,10 +38,12 @@ public class JasperReportsMultiFormatViewWithCustomMappingsTests extends JasperR return view; } + @Override protected String getDiscriminatorKey() { return "fmt"; } + @Override protected void extendModel(Map model) { model.put(getDiscriminatorKey(), "comma-separated"); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java index 84060185caf..6fbf2076b63 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java @@ -21,10 +21,12 @@ package org.springframework.web.servlet.view.jasperreports; */ public class JasperReportsPdfViewTests extends AbstractJasperReportsViewTests { + @Override protected AbstractJasperReportsView getViewImplementation() { return new JasperReportsPdfView(); } + @Override protected String getDesiredContentType() { return "application/pdf"; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java index af86756cb43..2f09e9bf0f2 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java @@ -21,10 +21,12 @@ package org.springframework.web.servlet.view.jasperreports; */ public class JasperReportsXlsViewTests extends AbstractJasperReportsViewTests { + @Override protected AbstractJasperReportsView getViewImplementation() { return new JasperReportsXlsView(); } + @Override protected String getDesiredContentType() { return "application/vnd.ms-excel"; } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java index 401c914230a..92f0b4c4bf9 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java @@ -44,6 +44,7 @@ public class TestVelocityEngine extends VelocityEngine { } + @Override public Template getTemplate(String name) throws ResourceNotFoundException { Template template = (Template) this.templates.get(name); if (template == null) { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java index af090a253bc..bf51bed1c78 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java @@ -87,6 +87,7 @@ public class VelocityConfigurerTests extends TestCase { VelocityEngineFactoryBean vefb = new VelocityEngineFactoryBean(); vefb.setResourceLoaderPath("file:/mydir"); vefb.setResourceLoader(new ResourceLoader() { + @Override public Resource getResource(String location) { if (location.equals("file:/mydir") || location.equals("file:/mydir/test")) { return new ByteArrayResource("test".getBytes(), "test"); @@ -98,6 +99,7 @@ public class VelocityConfigurerTests extends TestCase { throw new IllegalArgumentException(ex.toString()); } } + @Override public ClassLoader getClassLoader() { return getClass().getClassLoader(); } @@ -133,12 +135,14 @@ public class VelocityConfigurerTests extends TestCase { VelocityConfigurer vc = new VelocityConfigurer(); vc.setResourceLoaderPath("file:/mydir,file:/yourdir"); vc.setResourceLoader(new ResourceLoader() { + @Override public Resource getResource(String location) { if ("file:/yourdir/test".equals(location)) { return new DescriptiveResource(""); } return new ByteArrayResource("test".getBytes(), "test"); } + @Override public ClassLoader getClassLoader() { return getClass().getClassLoader(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java index fb265453d98..3ed42765505 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java @@ -57,12 +57,14 @@ public class VelocityMacroTests extends TestCase { private MockHttpServletResponse response; + @Override public void setUp() throws Exception { wac = new StaticWebApplicationContext(); wac.setServletContext(new MockServletContext()); final Template expectedTemplate = new Template(); VelocityConfig vc = new VelocityConfig() { + @Override public VelocityEngine getVelocityEngine() { return new TestVelocityEngine(TEMPLATE_FILE, expectedTemplate); } @@ -79,6 +81,7 @@ public class VelocityMacroTests extends TestCase { public void testExposeSpringMacroHelpers() throws Exception { VelocityView vv = new VelocityView() { + @Override protected void mergeTemplate(Template template, Context context, HttpServletResponse response) { assertTrue(context.get(VelocityView.SPRING_MACRO_REQUEST_CONTEXT_ATTRIBUTE) instanceof RequestContext); RequestContext rc = (RequestContext) context.get(VelocityView.SPRING_MACRO_REQUEST_CONTEXT_ATTRIBUTE); @@ -100,6 +103,7 @@ public class VelocityMacroTests extends TestCase { final String helperTool = "wrongType"; VelocityView vv = new VelocityView() { + @Override protected void mergeTemplate(Template template, Context context, HttpServletResponse response) { fail(); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java index 97dc0cb787e..43f3d5d5cc1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java @@ -64,6 +64,7 @@ public class VelocityRenderTests { final Template expectedTemplate = new Template(); VelocityConfig vc = new VelocityConfig() { + @Override public VelocityEngine getVelocityEngine() { return new TestVelocityEngine("test.vm", expectedTemplate); } @@ -106,9 +107,11 @@ public class VelocityRenderTests { thrown.expect(NestedServletException.class); thrown.expect(new TypeSafeMatcher() { + @Override public boolean matchesSafely(Exception item) { return item.getCause() instanceof MethodInvocationException; } + @Override public void describeTo(Description description) { description.appendText("exception has cause of MethodInvocationException"); @@ -138,9 +141,11 @@ public class VelocityRenderTests { thrown.expect(NestedServletException.class); thrown.expect(new TypeSafeMatcher() { + @Override public boolean matchesSafely(Exception item) { return item.getCause() instanceof IOException; } + @Override public void describeTo(Description description) { description.appendText("exception has cause of IOException"); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityToolboxViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityToolboxViewTests.java index 5bf06837bf0..4cdf72c4b36 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityToolboxViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityToolboxViewTests.java @@ -39,6 +39,7 @@ public class VelocityToolboxViewTests { wac.setServletContext(new MockServletContext()); final Template expectedTemplate = new Template(); VelocityConfig vc = new VelocityConfig() { + @Override public VelocityEngine getVelocityEngine() { return new TestVelocityEngine(templateName, expectedTemplate); } @@ -49,6 +50,7 @@ public class VelocityToolboxViewTests { final HttpServletResponse expectedResponse = new MockHttpServletResponse(); VelocityToolboxView vv = new VelocityToolboxView() { + @Override protected void mergeTemplate(Template template, Context context, HttpServletResponse response) throws Exception { assertTrue(template == expectedTemplate); assertTrue(response == expectedResponse); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewResolverTests.java index d8a43ebf481..e17f0b00878 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewResolverTests.java @@ -24,6 +24,7 @@ public class VelocityViewResolverTests { @Test public void testVelocityViewResolver() throws Exception { VelocityConfig vc = new VelocityConfig() { + @Override public VelocityEngine getVelocityEngine() { return new TestVelocityEngine("prefix_test_suffix", new Template()); } @@ -57,6 +58,7 @@ public class VelocityViewResolverTests { @Test public void testVelocityViewResolverWithToolbox() throws Exception { VelocityConfig vc = new VelocityConfig() { + @Override public VelocityEngine getVelocityEngine() { return new TestVelocityEngine("prefix_test_suffix", new Template()); } @@ -83,6 +85,7 @@ public class VelocityViewResolverTests { @Test public void testVelocityViewResolverWithToolboxSubclass() throws Exception { VelocityConfig vc = new VelocityConfig() { + @Override public VelocityEngine getVelocityEngine() { TestVelocityEngine ve = new TestVelocityEngine(); ve.addTemplate("prefix_test_suffix", new Template()); @@ -113,6 +116,7 @@ public class VelocityViewResolverTests { @Test public void testVelocityLayoutViewResolver() throws Exception { VelocityConfig vc = new VelocityConfig() { + @Override public VelocityEngine getVelocityEngine() { TestVelocityEngine ve = new TestVelocityEngine(); ve.addTemplate("prefix_test_suffix", new Template()); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java index 916e1f2fb1b..ac1a396f659 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityViewTests.java @@ -137,6 +137,7 @@ public class VelocityViewTests { final Template expectedTemplate = new Template(); VelocityConfig vc = new VelocityConfig() { + @Override public VelocityEngine getVelocityEngine() { return new TestVelocityEngine(templateName, expectedTemplate); } @@ -157,6 +158,7 @@ public class VelocityViewTests { final HttpServletResponse expectedResponse = new MockHttpServletResponse(); VelocityView vv = new VelocityView() { + @Override protected void mergeTemplate(Template template, Context context, HttpServletResponse response) throws Exception { assertTrue(template == expectedTemplate); assertTrue(context.getKeys().length >= 1); @@ -194,6 +196,7 @@ public class VelocityViewTests { final Template expectedTemplate = new Template(); VelocityConfig vc = new VelocityConfig() { + @Override public VelocityEngine getVelocityEngine() { return new TestVelocityEngine(templateName, expectedTemplate); } @@ -215,10 +218,12 @@ public class VelocityViewTests { expectedResponse.setContentType("myContentType"); VelocityView vv = new VelocityView() { + @Override protected void mergeTemplate(Template template, Context context, HttpServletResponse response) { assertTrue(template == expectedTemplate); assertTrue(response == expectedResponse); } + @Override protected void exposeHelpers(Map model, HttpServletRequest request) throws Exception { model.put("myHelper", "myValue"); } @@ -244,6 +249,7 @@ public class VelocityViewTests { final Template expectedTemplate = new Template(); VelocityConfig vc = new VelocityConfig() { + @Override public VelocityEngine getVelocityEngine() { return new TestVelocityEngine(templateName, expectedTemplate); } @@ -268,6 +274,7 @@ public class VelocityViewTests { final HttpServletResponse expectedResponse = new MockHttpServletResponse(); VelocityView vv = new VelocityView() { + @Override protected void mergeTemplate(Template template, Context context, HttpServletResponse response) throws Exception { assertTrue(template == expectedTemplate); assertTrue(response == expectedResponse); @@ -284,6 +291,7 @@ public class VelocityViewTests { assertTrue(numberTool.getLocale().equals(Locale.CANADA)); } + @Override protected void exposeHelpers(Map model, HttpServletRequest request) throws Exception { model.put("myHelper", "myValue"); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java index 2b96a0c3e39..43cbba5a779 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java @@ -63,6 +63,7 @@ public class TestXsltViewTests extends TestCase { private int fatal = 0; + @Override public void setUp() { this.view = new TestXsltView(); } @@ -80,12 +81,15 @@ public class TestXsltViewTests extends TestCase { public void testCustomErrorListener() { view.setErrorListener(new ErrorListener() { + @Override public void warning(TransformerException ex) { incWarnings(); } + @Override public void error(TransformerException ex) { incErrors(); } + @Override public void fatalError(TransformerException ex) { incFatals(); } @@ -110,6 +114,7 @@ public class TestXsltViewTests extends TestCase { MockHttpServletResponse response = new MockHttpServletResponse(); AbstractXsltView view = new AbstractXsltView() { + @Override protected Source createXsltSource(Map model, String root, HttpServletRequest request, HttpServletResponse response) throws Exception { Hero hero = (Hero) model.get("hero"); Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); @@ -136,6 +141,7 @@ public class TestXsltViewTests extends TestCase { MockHttpServletResponse response = new MockHttpServletResponse(); AbstractXsltView view = new AbstractXsltView() { + @Override protected Source createXsltSource(Map model, String root, HttpServletRequest request, HttpServletResponse response) throws Exception { Hero hero = (Hero) model.get("hero"); Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); @@ -163,6 +169,7 @@ public class TestXsltViewTests extends TestCase { MockHttpServletResponse response = new MockHttpServletResponse(); AbstractXsltView view = new AbstractXsltView() { + @Override protected Map getParameters(HttpServletRequest request) { Map parameters = new HashMap(); parameters.put("sex", "Male"); @@ -195,6 +202,7 @@ public class TestXsltViewTests extends TestCase { response.setWriterAccessAllowed(false); AbstractXsltView view = new AbstractXsltView() { + @Override protected Map getParameters(HttpServletRequest request) { Map parameters = new HashMap(); parameters.put("sex", "Male"); @@ -221,6 +229,7 @@ public class TestXsltViewTests extends TestCase { MockHttpServletResponse response = new MockHttpServletResponse(); AbstractXsltView view = new AbstractXsltView() { + @Override protected Map getParameters(HttpServletRequest request) { Map parameters = new HashMap(); parameters.put("sex", "Male"); @@ -256,6 +265,7 @@ public class TestXsltViewTests extends TestCase { response.setOutputStreamAccessAllowed(false); AbstractXsltView view = new AbstractXsltView() { + @Override protected Source createXsltSource(Map model, String root, HttpServletRequest request, HttpServletResponse response) throws Exception { Hero hero = (Hero) model.get("hero"); Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); @@ -265,11 +275,13 @@ public class TestXsltViewTests extends TestCase { node.setAttribute("catchphrase", hero.getCatchphrase()); return new DOMSource(node); } + @Override protected Map getParameters(HttpServletRequest request) { Map parameters = new HashMap(); parameters.put("sex", "Male"); return parameters; } + @Override protected boolean useWriter() { return true; } @@ -299,6 +311,7 @@ public class TestXsltViewTests extends TestCase { MockHttpServletResponse response = new MockHttpServletResponse(); AbstractXsltView view = new AbstractXsltView() { + @Override protected Source createXsltSource( Map model, String rootName, HttpServletRequest request, HttpServletResponse response) throws Exception { diff --git a/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java index 7b2f7d94a42..93a34f14666 100644 --- a/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java +++ b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java @@ -207,6 +207,7 @@ class NeverMatchAdvisor extends StaticMethodMatcherPointcutAdvisor { /** * @see org.springframework.aop.MethodMatcher#matches(java.lang.reflect.Method, java.lang.Class) */ + @Override public boolean matches(Method m, Class targetClass) { return false; } @@ -249,10 +250,12 @@ class OrderedTxCheckAdvisor extends StaticMethodMatcherPointcutAdvisor implement return (CountingBeforeAdvice) getAdvice(); } + @Override public void afterPropertiesSet() throws Exception { setAdvice(new TxCountingBeforeAdvice()); } + @Override public boolean matches(Method method, Class targetClass) { return method.getName().startsWith("setAge"); } @@ -260,6 +263,7 @@ class OrderedTxCheckAdvisor extends StaticMethodMatcherPointcutAdvisor implement private class TxCountingBeforeAdvice extends CountingBeforeAdvice { + @Override public void before(Method method, Object[] args, Object target) throws Throwable { // do transaction checks if (requireTransactionContext) { @@ -323,21 +327,25 @@ class CallCountingTransactionManager extends AbstractPlatformTransactionManager public int rollbacks; public int inflight; + @Override protected Object doGetTransaction() { return new Object(); } + @Override protected void doBegin(Object transaction, TransactionDefinition definition) { this.lastDefinition = definition; ++begun; ++inflight; } + @Override protected void doCommit(DefaultTransactionStatus status) { ++commits; --inflight; } + @Override protected void doRollback(DefaultTransactionStatus status) { ++rollbacks; --inflight; diff --git a/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java b/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java index b209a01d545..01155d3f3b1 100644 --- a/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java +++ b/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java @@ -121,6 +121,7 @@ public class EnableCachingIntegrationTests { @Repository static class DummyFooRepository implements FooRepository { + @Override @Cacheable("primary") public List findAll() { return Collections.emptyList(); diff --git a/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java b/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java index c1d74a88d26..89964f2e850 100644 --- a/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java +++ b/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java @@ -300,6 +300,7 @@ public class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); scanner.setIncludeAnnotationConfig(false); scanner.setScopeMetadataResolver(new ScopeMetadataResolver() { + @Override public ScopeMetadata resolveScopeMetadata(BeanDefinition definition) { ScopeMetadata metadata = new ScopeMetadata(); if (definition instanceof AnnotatedBeanDefinition) { @@ -345,8 +346,10 @@ public class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests { private String name = DEFAULT_NAME; + @Override public String getName() { return this.name; } + @Override public void setName(String name) { this.name = name; } } diff --git a/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java b/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java index dab551d075d..9ee6eb4a8cf 100644 --- a/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java +++ b/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java @@ -284,6 +284,7 @@ public class ClassPathBeanDefinitionScannerScopeIntegrationTests { ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context); scanner.setIncludeAnnotationConfig(false); scanner.setBeanNameGenerator(new BeanNameGenerator() { + @Override public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) { return definition.getScope(); } @@ -311,8 +312,10 @@ public class ClassPathBeanDefinitionScannerScopeIntegrationTests { private String name = DEFAULT_NAME; + @Override public String getName() { return this.name; } + @Override public void setName(String name) { this.name = name; } } diff --git a/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java b/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java index c4da57a4f82..ee65521d4d1 100644 --- a/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java +++ b/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java @@ -656,6 +656,7 @@ public class EnvironmentIntegrationTests { public Environment environment; + @Override public void setEnvironment(Environment environment) { this.environment = environment; } diff --git a/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java b/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java index 032ab7c6fbf..e095fd1e568 100644 --- a/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java +++ b/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java @@ -57,6 +57,7 @@ class BeanFactoryTypeConverter implements TypeConverter, BeanFactoryAware { this.conversionService = conversionService; } + @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { if (beanFactory instanceof ConfigurableBeanFactory) { Object typeConverter = ((ConfigurableBeanFactory) beanFactory).getTypeConverter(); @@ -80,6 +81,7 @@ class BeanFactoryTypeConverter implements TypeConverter, BeanFactoryAware { return delegate.findCustomEditor(targetType, null) != null || delegate.getDefaultEditor(targetType) != null; } + @Override public boolean canConvert(TypeDescriptor sourceTypeDescriptor, TypeDescriptor targetTypeDescriptor) { if (conversionService.canConvert(sourceTypeDescriptor, targetTypeDescriptor)) { return true; @@ -90,6 +92,7 @@ class BeanFactoryTypeConverter implements TypeConverter, BeanFactoryAware { return canConvert(sourceType, targetType); } + @Override public Object convertValue(Object value, TypeDescriptor sourceType, TypeDescriptor targetType) { if (targetType.getType() == Void.class || targetType.getType() == Void.TYPE) { return null; diff --git a/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java b/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java index 2970b5f0aa6..eb715261ea0 100644 --- a/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java +++ b/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java @@ -153,6 +153,7 @@ public class ScheduledAndTransactionalAnnotationIntegrationTests { this.count.incrementAndGet(); } + @Override public int getInvocationCount() { return this.count.get(); } @@ -168,12 +169,14 @@ public class ScheduledAndTransactionalAnnotationIntegrationTests { private final AtomicInteger count = new AtomicInteger(0); + @Override @Transactional @Scheduled(fixedDelay = 5) public void scheduled() { this.count.incrementAndGet(); } + @Override public int getInvocationCount() { return this.count.get(); } diff --git a/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java index 4b5aaa39de1..943a9e1e1b5 100644 --- a/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java +++ b/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java @@ -33,21 +33,25 @@ public class CallCountingTransactionManager extends AbstractPlatformTransactionM public int rollbacks; public int inflight; + @Override protected Object doGetTransaction() { return new Object(); } + @Override protected void doBegin(Object transaction, TransactionDefinition definition) { this.lastDefinition = definition; ++begun; ++inflight; } + @Override protected void doCommit(DefaultTransactionStatus status) { ++commits; --inflight; } + @Override protected void doRollback(DefaultTransactionStatus status) { ++rollbacks; --inflight; diff --git a/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java b/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java index 6391a5328e3..ced09c321ff 100644 --- a/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java +++ b/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java @@ -219,6 +219,7 @@ public class EnableTransactionManagementIntegrationTests { return new CallCountingTransactionManager(); } + @Override public PlatformTransactionManager annotationDrivenTransactionManager() { return txManager1(); } @@ -327,6 +328,7 @@ public class EnableTransactionManagementIntegrationTests { public void setDataSource(DataSource dataSource) { } + @Override @Transactional public List findAll() { return Collections.emptyList(); @@ -336,6 +338,7 @@ public class EnableTransactionManagementIntegrationTests { @Repository static class DummyFooRepository implements FooRepository { + @Override @Transactional public List findAll() { return Collections.emptyList(); diff --git a/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java b/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java index 076f73b84c1..26bc6fdb192 100644 --- a/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java +++ b/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java @@ -115,10 +115,12 @@ interface AnnotatedService { } class NonAnnotatedServiceImpl implements AnnotatedService { + @Override public void m() { } } class AnnotatedServiceImpl implements NonAnnotatedService { + @Override @Transactional public void m() { } } diff --git a/src/test/java/test/advice/CountingAfterReturningAdvice.java b/src/test/java/test/advice/CountingAfterReturningAdvice.java index 2e9aaa5a15b..fe373ecc7e8 100644 --- a/src/test/java/test/advice/CountingAfterReturningAdvice.java +++ b/src/test/java/test/advice/CountingAfterReturningAdvice.java @@ -28,6 +28,7 @@ import org.springframework.aop.AfterReturningAdvice; @SuppressWarnings("serial") public class CountingAfterReturningAdvice extends MethodCounter implements AfterReturningAdvice { + @Override public void afterReturning(Object o, Method m, Object[] args, Object target) throws Throwable { count(m); } diff --git a/src/test/java/test/advice/CountingBeforeAdvice.java b/src/test/java/test/advice/CountingBeforeAdvice.java index 3dc49faf24f..89fc45aeb5e 100644 --- a/src/test/java/test/advice/CountingBeforeAdvice.java +++ b/src/test/java/test/advice/CountingBeforeAdvice.java @@ -28,6 +28,7 @@ import org.springframework.aop.MethodBeforeAdvice; @SuppressWarnings("serial") public class CountingBeforeAdvice extends MethodCounter implements MethodBeforeAdvice { + @Override public void before(Method m, Object[] args, Object target) throws Throwable { count(m); } diff --git a/src/test/java/test/beans/NestedTestBean.java b/src/test/java/test/beans/NestedTestBean.java index b0f9df9d9b6..610931b50c8 100644 --- a/src/test/java/test/beans/NestedTestBean.java +++ b/src/test/java/test/beans/NestedTestBean.java @@ -37,6 +37,7 @@ public class NestedTestBean implements INestedTestBean { this.company = (company != null ? company : ""); } + @Override public String getCompany() { return company; } diff --git a/src/test/java/test/beans/TestBean.java b/src/test/java/test/beans/TestBean.java index 2c42a8cca50..d237316c8a3 100644 --- a/src/test/java/test/beans/TestBean.java +++ b/src/test/java/test/beans/TestBean.java @@ -137,6 +137,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } + @Override public void setBeanName(String beanName) { this.beanName = beanName; } @@ -145,6 +146,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return beanName; } + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,10 +163,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return postProcessed; } + @Override public String getName() { return name; } + @Override public void setName(String name) { this.name = name; } @@ -180,10 +184,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt } } + @Override public int getAge() { return age; } + @Override public void setAge(int age) { this.age = age; } @@ -196,14 +202,17 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.jedi = jedi; } + @Override public ITestBean getSpouse() { return (spouses != null ? spouses[0] : null); } + @Override public void setSpouse(ITestBean spouse) { this.spouses = new ITestBean[] {spouse}; } + @Override public ITestBean[] getSpouses() { return spouses; } @@ -230,10 +239,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.country = country; } + @Override public String[] getStringArray() { return stringArray; } + @Override public void setStringArray(String[] stringArray) { this.stringArray = stringArray; } @@ -302,6 +313,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someProperties = someProperties; } + @Override public INestedTestBean getDoctor() { return doctor; } @@ -310,6 +322,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.doctor = doctor; } + @Override public INestedTestBean getLawyer() { return lawyer; } @@ -342,6 +355,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt this.someBoolean = someBoolean; } + @Override public IndexedTestBean getNestedIndexedBean() { return nestedIndexedBean; } @@ -370,18 +384,21 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see ITestBean#exceptional(Throwable) */ + @Override public void exceptional(Throwable t) throws Throwable { if (t != null) { throw t; } } + @Override public void unreliableFileOperation() throws IOException { throw new IOException(); } /** * @see ITestBean#returnsThis() */ + @Override public Object returnsThis() { return this; } @@ -389,9 +406,11 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt /** * @see IOther#absquatulate() */ + @Override public void absquatulate() { } + @Override public int haveBirthday() { return age++; } @@ -421,6 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt return this.age; } + @Override public int compareTo(Object other) { if (this.name != null && other instanceof TestBean) { return this.name.compareTo(((TestBean) other).getName()); diff --git a/src/test/java/test/interceptor/NopInterceptor.java b/src/test/java/test/interceptor/NopInterceptor.java index 79158e74ea4..ccda8189944 100644 --- a/src/test/java/test/interceptor/NopInterceptor.java +++ b/src/test/java/test/interceptor/NopInterceptor.java @@ -32,6 +32,7 @@ public class NopInterceptor implements MethodInterceptor { /** * @see org.aopalliance.intercept.MethodInterceptor#invoke(MethodInvocation) */ + @Override public Object invoke(MethodInvocation invocation) throws Throwable { increment(); return invocation.proceed(); diff --git a/src/test/java/test/interceptor/SerializableNopInterceptor.java b/src/test/java/test/interceptor/SerializableNopInterceptor.java index c7b2acf82fa..f33e0d1e1b4 100644 --- a/src/test/java/test/interceptor/SerializableNopInterceptor.java +++ b/src/test/java/test/interceptor/SerializableNopInterceptor.java @@ -35,10 +35,12 @@ public class SerializableNopInterceptor extends NopInterceptor implements Serial */ private int count; + @Override public int getCount() { return this.count; } + @Override protected void increment() { ++count; } From d66c733ef49d75c141989ff19a5fdf070a82fa25 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 19 Dec 2012 14:45:29 -0800 Subject: [PATCH 03/34] Replace EasyMock with Mockito in test sources Issue: SPR-10126 --- build.gradle | 14 +- .../adapter/ThrowsAdviceInterceptorTests.java | 39 +- .../CustomizableTraceInterceptorTests.java | 74 +- .../interceptor/DebugInterceptorTests.java | 38 +- .../PerformanceMonitorInterceptorTests.java | 36 +- .../SimpleTraceInterceptorTests.java | 44 +- .../aop/scope/DefaultScopedObjectTests.java | 9 +- ...elegatingIntroductionInterceptorTests.java | 24 +- .../config/CustomScopeConfigurerTests.java | 10 +- ...ObjectFactoryCreatingFactoryBeanTests.java | 11 +- .../ServiceLocatorFactoryBeanTests.java | 8 +- .../parsing/FailFastProblemReporterTests.java | 11 +- .../support/BeanFactoryGenericsTests.java | 13 +- .../wiring/BeanConfigurerSupportTests.java | 35 +- .../scheduling/quartz/QuartzSupportTests.java | 217 +- .../aop/aspectj/AfterAdviceBindingTests.java | 29 +- .../AfterReturningAdviceBindingTests.java | 57 +- .../AfterThrowingAdviceBindingTests.java | 38 +- .../aop/aspectj/AroundAdviceBindingTests.java | 21 +- .../aop/aspectj/BeforeAdviceBindingTests.java | 25 +- .../MethodLocatingFactoryBeanTests.java | 46 +- .../aop/framework/JdkDynamicProxyTests.java | 12 +- .../ContextBeanFactoryReferenceTests.java | 10 +- .../EnableLoadTimeWeavingTests.java | 38 +- .../event/ApplicationContextEventTests.java | 23 +- .../EventPublicationInterceptorTests.java | 10 +- .../LocalSlsbInvokerInterceptorTests.java | 51 +- ...StatelessSessionProxyFactoryBeanTests.java | 37 +- ...mpleRemoteSlsbInvokerInterceptorTests.java | 118 +- ...StatelessSessionProxyFactoryBeanTests.java | 58 +- .../GlassFishLoadTimeWeaverTests.java | 270 +-- .../jndi/JndiObjectFactoryBeanTests.java | 14 +- .../jndi/JndiTemplateTests.java | 61 +- .../ScheduledExecutorFactoryBeanTests.java | 89 +- .../scripting/bsh/BshScriptFactoryTests.java | 15 +- .../groovy/GroovyScriptFactoryTests.java | 27 +- .../RefreshableScriptTargetSourceTests.java | 7 +- .../support/ResourceScriptSourceTests.java | 33 +- .../ScriptFactoryPostProcessorTests.java | 7 +- .../build/test/mockito/MockitoUtils.java | 88 + .../xml/AbstractStaxXMLReaderTestCase.java | 359 +-- .../util/xml/StaxEventXMLReaderTests.java | 24 +- .../util/xml/StaxStreamXMLReaderTests.java | 32 +- .../build/test/hamcrest/Matchers.java | 67 + .../jdbc/AbstractJdbcTests.java | 87 - .../jdbc/core/AbstractRowMapperTests.java | 322 +-- .../jdbc/core/BatchUpdateTestHelper.java | 112 - .../jdbc/core/BeanPropertyRowMapperTests.java | 139 +- .../jdbc/core/JdbcTemplateQueryTests.java | 1018 ++------- .../jdbc/core/JdbcTemplateTests.java | 2023 +++++------------ .../jdbc/core/RowMapperTests.java | 273 +-- .../jdbc/core/StatementCreatorUtilsTests.java | 219 +- .../NamedParameterJdbcTemplateTests.java | 629 ++--- .../namedparam/NamedParameterQueryTests.java | 651 ++---- .../core/simple/CallMetaDataContextTests.java | 99 +- ...rameterizedBeanPropertyRowMapperTests.java | 61 +- .../jdbc/core/simple/SimpleJdbcCallTests.java | 549 ++--- .../core/simple/SimpleJdbcInsertTests.java | 130 +- .../core/simple/SimpleJdbcTemplateTests.java | 653 ++---- .../simple/TableMetaDataContextTests.java | 279 +-- .../JdbcBeanDefinitionReaderTests.java | 67 +- .../core/support/JdbcDaoSupportTests.java | 18 +- .../jdbc/core/support/LobSupportTests.java | 133 +- .../jdbc/core/support/SqlLobValueTests.java | 237 +- .../DataSourceJtaTransactionTests.java | 643 ++---- .../DataSourceTransactionManagerTests.java | 1127 +++------ .../datasource/DelegatingDataSourceTest.java | 50 +- .../DriverManagerDataSourceTests.java | 47 +- ...UserCredentialsDataSourceAdapterTests.java | 58 +- .../init/DatabasePopulatorTests.java | 15 +- .../BeanFactoryDataSourceLookupTests.java | 27 +- .../jdbc/object/BatchSqlUpdateTests.java | 73 +- .../jdbc/object/GenericSqlQueryTests.java | 123 +- .../object/GenericStoredProcedureTests.java | 101 +- .../jdbc/object/SqlQueryTests.java | 1087 +++------ .../jdbc/object/SqlUpdateTests.java | 429 ++-- .../jdbc/object/StoredProcedureTests.java | 940 +++----- .../DataFieldMaxValueIncrementerTests.java | 218 +- .../jdbc/support/DefaultLobHandlerTests.java | 112 +- .../support/NativeJdbcExtractorTests.java | 88 +- .../support/SQLErrorCodesFactoryTests.java | 101 +- .../rowset/ResultSetWrappingRowSetTests.java | 99 +- 82 files changed, 4827 insertions(+), 10459 deletions(-) create mode 100644 spring-core/src/test/java/org/springframework/build/test/mockito/MockitoUtils.java create mode 100644 spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java delete mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java delete mode 100644 spring-jdbc/src/test/java/org/springframework/jdbc/core/BatchUpdateTestHelper.java diff --git a/build.gradle b/build.gradle index 5e996570c49..d01d0d701ba 100644 --- a/build.gradle +++ b/build.gradle @@ -74,7 +74,7 @@ configure(allprojects) { dependencies { testCompile("junit:junit:${junitVersion}") testCompile("org.hamcrest:hamcrest-all:1.3") - testCompile("org.easymock:easymock:${easymockVersion}") + testCompile("org.mockito:mockito-core:1.9.5") } ext.javadocLinks = [ @@ -100,6 +100,16 @@ configure(allprojects) { ] as String[] } +configure(allprojects.findAll{it.name in ["spring", "spring-jms", "spring-orm", + "spring-orm-hibernate4", "spring-oxm", "spring-struts", "spring-test", + "spring-test-mvc", "spring-tx", "spring-web", "spring-webmvc", + "spring-webmvc-portlet", "spring-webmvc-tiles3"]}) { + dependencies { + testCompile("org.easymock:easymock:${easymockVersion}") + testCompile "org.easymock:easymockclassextension:${easymockVersion}" + } +} + configure(subprojects) { subproject -> apply plugin: "merge" apply from: "${gradleScriptDir}/publish-maven.gradle" @@ -330,7 +340,6 @@ project("spring-tx") { optional("javax.resource:connector-api:1.5") optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1") optional("javax.ejb:ejb-api:3.0") - testCompile "org.easymock:easymockclassextension:${easymockVersion}" testCompile("javax.persistence:persistence-api:1.0") testCompile("org.aspectj:aspectjweaver:${aspectjVersion}") } @@ -678,7 +687,6 @@ project("spring-test-mvc") { testCompile("javax.activation:activation:1.1") testCompile("javax.mail:mail:1.4") testCompile("javax.xml.bind:jaxb-api:2.2.6") - testCompile("org.easymock:easymockclassextension:${easymockVersion}") testCompile("org.apache.tiles:tiles-request-api:1.0.1") testCompile("org.apache.tiles:tiles-api:3.0.1") testCompile("org.apache.tiles:tiles-core:3.0.1") { diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java index 1a245999d12..77707f16bc2 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java @@ -23,8 +23,10 @@ import java.rmi.RemoteException; import javax.transaction.TransactionRolledbackException; import org.aopalliance.intercept.MethodInvocation; -import static org.easymock.EasyMock.*; import static org.junit.Assert.*; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; + import org.junit.Test; import test.aop.MethodCounter; @@ -47,12 +49,10 @@ public final class ThrowsAdviceInterceptorTests { MyThrowsHandler th = new MyThrowsHandler(); ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th); Object ret = new Object(); - MethodInvocation mi = createMock(MethodInvocation.class); - expect(mi.proceed()).andReturn(ret); - replay(mi); + MethodInvocation mi = mock(MethodInvocation.class); + given(mi.proceed()).willReturn(ret); assertEquals(ret, ti.invoke(mi)); assertEquals(0, th.getCalls()); - verify(mi); } @Test @@ -61,9 +61,8 @@ public final class ThrowsAdviceInterceptorTests { ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th); assertEquals(2, ti.getHandlerMethodCount()); Exception ex = new Exception(); - MethodInvocation mi = createMock(MethodInvocation.class); - expect(mi.proceed()).andThrow(ex); - replay(mi); + MethodInvocation mi = mock(MethodInvocation.class); + given(mi.proceed()).willThrow(ex); try { ti.invoke(mi); fail(); @@ -72,7 +71,6 @@ public final class ThrowsAdviceInterceptorTests { assertEquals(ex, caught); } assertEquals(0, th.getCalls()); - verify(mi); } @Test @@ -80,12 +78,10 @@ public final class ThrowsAdviceInterceptorTests { MyThrowsHandler th = new MyThrowsHandler(); ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th); FileNotFoundException ex = new FileNotFoundException(); - MethodInvocation mi = createMock(MethodInvocation.class); - expect(mi.getMethod()).andReturn(Object.class.getMethod("hashCode", (Class[]) null)); - expect(mi.getArguments()).andReturn(null); - expect(mi.getThis()).andReturn(new Object()); - expect(mi.proceed()).andThrow(ex); - replay(mi); + MethodInvocation mi = mock(MethodInvocation.class); + given(mi.getMethod()).willReturn(Object.class.getMethod("hashCode", (Class[]) null)); + given(mi.getThis()).willReturn(new Object()); + given(mi.proceed()).willThrow(ex); try { ti.invoke(mi); fail(); @@ -95,7 +91,6 @@ public final class ThrowsAdviceInterceptorTests { } assertEquals(1, th.getCalls()); assertEquals(1, th.getCalls("ioException")); - verify(mi); } @Test @@ -104,9 +99,8 @@ public final class ThrowsAdviceInterceptorTests { ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th); // Extends RemoteException TransactionRolledbackException ex = new TransactionRolledbackException(); - MethodInvocation mi = createMock(MethodInvocation.class); - expect(mi.proceed()).andThrow(ex); - replay(mi); + MethodInvocation mi = mock(MethodInvocation.class); + given(mi.proceed()).willThrow(ex); try { ti.invoke(mi); fail(); @@ -116,7 +110,6 @@ public final class ThrowsAdviceInterceptorTests { } assertEquals(1, th.getCalls()); assertEquals(1, th.getCalls("remoteException")); - verify(mi); } @Test @@ -135,9 +128,8 @@ public final class ThrowsAdviceInterceptorTests { ThrowsAdviceInterceptor ti = new ThrowsAdviceInterceptor(th); // Extends RemoteException TransactionRolledbackException ex = new TransactionRolledbackException(); - MethodInvocation mi = createMock(MethodInvocation.class); - expect(mi.proceed()).andThrow(ex); - replay(mi); + MethodInvocation mi = mock(MethodInvocation.class); + given(mi.proceed()).willThrow(ex); try { ti.invoke(mi); fail(); @@ -147,7 +139,6 @@ public final class ThrowsAdviceInterceptorTests { } assertEquals(1, th.getCalls()); assertEquals(1, th.getCalls("remoteException")); - verify(mi); } @SuppressWarnings("serial") diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java index 14845cfd5ce..deceb5c2151 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java @@ -16,8 +16,13 @@ package org.springframework.aop.interceptor; -import static org.easymock.EasyMock.*; import static org.junit.Assert.*; +import static org.mockito.BDDMockito.given; +import static org.mockito.Matchers.anyString; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; import java.lang.reflect.Method; @@ -83,47 +88,32 @@ public final class CustomizableTraceInterceptorTests { @Test public void testSunnyDayPathLogsCorrectly() throws Throwable { - Log log = createMock(Log.class); - MethodInvocation methodInvocation = createMock(MethodInvocation.class); + MethodInvocation methodInvocation = mock(MethodInvocation.class); + given(methodInvocation.getMethod()).willReturn(String.class.getMethod("toString", new Class[]{})); + given(methodInvocation.getThis()).willReturn(this); - Method toString = String.class.getMethod("toString", new Class[]{}); - - expect(log.isTraceEnabled()).andReturn(true); - expect(methodInvocation.getMethod()).andReturn(toString).times(4); - expect(methodInvocation.getThis()).andReturn(this).times(2); - log.trace(isA(String.class)); - expect(methodInvocation.proceed()).andReturn(null); - log.trace(isA(String.class)); - - replay(methodInvocation); - replay(log); + Log log = mock(Log.class); + given(log.isTraceEnabled()).willReturn(true); CustomizableTraceInterceptor interceptor = new StubCustomizableTraceInterceptor(log); interceptor.invoke(methodInvocation); - verify(log); - verify(methodInvocation); + verify(log, times(2)).trace(anyString()); } @Test public void testExceptionPathLogsCorrectly() throws Throwable { - Log log = createMock(Log.class); - MethodInvocation methodInvocation = createMock(MethodInvocation.class); + MethodInvocation methodInvocation = mock(MethodInvocation.class); - Method toString = String.class.getMethod("toString", new Class[]{}); - - expect(log.isTraceEnabled()).andReturn(true); - expect(methodInvocation.getMethod()).andReturn(toString).times(4); - expect(methodInvocation.getThis()).andReturn(this).times(2); - log.trace(isA(String.class)); IllegalArgumentException exception = new IllegalArgumentException(); - expect(methodInvocation.proceed()).andThrow(exception); - log.trace(isA(String.class), eq(exception)); + given(methodInvocation.getMethod()).willReturn(String.class.getMethod("toString", new Class[]{})); + given(methodInvocation.getThis()).willReturn(this); + given(methodInvocation.proceed()).willThrow(exception); - replay(log); - replay(methodInvocation); + Log log = mock(Log.class); + given(log.isTraceEnabled()).willReturn(true); CustomizableTraceInterceptor interceptor = new StubCustomizableTraceInterceptor(log); try { @@ -133,29 +123,22 @@ public final class CustomizableTraceInterceptorTests { catch (IllegalArgumentException expected) { } - verify(log); - verify(methodInvocation); + verify(log).trace(anyString()); + verify(log).trace(anyString(), eq(exception)); } @Test public void testSunnyDayPathLogsCorrectlyWithPrettyMuchAllPlaceholdersMatching() throws Throwable { - Log log = createMock(Log.class); - - MethodInvocation methodInvocation = createMock(MethodInvocation.class); - Method toString = String.class.getMethod("toString", new Class[0]); - Object[] arguments = new Object[]{"$ One \\$", new Long(2)}; + MethodInvocation methodInvocation = mock(MethodInvocation.class); - expect(log.isTraceEnabled()).andReturn(true); - expect(methodInvocation.getMethod()).andReturn(toString).times(7); - expect(methodInvocation.getThis()).andReturn(this).times(2); - expect(methodInvocation.getArguments()).andReturn(arguments).times(2); - log.trace(isA(String.class)); - expect(methodInvocation.proceed()).andReturn("Hello!"); - log.trace(isA(String.class)); + given(methodInvocation.getMethod()).willReturn(String.class.getMethod("toString", new Class[0])); + given(methodInvocation.getThis()).willReturn(this); + given(methodInvocation.getArguments()).willReturn(new Object[]{"$ One \\$", new Long(2)}); + given(methodInvocation.proceed()).willReturn("Hello!"); - replay(methodInvocation); - replay(log); + Log log = mock(Log.class); + given(log.isTraceEnabled()).willReturn(true); CustomizableTraceInterceptor interceptor = new StubCustomizableTraceInterceptor(log); interceptor.setEnterMessage(new StringBuffer() @@ -174,8 +157,7 @@ public final class CustomizableTraceInterceptorTests { .append("' this long.").toString()); interceptor.invoke(methodInvocation); - verify(log); - verify(methodInvocation); + verify(log, times(2)).trace(anyString()); } diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java index 92908baac7c..d13c8e65125 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java @@ -16,8 +16,13 @@ package org.springframework.aop.interceptor; -import static org.easymock.EasyMock.*; import static org.junit.Assert.*; +import static org.mockito.BDDMockito.given; +import static org.mockito.Matchers.anyString; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; import org.aopalliance.intercept.MethodInvocation; import org.apache.commons.logging.Log; @@ -33,40 +38,29 @@ public final class DebugInterceptorTests { @Test public void testSunnyDayPathLogsCorrectly() throws Throwable { - Log log = createMock(Log.class); - MethodInvocation methodInvocation = createMock(MethodInvocation.class); + MethodInvocation methodInvocation = mock(MethodInvocation.class); - expect(log.isTraceEnabled()).andReturn(true); - log.trace(isA(String.class)); - expect(methodInvocation.proceed()).andReturn(null); - log.trace(isA(String.class)); - - replay(methodInvocation); - replay(log); + Log log = mock(Log.class); + given(log.isTraceEnabled()).willReturn(true); DebugInterceptor interceptor = new StubDebugInterceptor(log); interceptor.invoke(methodInvocation); checkCallCountTotal(interceptor); - verify(methodInvocation); - verify(log); + verify(log, times(2)).trace(anyString()); } @Test public void testExceptionPathStillLogsCorrectly() throws Throwable { - Log log = createMock(Log.class); - MethodInvocation methodInvocation = createMock(MethodInvocation.class); + MethodInvocation methodInvocation = mock(MethodInvocation.class); - expect(log.isTraceEnabled()).andReturn(true); - log.trace(isA(String.class)); IllegalArgumentException exception = new IllegalArgumentException(); - expect(methodInvocation.proceed()).andThrow(exception); - log.trace(isA(String.class), eq(exception)); + given(methodInvocation.proceed()).willThrow(exception); - replay(methodInvocation); - replay(log); + Log log = mock(Log.class); + given(log.isTraceEnabled()).willReturn(true); DebugInterceptor interceptor = new StubDebugInterceptor(log); try { @@ -76,8 +70,8 @@ public final class DebugInterceptorTests { } checkCallCountTotal(interceptor); - verify(methodInvocation); - verify(log); + verify(log).trace(anyString()); + verify(log).trace(anyString(), eq(exception)); } private void checkCallCountTotal(DebugInterceptor interceptor) { diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java index 5cc35f10ecb..c36ca5ba68d 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java @@ -16,10 +16,11 @@ package org.springframework.aop.interceptor; -import static org.easymock.EasyMock.*; import static org.junit.Assert.*; - -import java.lang.reflect.Method; +import static org.mockito.BDDMockito.given; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import org.aopalliance.intercept.MethodInvocation; import org.apache.commons.logging.Log; @@ -48,35 +49,24 @@ public final class PerformanceMonitorInterceptorTests { @Test public void testSunnyDayPathLogsPerformanceMetricsCorrectly() throws Throwable { - Log log = createMock(Log.class); - MethodInvocation mi = createMock(MethodInvocation.class); - - Method toString = String.class.getMethod("toString", new Class[0]); - - expect(mi.getMethod()).andReturn(toString); - expect(mi.proceed()).andReturn(null); - log.trace(isA(String.class)); + MethodInvocation mi = mock(MethodInvocation.class); + given(mi.getMethod()).willReturn(String.class.getMethod("toString", new Class[0])); - replay(mi, log); + Log log = mock(Log.class); PerformanceMonitorInterceptor interceptor = new PerformanceMonitorInterceptor(true); interceptor.invokeUnderTrace(mi, log); - verify(mi, log); + verify(log).trace(anyString()); } @Test public void testExceptionPathStillLogsPerformanceMetricsCorrectly() throws Throwable { - Log log = createMock(Log.class); - MethodInvocation mi = createMock(MethodInvocation.class); - - Method toString = String.class.getMethod("toString", new Class[0]); - - expect(mi.getMethod()).andReturn(toString); - expect(mi.proceed()).andThrow(new IllegalArgumentException()); - log.trace(isA(String.class)); + MethodInvocation mi = mock(MethodInvocation.class); - replay(mi, log); + given(mi.getMethod()).willReturn(String.class.getMethod("toString", new Class[0])); + given(mi.proceed()).willThrow(new IllegalArgumentException()); + Log log = mock(Log.class); PerformanceMonitorInterceptor interceptor = new PerformanceMonitorInterceptor(true); try { @@ -86,7 +76,7 @@ public final class PerformanceMonitorInterceptorTests { catch (IllegalArgumentException expected) { } - verify(mi, log); + verify(log).trace(anyString()); } } diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java index 7845f1268b6..6732be2f90a 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java @@ -16,8 +16,13 @@ package org.springframework.aop.interceptor; -import static org.easymock.EasyMock.*; import static org.junit.Assert.fail; +import static org.mockito.BDDMockito.given; +import static org.mockito.Matchers.anyString; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; import java.lang.reflect.Method; @@ -35,39 +40,27 @@ public final class SimpleTraceInterceptorTests { @Test public void testSunnyDayPathLogsCorrectly() throws Throwable { - Log log = createMock(Log.class); - MethodInvocation mi = createMock(MethodInvocation.class); + MethodInvocation mi = mock(MethodInvocation.class); + given(mi.getMethod()).willReturn(String.class.getMethod("toString", new Class[]{})); + given(mi.getThis()).willReturn(this); - Method toString = String.class.getMethod("toString", new Class[]{}); - - expect(mi.getMethod()).andReturn(toString); - expect(mi.getThis()).andReturn(this); - log.trace(isA(String.class)); - expect(mi.proceed()).andReturn(null); - log.trace(isA(String.class)); - - replay(mi, log); + Log log = mock(Log.class); SimpleTraceInterceptor interceptor = new SimpleTraceInterceptor(true); interceptor.invokeUnderTrace(mi, log); - verify(mi, log); + verify(log, times(2)).trace(anyString()); } + @Test public void testExceptionPathStillLogsCorrectly() throws Throwable { - Log log = createMock(Log.class); - MethodInvocation mi = createMock(MethodInvocation.class); - - Method toString = String.class.getMethod("toString", new Class[]{}); - - expect(mi.getMethod()).andReturn(toString); - expect(mi.getThis()).andReturn(this); - log.trace(isA(String.class)); + MethodInvocation mi = mock(MethodInvocation.class); + given(mi.getMethod()).willReturn(String.class.getMethod("toString", new Class[]{})); + given(mi.getThis()).willReturn(this); IllegalArgumentException exception = new IllegalArgumentException(); - expect(mi.proceed()).andThrow(exception); - log.trace(isA(String.class)); + given(mi.proceed()).willThrow(exception); - replay(mi, log); + Log log = mock(Log.class); final SimpleTraceInterceptor interceptor = new SimpleTraceInterceptor(true); @@ -77,7 +70,8 @@ public final class SimpleTraceInterceptorTests { } catch (IllegalArgumentException expected) { } - verify(mi, log); + verify(log).trace(anyString()); + verify(log).trace(anyString(), eq(exception)); } } diff --git a/spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java b/spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java index 80f62da86b7..d968e957edc 100644 --- a/spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java @@ -16,7 +16,7 @@ package org.springframework.aop.scope; -import static org.easymock.EasyMock.*; +import static org.mockito.Mockito.mock; import org.junit.Test; import org.springframework.beans.factory.config.ConfigurableBeanFactory; @@ -52,14 +52,9 @@ public final class DefaultScopedObjectTests { testBadTargetBeanName(" "); } - private static void testBadTargetBeanName(final String badTargetBeanName) { - ConfigurableBeanFactory factory = createMock(ConfigurableBeanFactory.class); - replay(factory); - + ConfigurableBeanFactory factory = mock(ConfigurableBeanFactory.class); new DefaultScopedObject(factory, badTargetBeanName); - - verify(factory); } } diff --git a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java index 65d58d61f89..cb812d668de 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java @@ -16,8 +16,9 @@ package org.springframework.aop.support; -import static org.easymock.EasyMock.*; import static org.junit.Assert.*; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; import java.io.Serializable; @@ -56,17 +57,14 @@ public final class DelegatingIntroductionInterceptorTests { assertTrue(! (raw instanceof TimeStamped)); ProxyFactory factory = new ProxyFactory(raw); - TimeStamped ts = createMock(TimeStamped.class); + TimeStamped ts = mock(TimeStamped.class); long timestamp = 111L; - expect(ts.getTimeStamp()).andReturn(timestamp); - replay(ts); + given(ts.getTimeStamp()).willReturn(timestamp); factory.addAdvisor(0, new DefaultIntroductionAdvisor(new DelegatingIntroductionInterceptor(ts))); TimeStamped tsp = (TimeStamped) factory.getProxy(); assertTrue(tsp.getTimeStamp() == timestamp); - - verify(ts); } @Test @@ -75,17 +73,14 @@ public final class DelegatingIntroductionInterceptorTests { assertTrue(! (raw instanceof SubTimeStamped)); ProxyFactory factory = new ProxyFactory(raw); - TimeStamped ts = createMock(SubTimeStamped.class); + TimeStamped ts = mock(SubTimeStamped.class); long timestamp = 111L; - expect(ts.getTimeStamp()).andReturn(timestamp); - replay(ts); + given(ts.getTimeStamp()).willReturn(timestamp); factory.addAdvisor(0, new DefaultIntroductionAdvisor(new DelegatingIntroductionInterceptor(ts), SubTimeStamped.class)); SubTimeStamped tsp = (SubTimeStamped) factory.getProxy(); assertTrue(tsp.getTimeStamp() == timestamp); - - verify(ts); } @Test @@ -94,18 +89,15 @@ public final class DelegatingIntroductionInterceptorTests { assertTrue(! (raw instanceof TimeStamped)); ProxyFactory factory = new ProxyFactory(raw); - TimeStamped ts = createMock(SubTimeStamped.class); + TimeStamped ts = mock(SubTimeStamped.class); long timestamp = 111L; - expect(ts.getTimeStamp()).andReturn(timestamp); - replay(ts); + given(ts.getTimeStamp()).willReturn(timestamp); factory.addAdvisor(0, new DefaultIntroductionAdvisor(new DelegatingIntroductionInterceptor(ts), TimeStamped.class)); TimeStamped tsp = (TimeStamped) factory.getProxy(); assertTrue(!(tsp instanceof SubTimeStamped)); assertTrue(tsp.getTimeStamp() == timestamp); - - verify(ts); } @Test diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java index 0e31d83c101..ba08ffe4bab 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java @@ -16,8 +16,8 @@ package org.springframework.beans.factory.config; -import static org.easymock.EasyMock.*; import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; import java.util.HashMap; import java.util.Map; @@ -45,24 +45,20 @@ public final class CustomScopeConfigurerTests { @Test public void testWithNoScopes() throws Exception { - Scope scope = createMock(Scope.class); - replay(scope); + Scope scope = mock(Scope.class); CustomScopeConfigurer figurer = new CustomScopeConfigurer(); figurer.postProcessBeanFactory(factory); - verify(scope); } @Test public void testSunnyDayWithBonaFideScopeInstance() throws Exception { - Scope scope = createMock(Scope.class); - replay(scope); + Scope scope = mock(Scope.class); factory.registerScope(FOO_SCOPE, scope); Map scopes = new HashMap(); scopes.put(FOO_SCOPE, scope); CustomScopeConfigurer figurer = new CustomScopeConfigurer(); figurer.setScopes(scopes); figurer.postProcessBeanFactory(factory); - verify(scope); } @Test diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java index e02b77f2a1d..88a6f09ef9e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java @@ -19,9 +19,11 @@ package org.springframework.beans.factory.config; import java.util.Date; import javax.inject.Provider; -import static org.easymock.EasyMock.*; import org.junit.After; import static org.junit.Assert.*; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; + import org.junit.Before; import org.junit.Test; import static test.util.TestResourceUtils.*; @@ -105,9 +107,8 @@ public class ObjectFactoryCreatingFactoryBeanTests { final String targetBeanName = "singleton"; final String expectedSingleton = "Alicia Keys"; - BeanFactory beanFactory = createMock(BeanFactory.class); - expect(beanFactory.getBean(targetBeanName)).andReturn(expectedSingleton); - replay(beanFactory); + BeanFactory beanFactory = mock(BeanFactory.class); + given(beanFactory.getBean(targetBeanName)).willReturn(expectedSingleton); ObjectFactoryCreatingFactoryBean factory = new ObjectFactoryCreatingFactoryBean(); factory.setTargetBeanName(targetBeanName); @@ -116,8 +117,6 @@ public class ObjectFactoryCreatingFactoryBeanTests { ObjectFactory objectFactory = factory.getObject(); Object actualSingleton = objectFactory.getObject(); assertSame(expectedSingleton, actualSingleton); - - verify(beanFactory); } @Test diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java index 115f618a00b..44e6abf05e1 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java @@ -16,8 +16,8 @@ package org.springframework.beans.factory.config; -import static org.easymock.EasyMock.*; import static org.junit.Assert.*; +import static org.mockito.Mockito.mock; import static org.springframework.beans.factory.support.BeanDefinitionBuilder.genericBeanDefinition; import org.junit.Before; @@ -269,17 +269,13 @@ public final class ServiceLocatorFactoryBeanTests { @Test public void testRequiresListableBeanFactoryAndChokesOnAnythingElse() throws Exception { - final BeanFactory beanFactory = createMock(BeanFactory.class); - replay(beanFactory); - + BeanFactory beanFactory = mock(BeanFactory.class); try { ServiceLocatorFactoryBean factory = new ServiceLocatorFactoryBean(); factory.setBeanFactory(beanFactory); } catch (FatalBeanException ex) { // expected } - - verify(beanFactory); } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java index 3ebe8ec705a..8907294f72e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java @@ -16,7 +16,10 @@ package org.springframework.beans.factory.parsing; -import static org.easymock.EasyMock.*; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.isA; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import org.apache.commons.logging.Log; import org.junit.Test; @@ -41,15 +44,13 @@ public final class FailFastProblemReporterTests { Problem problem = new Problem("VGER", new Location(new DescriptiveResource("here")), null, new IllegalArgumentException()); - Log log = createMock(Log.class); - log.warn(anyObject(), isA(IllegalArgumentException.class)); - replay(log); + Log log = mock(Log.class); FailFastProblemReporter reporter = new FailFastProblemReporter(); reporter.setLogger(log); reporter.warning(problem); - verify(log); + verify(log).warn(any(), isA(IllegalArgumentException.class)); } } diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java index 9a4612382ee..2849614541f 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java @@ -30,8 +30,9 @@ import java.util.Set; import static org.junit.Assert.*; -import org.easymock.EasyMock; import org.junit.Test; +import org.mockito.Mockito; + import test.beans.GenericBean; import test.beans.GenericIntegerBean; import test.beans.GenericSetOfIntegerBean; @@ -626,10 +627,10 @@ public class BeanFactoryGenericsTests { /** * Tests support for parameterized {@code factory-method} declarations such - * as EasyMock's {@code createMock()} method which has the following signature. + * as Mockito {@code mock()} method which has the following signature. * * 
{@code
-	 * public static  T createMock(Class toMock)
+	 * public static  T mock(Class classToMock)
 	 * }
* * See SPR-9493 @@ -637,12 +638,12 @@ public class BeanFactoryGenericsTests { */ @Test public void parameterizedFactoryMethod() { - RootBeanDefinition rbd = new RootBeanDefinition(EasyMock.class); - rbd.setFactoryMethodName("createMock"); + RootBeanDefinition rbd = new RootBeanDefinition(Mockito.class); + rbd.setFactoryMethodName("mock"); rbd.getConstructorArgumentValues().addGenericArgumentValue(Runnable.class); DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); - bf.registerBeanDefinition("easyMock", rbd); + bf.registerBeanDefinition("mock", rbd); Map beans = bf.getBeansOfType(Runnable.class); assertEquals(1, beans.size()); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java index 2a72cde7010..1567bad02f0 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java @@ -16,8 +16,10 @@ package org.springframework.beans.factory.wiring; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import junit.framework.TestCase; -import org.easymock.MockControl; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -32,31 +34,24 @@ import test.beans.TestBean; public class BeanConfigurerSupportTests extends TestCase { public void testSupplyIncompatibleBeanFactoryImplementation() throws Exception { - MockControl mock = MockControl.createControl(BeanFactory.class); - mock.replay(); try { - new StubBeanConfigurerSupport().setBeanFactory((BeanFactory) mock.getMock()); + new StubBeanConfigurerSupport().setBeanFactory(mock(BeanFactory.class)); fail("Must have thrown an IllegalArgumentException by this point (incompatible BeanFactory implementation supplied)"); } catch (IllegalArgumentException expected) { } - mock.verify(); } public void testConfigureBeanDoesNothingIfBeanWiringInfoResolverResolvesToNull() throws Exception { TestBean beanInstance = new TestBean(); - MockControl mock = MockControl.createControl(BeanWiringInfoResolver.class); - BeanWiringInfoResolver resolver = (BeanWiringInfoResolver) mock.getMock(); - resolver.resolveWiringInfo(beanInstance); - mock.setReturnValue(null); - mock.replay(); + BeanWiringInfoResolver resolver = mock(BeanWiringInfoResolver.class); BeanConfigurerSupport configurer = new StubBeanConfigurerSupport(); configurer.setBeanWiringInfoResolver(resolver); configurer.setBeanFactory(new DefaultListableBeanFactory()); configurer.configureBean(beanInstance); - mock.verify(); + verify(resolver).resolveWiringInfo(beanInstance); assertNull(beanInstance.getName()); } @@ -91,19 +86,14 @@ public class BeanConfigurerSupportTests extends TestCase { DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); factory.registerBeanDefinition("spouse", builder.getBeanDefinition()); - MockControl mock = MockControl.createControl(BeanWiringInfoResolver.class); - BeanWiringInfoResolver resolver = (BeanWiringInfoResolver) mock.getMock(); - resolver.resolveWiringInfo(beanInstance); - mock.setReturnValue(new BeanWiringInfo(BeanWiringInfo.AUTOWIRE_BY_NAME, false)); - mock.replay(); + BeanWiringInfoResolver resolver = mock(BeanWiringInfoResolver.class); + given(resolver.resolveWiringInfo(beanInstance)).willReturn(new BeanWiringInfo(BeanWiringInfo.AUTOWIRE_BY_NAME, false)); BeanConfigurerSupport configurer = new StubBeanConfigurerSupport(); configurer.setBeanFactory(factory); configurer.setBeanWiringInfoResolver(resolver); configurer.configureBean(beanInstance); assertEquals("Bean is evidently not being configured (for some reason)", "David Gavurin", beanInstance.getSpouse().getName()); - - mock.verify(); } public void testConfigureBeanPerformsAutowiringByTypeIfAppropriateBeanWiringInfoResolverIsPluggedIn() throws Exception { @@ -115,19 +105,14 @@ public class BeanConfigurerSupportTests extends TestCase { DefaultListableBeanFactory factory = new DefaultListableBeanFactory(); factory.registerBeanDefinition("Mmm, I fancy a salad!", builder.getBeanDefinition()); - MockControl mock = MockControl.createControl(BeanWiringInfoResolver.class); - BeanWiringInfoResolver resolver = (BeanWiringInfoResolver) mock.getMock(); - resolver.resolveWiringInfo(beanInstance); - mock.setReturnValue(new BeanWiringInfo(BeanWiringInfo.AUTOWIRE_BY_TYPE, false)); - mock.replay(); + BeanWiringInfoResolver resolver = mock(BeanWiringInfoResolver.class); + given(resolver.resolveWiringInfo(beanInstance)).willReturn(new BeanWiringInfo(BeanWiringInfo.AUTOWIRE_BY_TYPE, false)); BeanConfigurerSupport configurer = new StubBeanConfigurerSupport(); configurer.setBeanFactory(factory); configurer.setBeanWiringInfoResolver(resolver); configurer.configureBean(beanInstance); assertEquals("Bean is evidently not being configured (for some reason)", "David Gavurin", beanInstance.getSpouse().getName()); - - mock.verify(); } diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java index 3d78535c8b8..855bf686929 100644 --- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java +++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java @@ -21,6 +21,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import java.util.Arrays; import java.util.Date; @@ -30,7 +33,6 @@ import java.util.Map; import javax.sql.DataSource; -import org.easymock.MockControl; import org.junit.Test; import org.quartz.CronTrigger; import org.quartz.Job; @@ -127,31 +129,10 @@ public class QuartzSupportTests { trigger1.setRepeatInterval(20); trigger1.afterPropertiesSet(); - MockControl schedulerControl = MockControl.createControl(Scheduler.class); - final Scheduler scheduler = (Scheduler) schedulerControl.getMock(); - scheduler.getContext(); - schedulerControl.setReturnValue(new SchedulerContext()); - scheduler.getJobDetail("myJob0", Scheduler.DEFAULT_GROUP); - schedulerControl.setReturnValue(null); - scheduler.getJobDetail("myJob1", Scheduler.DEFAULT_GROUP); - schedulerControl.setReturnValue(null); - scheduler.getTrigger("myTrigger0", Scheduler.DEFAULT_GROUP); - schedulerControl.setReturnValue(null); - scheduler.getTrigger("myTrigger1", Scheduler.DEFAULT_GROUP); - schedulerControl.setReturnValue(null); - scheduler.addJob(jobDetail0, true); - schedulerControl.setVoidCallable(); - scheduler.scheduleJob(trigger0); - schedulerControl.setReturnValue(new Date()); - scheduler.addJob(jobDetail1, true); - schedulerControl.setVoidCallable(); - scheduler.scheduleJob(trigger1); - schedulerControl.setReturnValue(new Date()); - scheduler.start(); - schedulerControl.setVoidCallable(); - scheduler.shutdown(false); - schedulerControl.setVoidCallable(); - schedulerControl.replay(); + final Scheduler scheduler = mock(Scheduler.class); + given(scheduler.getContext()).willReturn(new SchedulerContext()); + given(scheduler.scheduleJob(trigger0)).willReturn(new Date()); + given(scheduler.scheduleJob(trigger1)).willReturn(new Date()); SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() { @Override @@ -175,7 +156,14 @@ public class QuartzSupportTests { schedulerFactoryBean.destroy(); } - schedulerControl.verify(); + verify(scheduler).getJobDetail("myJob0", Scheduler.DEFAULT_GROUP); + verify(scheduler).getJobDetail("myJob1", Scheduler.DEFAULT_GROUP); + verify(scheduler).getTrigger("myTrigger0", Scheduler.DEFAULT_GROUP); + verify(scheduler).getTrigger("myTrigger1", Scheduler.DEFAULT_GROUP); + verify(scheduler).addJob(jobDetail0, true); + verify(scheduler).addJob(jobDetail1, true); + verify(scheduler).start(); + verify(scheduler).shutdown(false); } @Test @@ -220,33 +208,11 @@ public class QuartzSupportTests { trigger1.setRepeatInterval(20); trigger1.afterPropertiesSet(); - MockControl schedulerControl = MockControl.createControl(Scheduler.class); - final Scheduler scheduler = (Scheduler) schedulerControl.getMock(); - scheduler.getContext(); - schedulerControl.setReturnValue(new SchedulerContext()); - scheduler.getTrigger("myTrigger0", Scheduler.DEFAULT_GROUP); - schedulerControl.setReturnValue(null); - scheduler.getTrigger("myTrigger1", Scheduler.DEFAULT_GROUP); - schedulerControl.setReturnValue(new SimpleTrigger()); - if (overwrite) { - scheduler.addJob(jobDetail1, true); - schedulerControl.setVoidCallable(); - scheduler.rescheduleJob("myTrigger1", Scheduler.DEFAULT_GROUP, trigger1); - schedulerControl.setReturnValue(new Date()); - } - else { - scheduler.getJobDetail("myJob0", Scheduler.DEFAULT_GROUP); - schedulerControl.setReturnValue(null); - } - scheduler.addJob(jobDetail0, true); - schedulerControl.setVoidCallable(); - scheduler.scheduleJob(trigger0); - schedulerControl.setReturnValue(new Date()); - scheduler.start(); - schedulerControl.setVoidCallable(); - scheduler.shutdown(false); - schedulerControl.setVoidCallable(); - schedulerControl.replay(); + final Scheduler scheduler = mock(Scheduler.class); + given(scheduler.getContext()).willReturn(new SchedulerContext()); + given(scheduler.rescheduleJob("myTrigger1", Scheduler.DEFAULT_GROUP, trigger1)).willReturn(new Date()); + given(scheduler.getTrigger("myTrigger1", Scheduler.DEFAULT_GROUP)).willReturn(new SimpleTrigger()); + given(scheduler.scheduleJob(trigger0)).willReturn(new Date()); SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() { @Override @@ -270,7 +236,18 @@ public class QuartzSupportTests { schedulerFactoryBean.destroy(); } - schedulerControl.verify(); + verify(scheduler).getTrigger("myTrigger0", Scheduler.DEFAULT_GROUP); + verify(scheduler).getTrigger("myTrigger1", Scheduler.DEFAULT_GROUP); + if (overwrite) { + verify(scheduler).addJob(jobDetail1, true); + verify(scheduler).rescheduleJob("myTrigger1", Scheduler.DEFAULT_GROUP, trigger1); + } + else { + verify(scheduler).getJobDetail("myJob0", Scheduler.DEFAULT_GROUP); + } + verify(scheduler).addJob(jobDetail0, true); + verify(scheduler).start(); + verify(scheduler).shutdown(false); } @Test @@ -315,37 +292,16 @@ public class QuartzSupportTests { trigger1.setRepeatInterval(20); trigger1.afterPropertiesSet(); - MockControl schedulerControl = MockControl.createControl(Scheduler.class); - final Scheduler scheduler = (Scheduler) schedulerControl.getMock(); - scheduler.getContext(); - schedulerControl.setReturnValue(new SchedulerContext()); - scheduler.getTrigger("myTrigger0", Scheduler.DEFAULT_GROUP); - schedulerControl.setReturnValue(null); - scheduler.getTrigger("myTrigger1", Scheduler.DEFAULT_GROUP); - schedulerControl.setReturnValue(new SimpleTrigger()); + final Scheduler scheduler = mock(Scheduler.class); + given(scheduler.getContext()).willReturn(new SchedulerContext()); + given(scheduler.getTrigger("myTrigger1", Scheduler.DEFAULT_GROUP)).willReturn(new SimpleTrigger()); if (overwrite) { - scheduler.addJob(jobDetail1, true); - schedulerControl.setVoidCallable(); - scheduler.rescheduleJob("myTrigger1", Scheduler.DEFAULT_GROUP, trigger1); - schedulerControl.setReturnValue(new Date()); + given(scheduler.rescheduleJob("myTrigger1", Scheduler.DEFAULT_GROUP, trigger1)).willReturn(new Date()); } - else { - scheduler.getJobDetail("myJob0", Scheduler.DEFAULT_GROUP); - schedulerControl.setReturnValue(null); - } - scheduler.addJob(jobDetail0, true); - schedulerControl.setVoidCallable(); - scheduler.scheduleJob(trigger0); - schedulerControl.setThrowable(new ObjectAlreadyExistsException("")); + given(scheduler.scheduleJob(trigger0)).willThrow(new ObjectAlreadyExistsException("")); if (overwrite) { - scheduler.rescheduleJob("myTrigger0", Scheduler.DEFAULT_GROUP, trigger0); - schedulerControl.setReturnValue(new Date()); + given(scheduler.rescheduleJob("myTrigger0", Scheduler.DEFAULT_GROUP, trigger0)).willReturn(new Date()); } - scheduler.start(); - schedulerControl.setVoidCallable(); - scheduler.shutdown(false); - schedulerControl.setVoidCallable(); - schedulerControl.replay(); SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() { @Override @@ -369,15 +325,25 @@ public class QuartzSupportTests { schedulerFactoryBean.destroy(); } - schedulerControl.verify(); + verify(scheduler).getTrigger("myTrigger0", Scheduler.DEFAULT_GROUP); + verify(scheduler).getTrigger("myTrigger1", Scheduler.DEFAULT_GROUP); + if (overwrite) { + verify(scheduler).addJob(jobDetail1, true); + verify(scheduler).rescheduleJob("myTrigger1", Scheduler.DEFAULT_GROUP, trigger1); + } + else { + verify(scheduler).getJobDetail("myJob0", Scheduler.DEFAULT_GROUP); + } + verify(scheduler).addJob(jobDetail0, true); + verify(scheduler).start(); + verify(scheduler).shutdown(false); } @Test public void testSchedulerFactoryBeanWithListeners() throws Exception { JobFactory jobFactory = new AdaptableJobFactory(); - MockControl schedulerControl = MockControl.createControl(Scheduler.class); - final Scheduler scheduler = (Scheduler) schedulerControl.getMock(); + final Scheduler scheduler = mock(Scheduler.class); SchedulerListener schedulerListener = new TestSchedulerListener(); JobListener globalJobListener = new TestJobListener(); @@ -385,24 +351,6 @@ public class QuartzSupportTests { TriggerListener globalTriggerListener = new TestTriggerListener(); TriggerListener triggerListener = new TestTriggerListener(); - scheduler.setJobFactory(jobFactory); - schedulerControl.setVoidCallable(); - scheduler.addSchedulerListener(schedulerListener); - schedulerControl.setVoidCallable(); - scheduler.addGlobalJobListener(globalJobListener); - schedulerControl.setVoidCallable(); - scheduler.addJobListener(jobListener); - schedulerControl.setVoidCallable(); - scheduler.addGlobalTriggerListener(globalTriggerListener); - schedulerControl.setVoidCallable(); - scheduler.addTriggerListener(triggerListener); - schedulerControl.setVoidCallable(); - scheduler.start(); - schedulerControl.setVoidCallable(); - scheduler.shutdown(false); - schedulerControl.setVoidCallable(); - schedulerControl.replay(); - SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() { @Override protected Scheduler createScheduler(SchedulerFactory schedulerFactory, String schedulerName) { @@ -423,7 +371,14 @@ public class QuartzSupportTests { schedulerFactoryBean.destroy(); } - schedulerControl.verify(); + verify(scheduler).setJobFactory(jobFactory); + verify(scheduler).addSchedulerListener(schedulerListener); + verify(scheduler).addGlobalJobListener(globalJobListener); + verify(scheduler).addJobListener(jobListener); + verify(scheduler).addGlobalTriggerListener(globalTriggerListener); + verify(scheduler).addTriggerListener(triggerListener); + verify(scheduler).start(); + verify(scheduler).shutdown(false); } /*public void testMethodInvocationWithConcurrency() throws Exception { @@ -547,31 +502,9 @@ public class QuartzSupportTests { trigger1.setRepeatCount(SimpleTrigger.REPEAT_INDEFINITELY); trigger1.setRepeatInterval(20); - MockControl schedulerControl = MockControl.createControl(Scheduler.class); - final Scheduler scheduler = (Scheduler) schedulerControl.getMock(); - scheduler.setJobFactory(jobFactory); - schedulerControl.setVoidCallable(); - scheduler.getJobDetail("myJob0", Scheduler.DEFAULT_GROUP); - schedulerControl.setReturnValue(null); - scheduler.getJobDetail("myJob1", Scheduler.DEFAULT_GROUP); - schedulerControl.setReturnValue(null); - scheduler.getTrigger("myTrigger0", Scheduler.DEFAULT_GROUP); - schedulerControl.setReturnValue(null); - scheduler.getTrigger("myTrigger1", Scheduler.DEFAULT_GROUP); - schedulerControl.setReturnValue(null); - scheduler.addJob(jobDetail0, true); - schedulerControl.setVoidCallable(); - scheduler.addJob(jobDetail1, true); - schedulerControl.setVoidCallable(); - scheduler.scheduleJob(trigger0); - schedulerControl.setReturnValue(new Date()); - scheduler.scheduleJob(trigger1); - schedulerControl.setReturnValue(new Date()); - scheduler.start(); - schedulerControl.setVoidCallable(); - scheduler.shutdown(false); - schedulerControl.setVoidCallable(); - schedulerControl.replay(); + final Scheduler scheduler = mock(Scheduler.class); + given(scheduler.scheduleJob(trigger0)).willReturn(new Date()); + given(scheduler.scheduleJob(trigger1)).willReturn(new Date()); SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() { @Override @@ -590,7 +523,17 @@ public class QuartzSupportTests { schedulerFactoryBean.destroy(); } - schedulerControl.verify(); + verify(scheduler).setJobFactory(jobFactory); + verify(scheduler).getJobDetail("myJob0", Scheduler.DEFAULT_GROUP); + verify(scheduler).getJobDetail("myJob1", Scheduler.DEFAULT_GROUP); + verify(scheduler).getTrigger("myTrigger0", Scheduler.DEFAULT_GROUP); + verify(scheduler).getTrigger("myTrigger1", Scheduler.DEFAULT_GROUP); + verify(scheduler).addJob(jobDetail0, true); + verify(scheduler).addJob(jobDetail1, true); + verify(scheduler).scheduleJob(trigger0); + verify(scheduler).scheduleJob(trigger1); + verify(scheduler).start(); + verify(scheduler).shutdown(false); } @Test @@ -598,16 +541,9 @@ public class QuartzSupportTests { TestBean tb = new TestBean("tb", 99); StaticApplicationContext ac = new StaticApplicationContext(); - MockControl schedulerControl = MockControl.createControl(Scheduler.class); - final Scheduler scheduler = (Scheduler) schedulerControl.getMock(); + final Scheduler scheduler = mock(Scheduler.class); SchedulerContext schedulerContext = new SchedulerContext(); - scheduler.getContext(); - schedulerControl.setReturnValue(schedulerContext, 4); - scheduler.start(); - schedulerControl.setVoidCallable(); - scheduler.shutdown(false); - schedulerControl.setVoidCallable(); - schedulerControl.replay(); + given(scheduler.getContext()).willReturn(schedulerContext); SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean() { @Override @@ -632,7 +568,8 @@ public class QuartzSupportTests { schedulerFactoryBean.destroy(); } - schedulerControl.verify(); + verify(scheduler).start(); + verify(scheduler).shutdown(false); } @Test diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java index 2bf712344ed..a241920c660 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java @@ -16,8 +16,9 @@ package org.springframework.aop.aspectj; -import static org.easymock.EasyMock.*; import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import org.junit.Before; import org.junit.Test; @@ -55,56 +56,44 @@ public final class AfterAdviceBindingTests { // we need the real target too, not just the proxy... testBeanTarget = (TestBean) ((Advised) testBeanProxy).getTargetSource().getTarget(); - mockCollaborator = createNiceMock(AdviceBindingCollaborator.class); + mockCollaborator = mock(AdviceBindingCollaborator.class); afterAdviceAspect.setCollaborator(mockCollaborator); } @Test public void testOneIntArg() { - mockCollaborator.oneIntArg(5); - replay(mockCollaborator); testBeanProxy.setAge(5); - verify(mockCollaborator); + verify(mockCollaborator).oneIntArg(5); } @Test public void testOneObjectArgBindingProxyWithThis() { - mockCollaborator.oneObjectArg(this.testBeanProxy); - replay(mockCollaborator); testBeanProxy.getAge(); - verify(mockCollaborator); + verify(mockCollaborator).oneObjectArg(this.testBeanProxy); } @Test public void testOneObjectArgBindingTarget() { - mockCollaborator.oneObjectArg(this.testBeanTarget); - replay(mockCollaborator); testBeanProxy.getDoctor(); - verify(mockCollaborator); + verify(mockCollaborator).oneObjectArg(this.testBeanTarget); } @Test public void testOneIntAndOneObjectArgs() { - mockCollaborator.oneIntAndOneObject(5,this.testBeanProxy); - replay(mockCollaborator); testBeanProxy.setAge(5); - verify(mockCollaborator); + verify(mockCollaborator).oneIntAndOneObject(5,this.testBeanProxy); } @Test public void testNeedsJoinPoint() { - mockCollaborator.needsJoinPoint("getAge"); - replay(mockCollaborator); testBeanProxy.getAge(); - verify(mockCollaborator); + verify(mockCollaborator).needsJoinPoint("getAge"); } @Test public void testNeedsJoinPointStaticPart() { - mockCollaborator.needsJoinPointStaticPart("getAge"); - replay(mockCollaborator); testBeanProxy.getAge(); - verify(mockCollaborator); + verify(mockCollaborator).needsJoinPointStaticPart("getAge"); } } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java index 2c8e8a714ba..e85b6cd311e 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java @@ -16,8 +16,10 @@ package org.springframework.aop.aspectj; -import static org.easymock.EasyMock.*; import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyZeroInteractions; import org.junit.Before; import org.junit.Test; @@ -58,7 +60,7 @@ public final class AfterReturningAdviceBindingTests { afterAdviceAspect = (AfterReturningAdviceBindingTestAspect) ctx.getBean("testAspect"); - mockCollaborator = createNiceMock(AfterReturningAdviceBindingCollaborator.class); + mockCollaborator = mock(AfterReturningAdviceBindingCollaborator.class); afterAdviceAspect.setCollaborator(mockCollaborator); testBeanProxy = (ITestBean) ctx.getBean("testBean"); @@ -71,106 +73,79 @@ public final class AfterReturningAdviceBindingTests { @Test public void testOneIntArg() { - mockCollaborator.oneIntArg(5); - replay(mockCollaborator); testBeanProxy.setAge(5); - verify(mockCollaborator); + verify(mockCollaborator).oneIntArg(5); } @Test public void testOneObjectArg() { - mockCollaborator.oneObjectArg(this.testBeanProxy); - replay(mockCollaborator); testBeanProxy.getAge(); - verify(mockCollaborator); + verify(mockCollaborator).oneObjectArg(this.testBeanProxy); } @Test public void testOneIntAndOneObjectArgs() { - mockCollaborator.oneIntAndOneObject(5,this.testBeanProxy); - replay(mockCollaborator); testBeanProxy.setAge(5); - verify(mockCollaborator); + verify(mockCollaborator).oneIntAndOneObject(5,this.testBeanProxy); } @Test public void testNeedsJoinPoint() { - mockCollaborator.needsJoinPoint("getAge"); - replay(mockCollaborator); testBeanProxy.getAge(); - verify(mockCollaborator); + verify(mockCollaborator).needsJoinPoint("getAge"); } @Test public void testNeedsJoinPointStaticPart() { - mockCollaborator.needsJoinPointStaticPart("getAge"); - replay(mockCollaborator); testBeanProxy.getAge(); - verify(mockCollaborator); + verify(mockCollaborator).needsJoinPointStaticPart("getAge"); } @Test public void testReturningString() { - mockCollaborator.oneString("adrian"); - replay(mockCollaborator); testBeanProxy.setName("adrian"); testBeanProxy.getName(); - verify(mockCollaborator); + verify(mockCollaborator).oneString("adrian"); } @Test public void testReturningObject() { - mockCollaborator.oneObjectArg(this.testBeanTarget); - replay(mockCollaborator); testBeanProxy.returnsThis(); - verify(mockCollaborator); + verify(mockCollaborator).oneObjectArg(this.testBeanTarget); } @Test public void testReturningBean() { - mockCollaborator.oneTestBeanArg(this.testBeanTarget); - replay(mockCollaborator); testBeanProxy.returnsThis(); - verify(mockCollaborator); + verify(mockCollaborator).oneTestBeanArg(this.testBeanTarget); } @Test public void testReturningBeanArray() { this.testBeanTarget.setSpouse(new TestBean()); ITestBean[] spouses = this.testBeanTarget.getSpouses(); - mockCollaborator.testBeanArrayArg(spouses); - replay(mockCollaborator); testBeanProxy.getSpouses(); - verify(mockCollaborator); + verify(mockCollaborator).testBeanArrayArg(spouses); } @Test public void testNoInvokeWhenReturningParameterTypeDoesNotMatch() { - // we need a strict mock for this... - mockCollaborator = createMock(AfterReturningAdviceBindingCollaborator.class); - afterAdviceAspect.setCollaborator(mockCollaborator); - - replay(mockCollaborator); testBeanProxy.setSpouse(this.testBeanProxy); testBeanProxy.getSpouse(); - verify(mockCollaborator); + verifyZeroInteractions(mockCollaborator); } @Test public void testReturningByType() { - mockCollaborator.objectMatchNoArgs(); - replay(mockCollaborator); testBeanProxy.returnsThis(); - verify(mockCollaborator); + verify(mockCollaborator).objectMatchNoArgs(); } @Test public void testReturningPrimitive() { - mockCollaborator.oneInt(20); - replay(mockCollaborator); testBeanProxy.setAge(20); testBeanProxy.haveBirthday(); - verify(mockCollaborator); + verify(mockCollaborator).oneInt(20); } } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java index 0424250ca52..dc32a581db1 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java @@ -16,9 +16,9 @@ package org.springframework.aop.aspectj; -import static org.easymock.EasyMock.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.springframework.aop.aspectj.AfterThrowingAdviceBindingTestAspect.AfterThrowingAdviceBindingCollaborator; @@ -47,65 +47,49 @@ public final class AfterThrowingAdviceBindingTests { testBean = (ITestBean) ctx.getBean("testBean"); afterThrowingAdviceAspect = (AfterThrowingAdviceBindingTestAspect) ctx.getBean("testAspect"); - mockCollaborator = createNiceMock(AfterThrowingAdviceBindingCollaborator.class); + mockCollaborator = mock(AfterThrowingAdviceBindingCollaborator.class); afterThrowingAdviceAspect.setCollaborator(mockCollaborator); } - @After - public void tearDown() { - verify(mockCollaborator); - } - @Test(expected=Throwable.class) public void testSimpleAfterThrowing() throws Throwable { - mockCollaborator.noArgs(); - replay(mockCollaborator); this.testBean.exceptional(new Throwable()); + verify(mockCollaborator).noArgs(); } @Test(expected=Throwable.class) public void testAfterThrowingWithBinding() throws Throwable { Throwable t = new Throwable(); - mockCollaborator.oneThrowable(t); - replay(mockCollaborator); this.testBean.exceptional(t); + verify(mockCollaborator).oneThrowable(t); } @Test(expected=Throwable.class) public void testAfterThrowingWithNamedTypeRestriction() throws Throwable { Throwable t = new Throwable(); - // need a strict mock for this test... - mockCollaborator = createMock(AfterThrowingAdviceBindingCollaborator.class); - afterThrowingAdviceAspect.setCollaborator(mockCollaborator); - - mockCollaborator.noArgs(); - mockCollaborator.oneThrowable(t); - mockCollaborator.noArgsOnThrowableMatch(); - replay(mockCollaborator); this.testBean.exceptional(t); + verify(mockCollaborator).noArgs(); + verify(mockCollaborator).oneThrowable(t); + verify(mockCollaborator).noArgsOnThrowableMatch(); } @Test(expected=Throwable.class) public void testAfterThrowingWithRuntimeExceptionBinding() throws Throwable { RuntimeException ex = new RuntimeException(); - mockCollaborator.oneRuntimeException(ex); - replay(mockCollaborator); this.testBean.exceptional(ex); + verify(mockCollaborator).oneRuntimeException(ex); } @Test(expected=Throwable.class) public void testAfterThrowingWithTypeSpecified() throws Throwable { - mockCollaborator.noArgsOnThrowableMatch(); - replay(mockCollaborator); this.testBean.exceptional(new Throwable()); + verify(mockCollaborator).noArgsOnThrowableMatch(); } @Test(expected=Throwable.class) public void testAfterThrowingWithRuntimeTypeSpecified() throws Throwable { - mockCollaborator.noArgsOnRuntimeExceptionMatch(); - replay(mockCollaborator); this.testBean.exceptional(new RuntimeException()); - verify(mockCollaborator); + verify(mockCollaborator).noArgsOnRuntimeExceptionMatch(); } } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java index 05b171f6bb3..913d173a55c 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java @@ -16,8 +16,9 @@ package org.springframework.aop.aspectj; -import static org.easymock.EasyMock.*; import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import org.aspectj.lang.ProceedingJoinPoint; import org.junit.Before; @@ -60,40 +61,32 @@ public class AroundAdviceBindingTests { this.testBeanTarget = (TestBean) ((Advised) testBeanProxy).getTargetSource().getTarget(); - mockCollaborator = createNiceMock(AroundAdviceBindingCollaborator.class); + mockCollaborator = mock(AroundAdviceBindingCollaborator.class); aroundAdviceAspect.setCollaborator(mockCollaborator); } @Test public void testOneIntArg() { - mockCollaborator.oneIntArg(5); - replay(mockCollaborator); testBeanProxy.setAge(5); - verify(mockCollaborator); + verify(mockCollaborator).oneIntArg(5); } @Test public void testOneObjectArgBoundToTarget() { - mockCollaborator.oneObjectArg(this.testBeanTarget); - replay(mockCollaborator); testBeanProxy.getAge(); - verify(mockCollaborator); + verify(mockCollaborator).oneObjectArg(this.testBeanTarget);; } @Test public void testOneIntAndOneObjectArgs() { - mockCollaborator.oneIntAndOneObject(5, this.testBeanProxy); - replay(mockCollaborator); testBeanProxy.setAge(5); - verify(mockCollaborator); + verify(mockCollaborator).oneIntAndOneObject(5, this.testBeanProxy);; } @Test public void testJustJoinPoint() { - mockCollaborator.justJoinPoint("getAge"); - replay(mockCollaborator); testBeanProxy.getAge(); - verify(mockCollaborator); + verify(mockCollaborator).justJoinPoint("getAge");; } } diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java index a1f2fe9736f..08250b6ff35 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java @@ -16,8 +16,9 @@ package org.springframework.aop.aspectj; -import static org.easymock.EasyMock.*; import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import org.junit.Before; import org.junit.Test; @@ -60,49 +61,39 @@ public final class BeforeAdviceBindingTests { AdviceBindingTestAspect beforeAdviceAspect = (AdviceBindingTestAspect) ctx.getBean("testAspect"); - mockCollaborator = createNiceMock(AdviceBindingCollaborator.class); + mockCollaborator = mock(AdviceBindingCollaborator.class); beforeAdviceAspect.setCollaborator(mockCollaborator); } @Test public void testOneIntArg() { - mockCollaborator.oneIntArg(5); - replay(mockCollaborator); testBeanProxy.setAge(5); - verify(mockCollaborator); + verify(mockCollaborator).oneIntArg(5); } @Test public void testOneObjectArgBoundToProxyUsingThis() { - mockCollaborator.oneObjectArg(this.testBeanProxy); - replay(mockCollaborator); testBeanProxy.getAge(); - verify(mockCollaborator); + verify(mockCollaborator).oneObjectArg(this.testBeanProxy); } @Test public void testOneIntAndOneObjectArgs() { - mockCollaborator.oneIntAndOneObject(5,this.testBeanTarget); - replay(mockCollaborator); testBeanProxy.setAge(5); - verify(mockCollaborator); + verify(mockCollaborator).oneIntAndOneObject(5,this.testBeanTarget); } @Test public void testNeedsJoinPoint() { - mockCollaborator.needsJoinPoint("getAge"); - replay(mockCollaborator); testBeanProxy.getAge(); - verify(mockCollaborator); + verify(mockCollaborator).needsJoinPoint("getAge"); } @Test public void testNeedsJoinPointStaticPart() { - mockCollaborator.needsJoinPointStaticPart("getAge"); - replay(mockCollaborator); testBeanProxy.getAge(); - verify(mockCollaborator); + verify(mockCollaborator).needsJoinPointStaticPart("getAge"); } diff --git a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java index e06876b4304..60ec4288f6a 100644 --- a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java @@ -16,14 +16,17 @@ package org.springframework.aop.config; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + import java.lang.reflect.Method; -import static org.easymock.EasyMock.*; -import static org.junit.Assert.*; -import org.junit.After; import org.junit.Before; import org.junit.Test; - import org.springframework.beans.factory.BeanFactory; /** @@ -39,40 +42,27 @@ public final class MethodLocatingFactoryBeanTests { @Before public void setUp() { factory = new MethodLocatingFactoryBean(); - - // methods must set up expectations and call replay() manually for this mock - beanFactory = createMock(BeanFactory.class); - } - - @After - public void tearDown() { - verify(beanFactory); + beanFactory = mock(BeanFactory.class); } @Test public void testIsSingleton() { - replay(beanFactory); assertTrue(factory.isSingleton()); } @Test public void testGetObjectType() { - replay(beanFactory); assertEquals(Method.class, factory.getObjectType()); } @Test(expected=IllegalArgumentException.class) public void testWithNullTargetBeanName() { - replay(beanFactory); - factory.setMethodName("toString()"); factory.setBeanFactory(beanFactory); } @Test(expected=IllegalArgumentException.class) public void testWithEmptyTargetBeanName() { - replay(beanFactory); - factory.setTargetBeanName(""); factory.setMethodName("toString()"); factory.setBeanFactory(beanFactory); @@ -80,16 +70,12 @@ public final class MethodLocatingFactoryBeanTests { @Test(expected=IllegalArgumentException.class) public void testWithNullTargetMethodName() { - replay(beanFactory); - factory.setTargetBeanName(BEAN_NAME); factory.setBeanFactory(beanFactory); } @Test(expected=IllegalArgumentException.class) public void testWithEmptyTargetMethodName() { - replay(beanFactory); - factory.setTargetBeanName(BEAN_NAME); factory.setMethodName(""); factory.setBeanFactory(beanFactory); @@ -97,20 +83,16 @@ public final class MethodLocatingFactoryBeanTests { @Test(expected=IllegalArgumentException.class) public void testWhenTargetBeanClassCannotBeResolved() { - expect(beanFactory.getType(BEAN_NAME)).andReturn(null); - replay(beanFactory); - factory.setTargetBeanName(BEAN_NAME); factory.setMethodName("toString()"); factory.setBeanFactory(beanFactory); + verify(beanFactory).getType(BEAN_NAME); } @Test - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings("unchecked") public void testSunnyDayPath() throws Exception { - expect((Class) beanFactory.getType(BEAN_NAME)).andReturn(String.class); - replay(beanFactory); - + given(beanFactory.getType(BEAN_NAME)).willReturn((Class)String.class); factory.setTargetBeanName(BEAN_NAME); factory.setMethodName("toString()"); factory.setBeanFactory(beanFactory); @@ -122,11 +104,9 @@ public final class MethodLocatingFactoryBeanTests { } @Test(expected=IllegalArgumentException.class) - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings("unchecked") public void testWhereMethodCannotBeResolved() { - expect((Class) beanFactory.getType(BEAN_NAME)).andReturn(String.class); - replay(beanFactory); - + given(beanFactory.getType(BEAN_NAME)).willReturn((Class)String.class); factory.setTargetBeanName(BEAN_NAME); factory.setMethodName("loadOfOld()"); factory.setBeanFactory(beanFactory); diff --git a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java index fff56bde6f2..17103fce2f5 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java @@ -16,11 +16,9 @@ package org.springframework.aop.framework; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; import static org.junit.Assert.*; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; import java.io.Serializable; @@ -80,18 +78,16 @@ public final class JdkDynamicProxyTests extends AbstractAopProxyTests implements public void testInterceptorIsInvokedWithNoTarget() throws Throwable { // Test return value int age = 25; - MethodInterceptor mi = createMock(MethodInterceptor.class); + MethodInterceptor mi = mock(MethodInterceptor.class); AdvisedSupport pc = new AdvisedSupport(new Class[] { ITestBean.class }); pc.addAdvice(mi); AopProxy aop = createAopProxy(pc); - expect(mi.invoke(null)).andReturn(age); - replay(mi); + given(mi.invoke(null)).willReturn(age); ITestBean tb = (ITestBean) aop.getProxy(); assertTrue("correct return value", tb.getAge() == age); - verify(mi); } public void testTargetCanGetInvocationWithPrivateClass() throws Throwable { diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java b/spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java index c93760bf67e..a2eaf26f79e 100644 --- a/spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java +++ b/spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java @@ -16,8 +16,9 @@ package org.springframework.context.access; -import static org.easymock.EasyMock.*; import static org.junit.Assert.assertNotNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import org.junit.Test; import org.springframework.context.ConfigurableApplicationContext; @@ -32,10 +33,7 @@ public class ContextBeanFactoryReferenceTests { @Test public void testAllOperations() { - ConfigurableApplicationContext ctx = createMock(ConfigurableApplicationContext.class); - - ctx.close(); - replay(ctx); + ConfigurableApplicationContext ctx = mock(ConfigurableApplicationContext.class); ContextBeanFactoryReference bfr = new ContextBeanFactoryReference(ctx); @@ -49,6 +47,6 @@ public class ContextBeanFactoryReferenceTests { // expected } - verify(ctx); + verify(ctx).close(); } } diff --git a/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java index fb0683ed279..48ef3c6eaf4 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java @@ -16,10 +16,10 @@ package org.springframework.context.annotation; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expectLastCall; -import static org.easymock.EasyMock.isA; -import static org.easymock.EasyMock.replay; +import static org.mockito.Matchers.isA; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyZeroInteractions; import java.lang.instrument.ClassFileTransformer; @@ -40,7 +40,7 @@ public class EnableLoadTimeWeavingTests { public void control() { GenericXmlApplicationContext ctx = new GenericXmlApplicationContext(getClass(), "EnableLoadTimeWeavingTests-context.xml"); - ctx.getBean("loadTimeWeaver"); + ctx.getBean("loadTimeWeaver", LoadTimeWeaver.class); } @Test @@ -48,7 +48,8 @@ public class EnableLoadTimeWeavingTests { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); ctx.register(EnableLTWConfig_withAjWeavingDisabled.class); ctx.refresh(); - ctx.getBean("loadTimeWeaver"); + LoadTimeWeaver loadTimeWeaver = ctx.getBean("loadTimeWeaver", LoadTimeWeaver.class); + verifyZeroInteractions(loadTimeWeaver); } @Test @@ -56,7 +57,10 @@ public class EnableLoadTimeWeavingTests { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); ctx.register(EnableLTWConfig_withAjWeavingAutodetect.class); ctx.refresh(); - ctx.getBean("loadTimeWeaver"); + LoadTimeWeaver loadTimeWeaver = ctx.getBean("loadTimeWeaver", LoadTimeWeaver.class); + // no expectations -> a class file transformer should NOT be added + // because no META-INF/aop.xml is present on the classpath + verifyZeroInteractions(loadTimeWeaver); } @Test @@ -64,7 +68,8 @@ public class EnableLoadTimeWeavingTests { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); ctx.register(EnableLTWConfig_withAjWeavingEnabled.class); ctx.refresh(); - ctx.getBean("loadTimeWeaver"); + LoadTimeWeaver loadTimeWeaver = ctx.getBean("loadTimeWeaver", LoadTimeWeaver.class); + verify(loadTimeWeaver).addTransformer(isA(ClassFileTransformer.class)); } @Configuration @@ -72,10 +77,7 @@ public class EnableLoadTimeWeavingTests { static class EnableLTWConfig_withAjWeavingDisabled implements LoadTimeWeavingConfigurer { @Override public LoadTimeWeaver getLoadTimeWeaver() { - LoadTimeWeaver mockLTW = createMock(LoadTimeWeaver.class); - // no expectations -> a class file transformer should NOT be added - replay(mockLTW); - return mockLTW; + return mock(LoadTimeWeaver.class); } } @@ -84,11 +86,7 @@ public class EnableLoadTimeWeavingTests { static class EnableLTWConfig_withAjWeavingAutodetect implements LoadTimeWeavingConfigurer { @Override public LoadTimeWeaver getLoadTimeWeaver() { - LoadTimeWeaver mockLTW = createMock(LoadTimeWeaver.class); - // no expectations -> a class file transformer should NOT be added - // because no META-INF/aop.xml is present on the classpath - replay(mockLTW); - return mockLTW; + return mock(LoadTimeWeaver.class); } } @@ -97,11 +95,7 @@ public class EnableLoadTimeWeavingTests { static class EnableLTWConfig_withAjWeavingEnabled implements LoadTimeWeavingConfigurer { @Override public LoadTimeWeaver getLoadTimeWeaver() { - LoadTimeWeaver mockLTW = createMock(LoadTimeWeaver.class); - mockLTW.addTransformer(isA(ClassFileTransformer.class)); - expectLastCall(); - replay(mockLTW); - return mockLTW; + return mock(LoadTimeWeaver.class); } } } diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java index 1811a789381..19a54ec52d0 100644 --- a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java @@ -20,9 +20,12 @@ import java.util.HashSet; import java.util.Set; import org.aopalliance.intercept.MethodInvocation; -import org.easymock.EasyMock; -import static org.easymock.EasyMock.*; import static org.junit.Assert.*; +import static org.mockito.BDDMockito.given; +import static org.mockito.Matchers.isA; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + import org.junit.Test; import org.springframework.aop.framework.ProxyFactory; @@ -50,14 +53,12 @@ public class ApplicationContextEventTests { @SuppressWarnings("unchecked") ApplicationListener listener = mock(ApplicationListener.class); ApplicationEvent evt = new ContextClosedEvent(new StaticApplicationContext()); - listener.onApplicationEvent(evt); SimpleApplicationEventMulticaster smc = new SimpleApplicationEventMulticaster(); smc.addApplicationListener(listener); - replay(listener); smc.multicastEvent(evt); - verify(listener); + verify(listener).onApplicationEvent(evt); } @Test @@ -91,20 +92,18 @@ public class ApplicationContextEventTests { @Test public void testEventPublicationInterceptor() throws Throwable { - MethodInvocation invocation = EasyMock.createMock(MethodInvocation.class); - ApplicationContext ctx = EasyMock.createMock(ApplicationContext.class); + MethodInvocation invocation = mock(MethodInvocation.class); + ApplicationContext ctx = mock(ApplicationContext.class); EventPublicationInterceptor interceptor = new EventPublicationInterceptor(); interceptor.setApplicationEventClass(MyEvent.class); interceptor.setApplicationEventPublisher(ctx); interceptor.afterPropertiesSet(); - expect(invocation.proceed()).andReturn(new Object()); - expect(invocation.getThis()).andReturn(new Object()); - ctx.publishEvent(isA(MyEvent.class)); - replay(invocation, ctx); + given(invocation.proceed()).willReturn(new Object()); + given(invocation.getThis()).willReturn(new Object()); interceptor.invoke(invocation); - verify(invocation, ctx); + verify(ctx).publishEvent(isA(MyEvent.class)); } @Test diff --git a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java index 3cf6771099a..31ca74fa67a 100644 --- a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java @@ -16,8 +16,8 @@ package org.springframework.context.event; -import static org.easymock.EasyMock.*; import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; import org.junit.Before; import org.junit.Test; @@ -44,13 +44,7 @@ public class EventPublicationInterceptorTests { @Before public void setUp() { - publisher = createMock(ApplicationEventPublisher.class); - replay(publisher); - } - - @After - public void tearDown() { - verify(publisher); + publisher = mock(ApplicationEventPublisher.class); } @Test(expected=IllegalArgumentException.class) diff --git a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java index 3dc63f5cde3..efa2967148f 100644 --- a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java @@ -16,8 +16,10 @@ package org.springframework.ejb.access; -import static org.easymock.EasyMock.*; import static org.junit.Assert.*; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import javax.ejb.CreateException; import javax.ejb.EJBLocalHome; @@ -41,15 +43,14 @@ public class LocalSlsbInvokerInterceptorTests { */ @Test public void testPerformsLookup() throws Exception { - LocalInterfaceWithBusinessMethods ejb = createMock(LocalInterfaceWithBusinessMethods.class); - replay(ejb); + LocalInterfaceWithBusinessMethods ejb = mock(LocalInterfaceWithBusinessMethods.class); String jndiName= "foobar"; Context mockContext = mockContext(jndiName, ejb); configuredInterceptor(mockContext, jndiName); - verify(mockContext); + verify(mockContext).close(); } @Test @@ -81,10 +82,8 @@ public class LocalSlsbInvokerInterceptorTests { @Test public void testInvokesMethodOnEjbInstance() throws Exception { Object retVal = new Object(); - LocalInterfaceWithBusinessMethods ejb = createMock(LocalInterfaceWithBusinessMethods.class); - expect(ejb.targetMethod()).andReturn(retVal); - ejb.remove(); - replay(ejb); + LocalInterfaceWithBusinessMethods ejb = mock(LocalInterfaceWithBusinessMethods.class); + given(ejb.targetMethod()).willReturn(retVal); String jndiName= "foobar"; Context mockContext = mockContext(jndiName, ejb); @@ -97,17 +96,15 @@ public class LocalSlsbInvokerInterceptorTests { assertTrue(target.targetMethod() == retVal); - verify(mockContext); - verify(ejb); + verify(mockContext).close(); + verify(ejb).remove(); } @Test public void testInvokesMethodOnEjbInstanceWithSeparateBusinessMethods() throws Exception { Object retVal = new Object(); - LocalInterface ejb = createMock(LocalInterface.class); - expect(ejb.targetMethod()).andReturn(retVal); - ejb.remove(); - replay(ejb); + LocalInterface ejb = mock(LocalInterface.class); + given(ejb.targetMethod()).willReturn(retVal); String jndiName= "foobar"; Context mockContext = mockContext(jndiName, ejb); @@ -120,14 +117,13 @@ public class LocalSlsbInvokerInterceptorTests { assertTrue(target.targetMethod() == retVal); - verify(mockContext); - verify(ejb); + verify(mockContext).close(); + verify(ejb).remove(); } private void testException(Exception expected) throws Exception { - LocalInterfaceWithBusinessMethods ejb = createMock(LocalInterfaceWithBusinessMethods.class); - expect(ejb.targetMethod()).andThrow(expected); - replay(ejb); + LocalInterfaceWithBusinessMethods ejb = mock(LocalInterfaceWithBusinessMethods.class); + given(ejb.targetMethod()).willThrow(expected); String jndiName= "foobar"; Context mockContext = mockContext(jndiName, ejb); @@ -146,8 +142,7 @@ public class LocalSlsbInvokerInterceptorTests { assertTrue(thrown == expected); } - verify(mockContext); - verify(ejb); + verify(mockContext).close(); } @Test @@ -157,16 +152,10 @@ public class LocalSlsbInvokerInterceptorTests { protected Context mockContext(final String jndiName, final Object ejbInstance) throws Exception { - - final SlsbHome mockHome = createMock(SlsbHome.class); - expect(mockHome.create()).andReturn((LocalInterface)ejbInstance); - replay(mockHome); - - final Context mockCtx = createMock(Context.class); - - expect(mockCtx.lookup("java:comp/env/" + jndiName)).andReturn(mockHome); - mockCtx.close(); - replay(mockCtx); + SlsbHome mockHome = mock(SlsbHome.class); + given(mockHome.create()).willReturn((LocalInterface)ejbInstance); + Context mockCtx = mock(Context.class); + given(mockCtx.lookup("java:comp/env/" + jndiName)).willReturn(mockHome); return mockCtx; } diff --git a/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java index b053e3e0380..53e414146e3 100644 --- a/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java @@ -16,8 +16,11 @@ package org.springframework.ejb.access; -import static org.easymock.EasyMock.*; import static org.junit.Assert.*; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyZeroInteractions; import java.lang.reflect.Proxy; @@ -42,14 +45,11 @@ public class LocalStatelessSessionProxyFactoryBeanTests { final int value = 11; final String jndiName = "foo"; - MyEjb myEjb = createMock(MyEjb.class); - expect(myEjb.getValue()).andReturn(value); - myEjb.remove(); - replay(myEjb); + MyEjb myEjb = mock(MyEjb.class); + given(myEjb.getValue()).willReturn(value); - final MyHome home = createMock(MyHome.class); - expect(home.create()).andReturn(myEjb); - replay(home); + final MyHome home = mock(MyHome.class); + given(home.create()).willReturn(myEjb); JndiTemplate jt = new JndiTemplate() { @Override @@ -72,8 +72,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests { MyBusinessMethods mbm = (MyBusinessMethods) fb.getObject(); assertTrue(Proxy.isProxyClass(mbm.getClass())); assertTrue(mbm.getValue() == value); - verify(myEjb); - verify(home); + verify(myEjb).remove(); } @Test @@ -81,9 +80,8 @@ public class LocalStatelessSessionProxyFactoryBeanTests { final int value = 11; final String jndiName = "foo"; - final MyEjb myEjb = createMock(MyEjb.class); - expect(myEjb.getValue()).andReturn(value); - replay(myEjb); + final MyEjb myEjb = mock(MyEjb.class); + given(myEjb.getValue()).willReturn(value); JndiTemplate jt = new JndiTemplate() { @Override @@ -106,7 +104,6 @@ public class LocalStatelessSessionProxyFactoryBeanTests { MyBusinessMethods mbm = (MyBusinessMethods) fb.getObject(); assertTrue(Proxy.isProxyClass(mbm.getClass())); assertTrue(mbm.getValue() == value); - verify(myEjb); } @Test @@ -114,9 +111,8 @@ public class LocalStatelessSessionProxyFactoryBeanTests { final String jndiName = "foo"; final CreateException cex = new CreateException(); - final MyHome home = createMock(MyHome.class); - expect(home.create()).andThrow(cex); - replay(home); + final MyHome home = mock(MyHome.class); + given(home.create()).willThrow(cex); JndiTemplate jt = new JndiTemplate() { @Override @@ -147,8 +143,6 @@ public class LocalStatelessSessionProxyFactoryBeanTests { catch (EjbAccessException ex) { assertSame(cex, ex.getCause()); } - - verify(home); } @Test @@ -157,8 +151,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests { // Could actually try to figure out interface from create? final String jndiName = "foo"; - final MyHome home = createMock(MyHome.class); - replay(home); + final MyHome home = mock(MyHome.class); JndiTemplate jt = new JndiTemplate() { @Override @@ -188,7 +181,7 @@ public class LocalStatelessSessionProxyFactoryBeanTests { } // Expect no methods on home - verify(home); + verifyZeroInteractions(home); } diff --git a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java index cbf75b18310..ac3d59b47eb 100644 --- a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java @@ -16,8 +16,12 @@ package org.springframework.ejb.access; -import static org.easymock.EasyMock.*; import static org.junit.Assert.*; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; import java.rmi.ConnectException; import java.rmi.RemoteException; @@ -41,20 +45,12 @@ import org.springframework.remoting.RemoteAccessException; public class SimpleRemoteSlsbInvokerInterceptorTests { private Context mockContext( - String jndiName, RemoteInterface ejbInstance, int createCount, int lookupCount, int closeCount) + String jndiName, RemoteInterface ejbInstance) throws Exception { - - final SlsbHome mockHome = createMock(SlsbHome.class); - expect(mockHome.create()).andReturn(ejbInstance).times(createCount); - replay(mockHome); - - final Context mockCtx = createMock(Context.class); - - expect(mockCtx.lookup("java:comp/env/" + jndiName)).andReturn(mockHome).times(lookupCount); - mockCtx.close(); - expectLastCall().times(closeCount); - replay(mockCtx); - + SlsbHome mockHome = mock(SlsbHome.class); + given(mockHome.create()).willReturn(ejbInstance); + Context mockCtx = mock(Context.class); + given(mockCtx.lookup("java:comp/env/" + jndiName)).willReturn(mockHome); return mockCtx; } @@ -88,33 +84,32 @@ public class SimpleRemoteSlsbInvokerInterceptorTests { @Test public void testPerformsLookup() throws Exception { - RemoteInterface ejb = createMock(RemoteInterface.class); - replay(ejb); + RemoteInterface ejb = mock(RemoteInterface.class); String jndiName= "foobar"; - Context mockContext = mockContext(jndiName, ejb, 1, 1, 1); + Context mockContext = mockContext(jndiName, ejb); SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName); configuredProxy(si, RemoteInterface.class); - verify(mockContext); + verify(mockContext).close(); } @Test public void testPerformsLookupWithAccessContext() throws Exception { - RemoteInterface ejb = createMock(RemoteInterface.class); - expect(ejb.targetMethod()).andReturn(null); - replay(ejb); + RemoteInterface ejb = mock(RemoteInterface.class); String jndiName= "foobar"; - Context mockContext = mockContext(jndiName, ejb, 1, 1, 2); + Context mockContext = mockContext(jndiName, ejb); SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName); si.setExposeAccessContext(true); RemoteInterface target = (RemoteInterface) configuredProxy(si, RemoteInterface.class); assertNull(target.targetMethod()); - verify(mockContext); + verify(mockContext, times(2)).close(); + verify(ejb).targetMethod(); + } @Test @@ -165,10 +160,8 @@ public class SimpleRemoteSlsbInvokerInterceptorTests { private void doTestInvokesMethodOnEjbInstance(boolean lookupHomeOnStartup, boolean cacheHome) throws Exception { Object retVal = new Object(); - final RemoteInterface ejb = createMock(RemoteInterface.class); - expect(ejb.targetMethod()).andReturn(retVal).times(2); - ejb.remove(); - replay(ejb); + final RemoteInterface ejb = mock(RemoteInterface.class); + given(ejb.targetMethod()).willReturn(retVal); int lookupCount = 1; if (!cacheHome) { @@ -179,7 +172,7 @@ public class SimpleRemoteSlsbInvokerInterceptorTests { } final String jndiName= "foobar"; - Context mockContext = mockContext(jndiName, ejb, 2, lookupCount, lookupCount); + Context mockContext = mockContext(jndiName, ejb); SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName); si.setLookupHomeOnStartup(lookupHomeOnStartup); @@ -189,19 +182,18 @@ public class SimpleRemoteSlsbInvokerInterceptorTests { assertTrue(target.targetMethod() == retVal); assertTrue(target.targetMethod() == retVal); - verify(mockContext, ejb); + verify(mockContext, times(lookupCount)).close(); + verify(ejb, times(2)).remove(); } @Test public void testInvokesMethodOnEjbInstanceWithHomeInterface() throws Exception { Object retVal = new Object(); - final RemoteInterface ejb = createMock(RemoteInterface.class); - expect(ejb.targetMethod()).andReturn(retVal); - ejb.remove(); - replay(ejb); + final RemoteInterface ejb = mock(RemoteInterface.class); + given(ejb.targetMethod()).willReturn(retVal); final String jndiName= "foobar"; - Context mockContext = mockContext(jndiName, ejb, 1, 1, 1); + Context mockContext = mockContext(jndiName, ejb); SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName); si.setHomeInterface(SlsbHome.class); @@ -209,18 +201,18 @@ public class SimpleRemoteSlsbInvokerInterceptorTests { RemoteInterface target = (RemoteInterface) configuredProxy(si, RemoteInterface.class); assertTrue(target.targetMethod() == retVal); - verify(mockContext, ejb); + verify(mockContext).close(); + verify(ejb).remove(); } @Test public void testInvokesMethodOnEjbInstanceWithRemoteException() throws Exception { - final RemoteInterface ejb = createMock(RemoteInterface.class); - expect(ejb.targetMethod()).andThrow(new RemoteException()); + final RemoteInterface ejb = mock(RemoteInterface.class); + given(ejb.targetMethod()).willThrow(new RemoteException()); ejb.remove(); - replay(ejb); final String jndiName= "foobar"; - Context mockContext = mockContext(jndiName, ejb, 1, 1, 1); + Context mockContext = mockContext(jndiName, ejb); SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName); @@ -233,7 +225,8 @@ public class SimpleRemoteSlsbInvokerInterceptorTests { // expected } - verify(mockContext, ejb); + verify(mockContext).close(); + verify(ejb, times(2)).remove(); } @Test @@ -259,11 +252,8 @@ public class SimpleRemoteSlsbInvokerInterceptorTests { private void doTestInvokesMethodOnEjbInstanceWithConnectExceptionWithRefresh( boolean lookupHomeOnStartup, boolean cacheHome) throws Exception { - final RemoteInterface ejb = createMock(RemoteInterface.class); - expect(ejb.targetMethod()).andThrow(new ConnectException("")).times(2); - ejb.remove(); - expectLastCall().times(2); - replay(ejb); + final RemoteInterface ejb = mock(RemoteInterface.class); + given(ejb.targetMethod()).willThrow(new ConnectException("")); int lookupCount = 2; if (!cacheHome) { @@ -274,7 +264,7 @@ public class SimpleRemoteSlsbInvokerInterceptorTests { } final String jndiName= "foobar"; - Context mockContext = mockContext(jndiName, ejb, 2, lookupCount, lookupCount); + Context mockContext = mockContext(jndiName, ejb); SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName); si.setRefreshHomeOnConnectFailure(true); @@ -290,37 +280,35 @@ public class SimpleRemoteSlsbInvokerInterceptorTests { // expected } - verify(mockContext, ejb); + verify(mockContext, times(lookupCount)).close(); + verify(ejb, times(2)).remove(); } @Test public void testInvokesMethodOnEjbInstanceWithBusinessInterface() throws Exception { Object retVal = new Object(); - final RemoteInterface ejb = createMock(RemoteInterface.class); - expect(ejb.targetMethod()).andReturn(retVal); - ejb.remove(); - replay(ejb); + final RemoteInterface ejb = mock(RemoteInterface.class); + given(ejb.targetMethod()).willReturn(retVal); final String jndiName= "foobar"; - Context mockContext = mockContext(jndiName, ejb, 1, 1, 1); + Context mockContext = mockContext(jndiName, ejb); SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName); BusinessInterface target = (BusinessInterface) configuredProxy(si, BusinessInterface.class); assertTrue(target.targetMethod() == retVal); - verify(mockContext, ejb); + verify(mockContext).close(); + verify(ejb).remove(); } @Test public void testInvokesMethodOnEjbInstanceWithBusinessInterfaceWithRemoteException() throws Exception { - final RemoteInterface ejb = createMock(RemoteInterface.class); - expect(ejb.targetMethod()).andThrow(new RemoteException()); - ejb.remove(); - replay(ejb); + final RemoteInterface ejb = mock(RemoteInterface.class); + given(ejb.targetMethod()).willThrow(new RemoteException()); final String jndiName= "foobar"; - Context mockContext = mockContext(jndiName, ejb, 1, 1, 1); + Context mockContext = mockContext(jndiName, ejb); SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName); @@ -333,7 +321,8 @@ public class SimpleRemoteSlsbInvokerInterceptorTests { // expected } - verify(mockContext, ejb); + verify(mockContext).close(); + verify(ejb).remove(); } @Test @@ -347,13 +336,11 @@ public class SimpleRemoteSlsbInvokerInterceptorTests { } private void doTestException(Exception expected) throws Exception { - final RemoteInterface ejb = createMock(RemoteInterface.class); - expect(ejb.targetMethod()).andThrow(expected); - ejb.remove(); - replay(ejb); + final RemoteInterface ejb = mock(RemoteInterface.class); + given(ejb.targetMethod()).willThrow(expected); final String jndiName= "foobar"; - Context mockContext = mockContext(jndiName, ejb, 1, 1, 1); + Context mockContext = mockContext(jndiName, ejb); SimpleRemoteSlsbInvokerInterceptor si = configuredInterceptor(mockContext, jndiName); @@ -366,7 +353,8 @@ public class SimpleRemoteSlsbInvokerInterceptorTests { assertTrue(thrown == expected); } - verify(mockContext, ejb); + verify(mockContext).close(); + verify(ejb).remove(); } diff --git a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java index dca93a798e5..527babf6030 100644 --- a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java @@ -16,8 +16,11 @@ package org.springframework.ejb.access; -import static org.easymock.EasyMock.*; import static org.junit.Assert.*; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyZeroInteractions; import java.lang.reflect.Proxy; import java.rmi.RemoteException; @@ -56,14 +59,11 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem final int value = 11; final String jndiName = "foo"; - MyEjb myEjb = createMock(MyEjb.class); - expect(myEjb.getValue()).andReturn(value); - myEjb.remove(); - replay(myEjb); + MyEjb myEjb = mock(MyEjb.class); + given(myEjb.getValue()).willReturn(value); - final MyHome home = createMock(MyHome.class); - expect(home.create()).andReturn(myEjb); - replay(home); + final MyHome home = mock(MyHome.class); + given(home.create()).willReturn(myEjb); JndiTemplate jt = new JndiTemplate() { @Override @@ -86,8 +86,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem MyBusinessMethods mbm = (MyBusinessMethods) fb.getObject(); assertTrue(Proxy.isProxyClass(mbm.getClass())); assertEquals("Returns expected value", value, mbm.getValue()); - verify(myEjb); - verify(home); + verify(myEjb).remove(); } @Test @@ -95,9 +94,8 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem final int value = 11; final String jndiName = "foo"; - final MyEjb myEjb = createMock(MyEjb.class); - expect(myEjb.getValue()).andReturn(value); - replay(myEjb); + final MyEjb myEjb = mock(MyEjb.class); + given(myEjb.getValue()).willReturn(value); JndiTemplate jt = new JndiTemplate() { @Override @@ -120,7 +118,6 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem MyBusinessMethods mbm = (MyBusinessMethods) fb.getObject(); assertTrue(Proxy.isProxyClass(mbm.getClass())); assertEquals("Returns expected value", value, mbm.getValue()); - verify(myEjb); } @Override @@ -129,16 +126,13 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem final RemoteException rex = new RemoteException(); final String jndiName = "foo"; - MyEjb myEjb = createMock(MyEjb.class); - expect(myEjb.getValue()).andThrow(rex); + MyEjb myEjb = mock(MyEjb.class); + given(myEjb.getValue()).willThrow(rex); // TODO might want to control this behaviour... // Do we really want to call remove after a remote exception? - myEjb.remove(); - replay(myEjb); - final MyHome home = createMock(MyHome.class); - expect(home.create()).andReturn(myEjb); - replay(home); + final MyHome home = mock(MyHome.class); + given(home.create()).willReturn(myEjb); JndiTemplate jt = new JndiTemplate() { @Override @@ -167,8 +161,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem catch (RemoteException ex) { assertSame("Threw expected RemoteException", rex, ex); } - verify(myEjb); - verify(home); + verify(myEjb).remove(); } @Test @@ -176,9 +169,8 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem final String jndiName = "foo"; final CreateException cex = new CreateException(); - final MyHome home = createMock(MyHome.class); - expect(home.create()).andThrow(cex); - replay(home); + final MyHome home = mock(MyHome.class); + given(home.create()).willThrow(cex); JndiTemplate jt = new JndiTemplate() { @Override @@ -209,8 +201,6 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem catch (RemoteException ex) { // expected } - - verify(home); } @Test @@ -218,9 +208,8 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem final String jndiName = "foo"; final CreateException cex = new CreateException(); - final MyHome home = createMock(MyHome.class); - expect(home.create()).andThrow(cex); - replay(home); + final MyHome home = mock(MyHome.class); + given(home.create()).willThrow(cex); JndiTemplate jt = new JndiTemplate() { @Override @@ -251,8 +240,6 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem catch (RemoteAccessException ex) { assertTrue(ex.getCause() == cex); } - - verify(home); } @Test @@ -261,8 +248,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem // Could actually try to figure out interface from create? final String jndiName = "foo"; - final MyHome home = createMock(MyHome.class); - replay(home); + final MyHome home = mock(MyHome.class); JndiTemplate jt = new JndiTemplate() { @Override @@ -292,7 +278,7 @@ public class SimpleRemoteStatelessSessionProxyFactoryBeanTests extends SimpleRem } // Expect no methods on home - verify(home); + verifyZeroInteractions(home); } diff --git a/spring-context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java b/spring-context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java index db49e67a1be..7867139ae31 100644 --- a/spring-context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java +++ b/spring-context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java @@ -16,154 +16,136 @@ package org.springframework.instrument.classloading.glassfish; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.fail; - -import java.lang.instrument.ClassFileTransformer; -import java.net.URL; -import java.net.URLClassLoader; -import java.security.SecureClassLoader; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import javax.persistence.spi.ClassTransformer; - -import org.easymock.ArgumentsMatcher; -import org.easymock.MockControl; -import org.junit.After; -import org.junit.Before; import org.junit.Ignore; -import org.junit.Test; -import org.springframework.instrument.classloading.LoadTimeWeaver; // converting away from old-style EasyMock APIs was problematic with this class +// glassfish dependencies no longer on classpath @SuppressWarnings("deprecation") @Ignore public class GlassFishLoadTimeWeaverTests { - private MockControl loaderCtrl; - private GlassFishClassLoaderAdapter loader; - private LoadTimeWeaver ltw; - - private class DummyInstrumentableClassLoader extends SecureClassLoader { - - String INSTR_CL_NAME = GlassFishClassLoaderAdapter.INSTRUMENTABLE_CLASSLOADER_GLASSFISH_V2; - - public DummyInstrumentableClassLoader() { - super(); - } - - public DummyInstrumentableClassLoader(ClassLoader parent) { - super(parent); - } - - private List v2Transformers = new ArrayList(); - private List v3Transformers = new ArrayList(); - - public void addTransformer(ClassTransformer transformer) { - v2Transformers.add(transformer); - } - - public void addTransformer(ClassFileTransformer transformer) { - v3Transformers.add(transformer); - } - - public ClassLoader copy() { - return new DummyInstrumentableClassLoader(); - } - - @Override - public Class loadClass(String name) throws ClassNotFoundException { - if (INSTR_CL_NAME.equals(name)) { - return this.getClass(); - } - - return getClass().getClassLoader().loadClass(name); - } - } - - @Before - public void setUp() throws Exception { - ltw = new GlassFishLoadTimeWeaver(new DummyInstrumentableClassLoader()); - } - - @After - public void tearDown() throws Exception { - loaderCtrl.verify(); - ltw = null; - } - - @Test - public void testGlassFishLoadTimeWeaver() { - try { - ltw = new GlassFishLoadTimeWeaver(); - fail("expected exception"); - } catch (IllegalArgumentException ex) { - // expected - } - - } - - @Test - public void testGlassFishLoadTimeWeaverClassLoader() { - try { - ltw = new GlassFishLoadTimeWeaver(null); - fail("expected exception"); - } catch (RuntimeException e) { - // expected - } - - ClassLoader cl1 = new URLClassLoader(new URL[0]); - ClassLoader cl2 = new URLClassLoader(new URL[0], cl1); - ClassLoader cl3 = new DummyInstrumentableClassLoader(cl2); - ClassLoader cl4 = new URLClassLoader(new URL[0], cl3); - - ltw = new GlassFishLoadTimeWeaver(cl4); - assertSame(cl3, ltw.getInstrumentableClassLoader()); - - cl1 = new URLClassLoader(new URL[0]); - cl2 = new URLClassLoader(new URL[0], cl1); - cl3 = new DummyInstrumentableClassLoader(cl2); - cl4 = new DummyInstrumentableClassLoader(cl3); - - ltw = new GlassFishLoadTimeWeaver(cl4); - assertSame(cl4, ltw.getInstrumentableClassLoader()); - } - - @Test - public void testAddTransformer() { - ClassFileTransformer transformer = MockControl.createNiceControl(ClassFileTransformer.class).getMock(); - loaderCtrl.reset(); - loader.addTransformer(transformer); - loaderCtrl.setMatcher(new ArgumentsMatcher() { - - public boolean matches(Object[] arg0, Object[] arg1) { - for (int i = 0; i < arg0.length; i++) { - if (arg0 != null && arg0.getClass() != arg1.getClass()) - return false; - } - return true; - } - - public String toString(Object[] arg0) { - return Arrays.toString(arg0); - } - - }); - - loaderCtrl.replay(); - - ltw.addTransformer(transformer); - } - - @Test - public void testGetThrowawayClassLoader() { - loaderCtrl.reset(); - ClassLoader cl = new URLClassLoader(new URL[0]); - loaderCtrl.expectAndReturn(loader.getClassLoader(), cl); - loaderCtrl.replay(); - - assertSame(ltw.getThrowawayClassLoader(), cl); - } -} \ No newline at end of file +// private MockControl loaderCtrl; +// private GlassFishClassLoaderAdapter loader; +// private LoadTimeWeaver ltw; +// +// private class DummyInstrumentableClassLoader extends SecureClassLoader { +// +// String INSTR_CL_NAME = GlassFishClassLoaderAdapter.INSTRUMENTABLE_CLASSLOADER_GLASSFISH_V2; +// +// public DummyInstrumentableClassLoader() { +// super(); +// } +// +// public DummyInstrumentableClassLoader(ClassLoader parent) { +// super(parent); +// } +// +// private List v2Transformers = new ArrayList(); +// private List v3Transformers = new ArrayList(); +// +// public void addTransformer(ClassTransformer transformer) { +// v2Transformers.add(transformer); +// } +// +// public void addTransformer(ClassFileTransformer transformer) { +// v3Transformers.add(transformer); +// } +// +// public ClassLoader copy() { +// return new DummyInstrumentableClassLoader(); +// } +// +// @Override +// public Class loadClass(String name) throws ClassNotFoundException { +// if (INSTR_CL_NAME.equals(name)) { +// return this.getClass(); +// } +// +// return getClass().getClassLoader().loadClass(name); +// } +// } +// +// @Before +// public void setUp() throws Exception { +// ltw = new GlassFishLoadTimeWeaver(new DummyInstrumentableClassLoader()); +// } +// +// @After +// public void tearDown() throws Exception { +// loaderCtrl.verify(); +// ltw = null; +// } +// +// @Test +// public void testGlassFishLoadTimeWeaver() { +// try { +// ltw = new GlassFishLoadTimeWeaver(); +// fail("expected exception"); +// } catch (IllegalArgumentException ex) { +// // expected +// } +// +// } +// +// @Test +// public void testGlassFishLoadTimeWeaverClassLoader() { +// try { +// ltw = new GlassFishLoadTimeWeaver(null); +// fail("expected exception"); +// } catch (RuntimeException e) { +// // expected +// } +// +// ClassLoader cl1 = new URLClassLoader(new URL[0]); +// ClassLoader cl2 = new URLClassLoader(new URL[0], cl1); +// ClassLoader cl3 = new DummyInstrumentableClassLoader(cl2); +// ClassLoader cl4 = new URLClassLoader(new URL[0], cl3); +// +// ltw = new GlassFishLoadTimeWeaver(cl4); +// assertSame(cl3, ltw.getInstrumentableClassLoader()); +// +// cl1 = new URLClassLoader(new URL[0]); +// cl2 = new URLClassLoader(new URL[0], cl1); +// cl3 = new DummyInstrumentableClassLoader(cl2); +// cl4 = new DummyInstrumentableClassLoader(cl3); +// +// ltw = new GlassFishLoadTimeWeaver(cl4); +// assertSame(cl4, ltw.getInstrumentableClassLoader()); +// } +// +// @Test +// public void testAddTransformer() { +// ClassFileTransformer transformer = MockControl.createNiceControl(ClassFileTransformer.class).getMock(); +// loaderCtrl.reset(); +// loader.addTransformer(transformer); +// loaderCtrl.setMatcher(new ArgumentsMatcher() { +// +// public boolean matches(Object[] arg0, Object[] arg1) { +// for (int i = 0; i < arg0.length; i++) { +// if (arg0 != null && arg0.getClass() != arg1.getClass()) +// return false; +// } +// return true; +// } +// +// public String toString(Object[] arg0) { +// return Arrays.toString(arg0); +// } +// +// }); +// +// loaderCtrl.replay(); +// +// ltw.addTransformer(transformer); +// } +// +// @Test +// public void testGetThrowawayClassLoader() { +// loaderCtrl.reset(); +// ClassLoader cl = new URLClassLoader(new URL[0]); +// loaderCtrl.expectAndReturn(loader.getClassLoader(), cl); +// loaderCtrl.replay(); +// +// assertSame(ltw.getThrowawayClassLoader(), cl); +// } +} diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java index fbc8e6221ee..6244e0fae61 100644 --- a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java @@ -16,8 +16,11 @@ package org.springframework.jndi; -import static org.easymock.EasyMock.*; import static org.junit.Assert.*; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; import javax.naming.Context; import javax.naming.NamingException; @@ -383,11 +386,8 @@ public class JndiObjectFactoryBeanTests { public void testLookupWithExposeAccessContext() throws Exception { JndiObjectFactoryBean jof = new JndiObjectFactoryBean(); TestBean tb = new TestBean(); - final Context mockCtx = createMock(Context.class); - expect(mockCtx.lookup("foo")).andReturn(tb); - mockCtx.close(); - expectLastCall().times(2); - replay(mockCtx); + final Context mockCtx = mock(Context.class); + given(mockCtx.lookup("foo")).willReturn(tb); jof.setJndiTemplate(new JndiTemplate() { @Override protected Context createInitialContext() { @@ -406,7 +406,7 @@ public class JndiObjectFactoryBeanTests { proxy.equals(proxy); proxy.hashCode(); proxy.toString(); - verify(mockCtx); + verify(mockCtx, times(2)).close(); } } diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java index f4fbd094534..bf98aa1adc7 100644 --- a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java +++ b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java @@ -16,8 +16,10 @@ package org.springframework.jndi; -import static org.easymock.EasyMock.*; import static org.junit.Assert.*; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import javax.naming.Context; import javax.naming.NameNotFoundException; @@ -36,10 +38,8 @@ public class JndiTemplateTests { public void testLookupSucceeds() throws Exception { Object o = new Object(); String name = "foo"; - final Context context = createMock(Context.class); - expect(context.lookup(name)).andReturn(o); - context.close(); - replay(context); + final Context context = mock(Context.class); + given(context.lookup(name)).willReturn(o); JndiTemplate jt = new JndiTemplate() { @Override @@ -50,17 +50,15 @@ public class JndiTemplateTests { Object o2 = jt.lookup(name); assertEquals(o, o2); - verify(context); + verify(context).close(); } @Test public void testLookupFails() throws Exception { NameNotFoundException ne = new NameNotFoundException(); String name = "foo"; - final Context context = createMock(Context.class); - expect(context.lookup(name)).andThrow(ne); - context.close(); - replay(context); + final Context context = mock(Context.class); + given(context.lookup(name)).willThrow(ne); JndiTemplate jt = new JndiTemplate() { @Override @@ -76,16 +74,14 @@ public class JndiTemplateTests { catch (NameNotFoundException ex) { // Ok } - verify(context); + verify(context).close(); } @Test public void testLookupReturnsNull() throws Exception { String name = "foo"; - final Context context = createMock(Context.class); - expect(context.lookup(name)).andReturn(null); - context.close(); - replay(context); + final Context context = mock(Context.class); + given(context.lookup(name)).willReturn(null); JndiTemplate jt = new JndiTemplate() { @Override @@ -101,17 +97,15 @@ public class JndiTemplateTests { catch (NameNotFoundException ex) { // Ok } - verify(context); + verify(context).close(); } @Test public void testLookupFailsWithTypeMismatch() throws Exception { Object o = new Object(); String name = "foo"; - final Context context = createMock(Context.class); - expect(context.lookup(name)).andReturn(o); - context.close(); - replay(context); + final Context context = mock(Context.class); + given(context.lookup(name)).willReturn(o); JndiTemplate jt = new JndiTemplate() { @Override @@ -127,17 +121,14 @@ public class JndiTemplateTests { catch (TypeMismatchNamingException ex) { // Ok } - verify(context); + verify(context).close(); } @Test public void testBind() throws Exception { Object o = new Object(); String name = "foo"; - final Context context = createMock(Context.class); - context.bind(name, o); - context.close(); - replay(context); + final Context context = mock(Context.class); JndiTemplate jt = new JndiTemplate() { @Override @@ -147,17 +138,15 @@ public class JndiTemplateTests { }; jt.bind(name, o); - verify(context); + verify(context).bind(name, o); + verify(context).close(); } @Test public void testRebind() throws Exception { Object o = new Object(); String name = "foo"; - final Context context = createMock(Context.class); - context.rebind(name, o); - context.close(); - replay(context); + final Context context = mock(Context.class); JndiTemplate jt = new JndiTemplate() { @Override @@ -167,16 +156,15 @@ public class JndiTemplateTests { }; jt.rebind(name, o); - verify(context); + verify(context).rebind(name, o); + verify(context).close(); +; } @Test public void testUnbind() throws Exception { String name = "something"; - final Context context = createMock(Context.class); - context.unbind(name); - context.close(); - replay(context); + final Context context = mock(Context.class); JndiTemplate jt = new JndiTemplate() { @Override @@ -186,7 +174,8 @@ public class JndiTemplateTests { }; jt.unbind(name); - verify(context); + verify(context).unbind(name); + verify(context).close(); } } diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java index 08825992187..4808b1011a5 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java @@ -19,21 +19,20 @@ package org.springframework.scheduling.concurrent; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; +import static org.mockito.BDDMockito.willThrow; +import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; import java.util.concurrent.RejectedExecutionHandler; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ThreadFactory; -import junit.framework.AssertionFailedError; - -import org.easymock.MockControl; import org.junit.Ignore; import org.junit.Test; import org.springframework.core.task.NoOpRunnable; -import static org.mockito.Mockito.*; - - /** * @author Rick Evans * @author Juergen Hoeller @@ -58,11 +57,7 @@ public class ScheduledExecutorFactoryBeanTests { @Test @SuppressWarnings("serial") public void testShutdownNowIsPropagatedToTheExecutorOnDestroy() throws Exception { - MockControl mockScheduledExecutorService = MockControl.createNiceControl(ScheduledExecutorService.class); - final ScheduledExecutorService executor = (ScheduledExecutorService) mockScheduledExecutorService.getMock(); - executor.shutdownNow(); - mockScheduledExecutorService.setReturnValue(null); - mockScheduledExecutorService.replay(); + final ScheduledExecutorService executor = mock(ScheduledExecutorService.class); ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() { @Override @@ -76,17 +71,13 @@ public class ScheduledExecutorFactoryBeanTests { factory.afterPropertiesSet(); factory.destroy(); - mockScheduledExecutorService.verify(); + verify(executor).shutdownNow(); } @Test @SuppressWarnings("serial") public void testShutdownIsPropagatedToTheExecutorOnDestroy() throws Exception { - MockControl mockScheduledExecutorService = MockControl.createNiceControl(ScheduledExecutorService.class); - final ScheduledExecutorService executor = (ScheduledExecutorService) mockScheduledExecutorService.getMock(); - executor.shutdown(); - mockScheduledExecutorService.setVoidCallable(); - mockScheduledExecutorService.replay(); + final ScheduledExecutorService executor = mock(ScheduledExecutorService.class); ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean() { @Override @@ -101,16 +92,12 @@ public class ScheduledExecutorFactoryBeanTests { factory.afterPropertiesSet(); factory.destroy(); - mockScheduledExecutorService.verify(); + verify(executor).shutdown(); } @Test public void testOneTimeExecutionIsSetUpAndFiresCorrectly() throws Exception { - MockControl mockRunnable = MockControl.createControl(Runnable.class); - Runnable runnable = (Runnable) mockRunnable.getMock(); - runnable.run(); - mockRunnable.setVoidCallable(); - mockRunnable.replay(); + Runnable runnable = mock(Runnable.class); ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean(); factory.setScheduledExecutorTasks(new ScheduledExecutorTask[]{ @@ -120,18 +107,12 @@ public class ScheduledExecutorFactoryBeanTests { pauseToLetTaskStart(1); factory.destroy(); - mockRunnable.verify(); + verify(runnable).run(); } @Test public void testFixedRepeatedExecutionIsSetUpAndFiresCorrectly() throws Exception { - MockControl mockRunnable = MockControl.createControl(Runnable.class); - Runnable runnable = (Runnable) mockRunnable.getMock(); - runnable.run(); - mockRunnable.setVoidCallable(); - runnable.run(); - mockRunnable.setVoidCallable(); - mockRunnable.replay(); + Runnable runnable = mock(Runnable.class); ScheduledExecutorTask task = new ScheduledExecutorTask(runnable); task.setPeriod(500); @@ -143,18 +124,13 @@ public class ScheduledExecutorFactoryBeanTests { pauseToLetTaskStart(2); factory.destroy(); - mockRunnable.verify(); + verify(runnable, atLeast(2)).run(); } @Test public void testFixedRepeatedExecutionIsSetUpAndFiresCorrectlyAfterException() throws Exception { - MockControl mockRunnable = MockControl.createControl(Runnable.class); - Runnable runnable = (Runnable) mockRunnable.getMock(); - runnable.run(); - mockRunnable.setThrowable(new IllegalStateException()); - runnable.run(); - mockRunnable.setThrowable(new IllegalStateException()); - mockRunnable.replay(); + Runnable runnable = mock(Runnable.class); + willThrow(new IllegalStateException()).given(runnable).run(); ScheduledExecutorTask task = new ScheduledExecutorTask(runnable); task.setPeriod(500); @@ -167,19 +143,13 @@ public class ScheduledExecutorFactoryBeanTests { pauseToLetTaskStart(2); factory.destroy(); - mockRunnable.verify(); + verify(runnable, atLeast(2)).run(); } @Ignore @Test public void testWithInitialDelayRepeatedExecutionIsSetUpAndFiresCorrectly() throws Exception { - MockControl mockRunnable = MockControl.createControl(Runnable.class); - Runnable runnable = (Runnable) mockRunnable.getMock(); - runnable.run(); - mockRunnable.setVoidCallable(); - runnable.run(); - mockRunnable.setVoidCallable(); - mockRunnable.replay(); + Runnable runnable = mock(Runnable.class); ScheduledExecutorTask task = new ScheduledExecutorTask(runnable); task.setPeriod(500); @@ -192,24 +162,15 @@ public class ScheduledExecutorFactoryBeanTests { // invoke destroy before tasks have even been scheduled... factory.destroy(); - try { - mockRunnable.verify(); - fail("Mock must never have been called"); - } - catch (AssertionFailedError expected) { - } + // Mock must never have been called + verify(runnable, never()).run(); } @Ignore @Test public void testWithInitialDelayRepeatedExecutionIsSetUpAndFiresCorrectlyAfterException() throws Exception { - MockControl mockRunnable = MockControl.createControl(Runnable.class); - Runnable runnable = (Runnable) mockRunnable.getMock(); - runnable.run(); - mockRunnable.setThrowable(new IllegalStateException()); - runnable.run(); - mockRunnable.setThrowable(new IllegalStateException()); - mockRunnable.replay(); + Runnable runnable = mock(Runnable.class); + willThrow(new IllegalStateException()).given(runnable).run(); ScheduledExecutorTask task = new ScheduledExecutorTask(runnable); task.setPeriod(500); @@ -223,12 +184,8 @@ public class ScheduledExecutorFactoryBeanTests { // invoke destroy before tasks have even been scheduled... factory.destroy(); - try { - mockRunnable.verify(); - fail("Mock must never have been called"); - } - catch (AssertionFailedError expected) { - } + // Mock must never have been called + verify(runnable, never()).run(); } @Test diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java index 90582292d41..01a4f6a78cc 100644 --- a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java @@ -16,11 +16,13 @@ package org.springframework.scripting.bsh; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; + import java.util.Arrays; import java.util.Collection; import junit.framework.TestCase; -import org.easymock.MockControl; import org.springframework.aop.support.AopUtils; import org.springframework.aop.target.dynamic.Refreshable; @@ -189,14 +191,10 @@ public class BshScriptFactoryTests extends TestCase { } public void testScriptThatCompilesButIsJustPlainBad() throws Exception { - MockControl mock = MockControl.createControl(ScriptSource.class); - ScriptSource script = (ScriptSource) mock.getMock(); - script.getScriptAsString(); + ScriptSource script = mock(ScriptSource.class); final String badScript = "String getMessage() { throw new IllegalArgumentException(); }"; - mock.setReturnValue(badScript); - script.isModified(); - mock.setReturnValue(true); - mock.replay(); + given(script.getScriptAsString()).willReturn(badScript); + given(script.isModified()).willReturn(true); BshScriptFactory factory = new BshScriptFactory( ScriptFactoryPostProcessor.INLINE_SCRIPT_PREFIX + badScript, new Class[] {Messenger.class}); @@ -207,7 +205,6 @@ public class BshScriptFactoryTests extends TestCase { } catch (BshScriptUtils.BshExecutionException expected) { } - mock.verify(); } public void testCtorWithNullScriptSourceLocator() throws Exception { diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java index f142c6bcc18..9aa2b1436bf 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java @@ -23,6 +23,8 @@ import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; import groovy.lang.DelegatingMetaClass; import groovy.lang.GroovyObject; @@ -30,7 +32,6 @@ import java.io.FileNotFoundException; import java.util.Arrays; import java.util.Map; -import org.easymock.EasyMock; import org.junit.Ignore; import org.junit.Test; import org.springframework.aop.support.AopUtils; @@ -193,11 +194,10 @@ public class GroovyScriptFactoryTests { @Test public void testScriptedClassThatDoesNotHaveANoArgCtor() throws Exception { - ScriptSource script = EasyMock.createMock(ScriptSource.class); + ScriptSource script = mock(ScriptSource.class); final String badScript = "class Foo { public Foo(String foo) {}}"; - EasyMock.expect(script.getScriptAsString()).andReturn(badScript); - EasyMock.expect(script.suggestedClassName()).andReturn("someName"); - EasyMock.replay(script); + given(script.getScriptAsString()).willReturn(badScript); + given(script.suggestedClassName()).willReturn("someName"); GroovyScriptFactory factory = new GroovyScriptFactory(ScriptFactoryPostProcessor.INLINE_SCRIPT_PREFIX + badScript); try { @@ -206,16 +206,14 @@ public class GroovyScriptFactoryTests { } catch (ScriptCompilationException expected) { assertTrue(expected.contains(InstantiationException.class)); } - EasyMock.verify(script); } @Test public void testScriptedClassThatHasNoPublicNoArgCtor() throws Exception { - ScriptSource script = EasyMock.createMock(ScriptSource.class); + ScriptSource script = mock(ScriptSource.class); final String badScript = "class Foo { protected Foo() {}}"; - EasyMock.expect(script.getScriptAsString()).andReturn(badScript); - EasyMock.expect(script.suggestedClassName()).andReturn("someName"); - EasyMock.replay(script); + given(script.getScriptAsString()).willReturn(badScript); + given(script.suggestedClassName()).willReturn("someName"); GroovyScriptFactory factory = new GroovyScriptFactory(ScriptFactoryPostProcessor.INLINE_SCRIPT_PREFIX + badScript); try { @@ -224,7 +222,6 @@ public class GroovyScriptFactoryTests { } catch (ScriptCompilationException expected) { assertTrue(expected.contains(IllegalAccessException.class)); } - EasyMock.verify(script); } @Test @@ -290,15 +287,13 @@ public class GroovyScriptFactoryTests { @Test public void testGetScriptedObjectDoesNotChokeOnNullInterfacesBeingPassedIn() throws Exception { - ScriptSource script = EasyMock.createMock(ScriptSource.class); - EasyMock.expect(script.getScriptAsString()).andReturn("class Bar {}"); - EasyMock.expect(script.suggestedClassName()).andReturn("someName"); - EasyMock.replay(script); + ScriptSource script = mock(ScriptSource.class); + given(script.getScriptAsString()).willReturn("class Bar {}"); + given(script.suggestedClassName()).willReturn("someName"); GroovyScriptFactory factory = new GroovyScriptFactory("a script source locator (doesn't matter here)"); Object scriptedObject = factory.getScriptedObject(script, null); assertNotNull(scriptedObject); - EasyMock.verify(script); } @Test diff --git a/spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java b/spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java index dd39e655765..12b3496757f 100644 --- a/spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java @@ -16,8 +16,8 @@ package org.springframework.scripting.support; +import static org.mockito.Mockito.mock; import junit.framework.TestCase; -import org.easymock.MockControl; import org.springframework.beans.factory.BeanFactory; @@ -27,15 +27,12 @@ import org.springframework.beans.factory.BeanFactory; public class RefreshableScriptTargetSourceTests extends TestCase { public void testCreateWithNullScriptSource() throws Exception { - MockControl mockFactory = MockControl.createNiceControl(BeanFactory.class); - mockFactory.replay(); try { - new RefreshableScriptTargetSource((BeanFactory) mockFactory.getMock(), "a.bean", null, null, false); + new RefreshableScriptTargetSource(mock(BeanFactory.class), "a.bean", null, null, false); fail("Must have failed when passed a null ScriptSource."); } catch (IllegalArgumentException expected) { } - mockFactory.verify(); } } diff --git a/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java b/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java index d77ff160840..5303be385a9 100644 --- a/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java @@ -16,12 +16,14 @@ package org.springframework.scripting.support; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; + import java.io.ByteArrayInputStream; import java.io.IOException; import junit.framework.TestCase; -import org.easymock.MockControl; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; @@ -41,43 +43,29 @@ public class ResourceScriptSourceTests extends TestCase { } public void testDoesNotPropagateFatalExceptionOnResourceThatCannotBeResolvedToAFile() throws Exception { - MockControl mock = MockControl.createControl(Resource.class); - Resource resource = (Resource) mock.getMock(); - resource.lastModified(); - mock.setThrowable(new IOException()); - mock.replay(); + Resource resource = mock(Resource.class); + given(resource.lastModified()).willThrow(new IOException()); ResourceScriptSource scriptSource = new ResourceScriptSource(resource); long lastModified = scriptSource.retrieveLastModifiedTime(); assertEquals(0, lastModified); - mock.verify(); } public void testBeginsInModifiedState() throws Exception { - MockControl mock = MockControl.createControl(Resource.class); - Resource resource = (Resource) mock.getMock(); - mock.replay(); - + Resource resource = mock(Resource.class); ResourceScriptSource scriptSource = new ResourceScriptSource(resource); assertTrue(scriptSource.isModified()); - mock.verify(); } public void testLastModifiedWorksWithResourceThatDoesNotSupportFileBasedReading() throws Exception { - MockControl mock = MockControl.createControl(Resource.class); - Resource resource = (Resource) mock.getMock(); + Resource resource = mock(Resource.class); // underlying File is asked for so that the last modified time can be checked... - resource.lastModified(); - mock.setReturnValue(100, 2); + // And then mock the file changing; i.e. the File says it has been modified + given(resource.lastModified()).willReturn(100L, 100L, 200L); // does not support File-based reading; delegates to InputStream-style reading... //resource.getFile(); //mock.setThrowable(new FileNotFoundException()); - resource.getInputStream(); - mock.setReturnValue(new ByteArrayInputStream(new byte[0])); - // And then mock the file changing; i.e. the File says it has been modified - resource.lastModified(); - mock.setReturnValue(200); - mock.replay(); + given(resource.getInputStream()).willReturn(new ByteArrayInputStream(new byte[0])); ResourceScriptSource scriptSource = new ResourceScriptSource(resource); assertTrue("ResourceScriptSource must start off in the 'isModified' state (it obviously isn't).", scriptSource.isModified()); @@ -85,7 +73,6 @@ public class ResourceScriptSourceTests extends TestCase { assertFalse("ResourceScriptSource must not report back as being modified if the underlying File resource is not reporting a changed lastModified time.", scriptSource.isModified()); // Must now report back as having been modified assertTrue("ResourceScriptSource must report back as being modified if the underlying File resource is reporting a changed lastModified time.", scriptSource.isModified()); - mock.verify(); } public void testLastModifiedWorksWithResourceThatDoesNotSupportFileBasedAccessAtAll() throws Exception { diff --git a/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java index db4323a318d..7b6b40b2581 100644 --- a/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java @@ -16,8 +16,8 @@ package org.springframework.scripting.support; +import static org.mockito.Mockito.mock; import junit.framework.TestCase; -import org.easymock.MockControl; import org.springframework.beans.FatalBeanException; import org.springframework.beans.factory.BeanFactory; @@ -75,15 +75,12 @@ public class ScriptFactoryPostProcessorTests extends TestCase { } public void testThrowsExceptionIfGivenNonAbstractBeanFactoryImplementation() throws Exception { - MockControl mock = MockControl.createControl(BeanFactory.class); - mock.replay(); try { - new ScriptFactoryPostProcessor().setBeanFactory((BeanFactory) mock.getMock()); + new ScriptFactoryPostProcessor().setBeanFactory(mock(BeanFactory.class)); fail("Must have thrown exception by this point."); } catch (IllegalStateException expected) { } - mock.verify(); } public void testChangeScriptWithRefreshableBeanFunctionality() throws Exception { diff --git a/spring-core/src/test/java/org/springframework/build/test/mockito/MockitoUtils.java b/spring-core/src/test/java/org/springframework/build/test/mockito/MockitoUtils.java new file mode 100644 index 00000000000..63d45249872 --- /dev/null +++ b/spring-core/src/test/java/org/springframework/build/test/mockito/MockitoUtils.java @@ -0,0 +1,88 @@ +/* + * Copyright 2002-2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.build.test.mockito; + +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; + +import java.util.List; + +import org.mockito.Mockito; +import org.mockito.internal.util.MockUtil; +import org.mockito.invocation.Invocation; + +/** + * General test utilities for use with {@link Mockito}. + * + * @author Phillip Webb + */ +public class MockitoUtils { + + private static MockUtil mockUtil = new MockUtil(); + + /** + * Verify the same invocations have been applied to two mocks. This is generally not + * the preferred way test with mockito and should be avoided if possible. + * @param expected the mock containing expected invocations + * @param actual the mock containing actual invocations + * @param argumentAdapters adapters that can be used to change argument values before + * they are compared + */ + public static void verifySameInvocations(T expected, T actual, InvocationArgumentsAdapter... argumentAdapters) { + List expectedInvocations = mockUtil.getMockHandler(expected).getInvocationContainer().getInvocations(); + List actualInvocations = mockUtil.getMockHandler(actual).getInvocationContainer().getInvocations(); + verifySameInvocations(expectedInvocations, actualInvocations, argumentAdapters); + } + + private static void verifySameInvocations(List expectedInvocations, List actualInvocations, InvocationArgumentsAdapter... argumentAdapters) { + assertThat(expectedInvocations.size(), is(equalTo(actualInvocations.size()))); + for (int i = 0; i < expectedInvocations.size(); i++) { + verifySameInvocation(expectedInvocations.get(i), actualInvocations.get(i), argumentAdapters); + } + } + + private static void verifySameInvocation(Invocation expectedInvocation, Invocation actualInvocation, InvocationArgumentsAdapter... argumentAdapters) { + System.out.println(expectedInvocation); + System.out.println(actualInvocation); + assertThat(expectedInvocation.getMethod(), is(equalTo(actualInvocation.getMethod()))); + Object[] expectedArguments = getInvocationArguments(expectedInvocation, argumentAdapters); + Object[] actualArguments = getInvocationArguments(actualInvocation, argumentAdapters); + assertThat(expectedArguments, is(equalTo(actualArguments))); + } + + private static Object[] getInvocationArguments(Invocation invocation, InvocationArgumentsAdapter... argumentAdapters) { + Object[] arguments = invocation.getArguments(); + for (InvocationArgumentsAdapter adapter : argumentAdapters) { + arguments = adapter.adaptArguments(arguments); + } + return arguments; + } + + /** + * Adapter strategy that can be used to change invocation arguments. + */ + public static interface InvocationArgumentsAdapter { + + /** + * Change the arguments if required + * @param arguments the source arguments + * @return updated or original arguments (never {@code null}) + */ + Object[] adaptArguments(Object[] arguments); + } +} diff --git a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java index 3ab6a1655b8..d160d596f72 100644 --- a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java +++ b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java @@ -16,347 +16,228 @@ package org.springframework.util.xml; -import java.io.IOException; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.mock; + import java.io.InputStream; -import java.util.Arrays; + import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; -import org.easymock.AbstractMatcher; -import org.easymock.MockControl; import org.junit.Before; import org.junit.Test; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; +import org.springframework.build.test.mockito.MockitoUtils; +import org.springframework.build.test.mockito.MockitoUtils.InvocationArgumentsAdapter; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.Resource; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.InputSource; import org.xml.sax.Locator; -import org.xml.sax.SAXException; import org.xml.sax.XMLReader; import org.xml.sax.ext.LexicalHandler; import org.xml.sax.helpers.AttributesImpl; import org.xml.sax.helpers.XMLReaderFactory; -import org.springframework.core.io.ClassPathResource; -import org.springframework.core.io.Resource; - public abstract class AbstractStaxXMLReaderTestCase { protected static XMLInputFactory inputFactory; private XMLReader standardReader; - private MockControl contentHandlerControl; - - private ContentHandler contentHandler; + private ContentHandler standardContentHandler; @Before public void setUp() throws Exception { inputFactory = XMLInputFactory.newInstance(); standardReader = XMLReaderFactory.createXMLReader(); - contentHandlerControl = MockControl.createStrictControl(ContentHandler.class); - contentHandlerControl.setDefaultMatcher(new SaxArgumentMatcher()); - ContentHandler contentHandlerMock = (ContentHandler) contentHandlerControl.getMock(); - contentHandler = new CopyingContentHandler(contentHandlerMock); - standardReader.setContentHandler(contentHandler); - } - - private InputStream createTestInputStream() { - return getClass().getResourceAsStream("testContentHandler.xml"); + standardContentHandler = mockContentHandler(); + standardReader.setContentHandler(standardContentHandler); } @Test - public void contentHandlerNamespacesNoPrefixes() throws SAXException, IOException, XMLStreamException { + public void contentHandlerNamespacesNoPrefixes() throws Exception { standardReader.setFeature("http://xml.org/sax/features/namespaces", true); standardReader.setFeature("http://xml.org/sax/features/namespace-prefixes", false); - standardReader.parse(new InputSource(createTestInputStream())); - contentHandlerControl.replay(); AbstractStaxXMLReader staxXmlReader = createStaxXmlReader(createTestInputStream()); + ContentHandler contentHandler = mockContentHandler(); staxXmlReader.setFeature("http://xml.org/sax/features/namespaces", true); staxXmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", false); - staxXmlReader.setContentHandler(contentHandler); staxXmlReader.parse(new InputSource()); - contentHandlerControl.verify(); + + verifyIdenticalInvocations(standardContentHandler, contentHandler); } @Test - public void contentHandlerNamespacesPrefixes() throws SAXException, IOException, XMLStreamException { + public void contentHandlerNamespacesPrefixes() throws Exception { standardReader.setFeature("http://xml.org/sax/features/namespaces", true); standardReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); - standardReader.parse(new InputSource(createTestInputStream())); - contentHandlerControl.replay(); AbstractStaxXMLReader staxXmlReader = createStaxXmlReader(createTestInputStream()); + ContentHandler contentHandler = mockContentHandler(); staxXmlReader.setFeature("http://xml.org/sax/features/namespaces", true); staxXmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); - staxXmlReader.setContentHandler(contentHandler); staxXmlReader.parse(new InputSource()); - contentHandlerControl.verify(); + + verifyIdenticalInvocations(standardContentHandler, contentHandler); } @Test - public void contentHandlerNoNamespacesPrefixes() throws SAXException, IOException, XMLStreamException { + public void contentHandlerNoNamespacesPrefixes() throws Exception { standardReader.setFeature("http://xml.org/sax/features/namespaces", false); standardReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); - standardReader.parse(new InputSource(createTestInputStream())); - contentHandlerControl.replay(); AbstractStaxXMLReader staxXmlReader = createStaxXmlReader(createTestInputStream()); + ContentHandler contentHandler = mockContentHandler(); staxXmlReader.setFeature("http://xml.org/sax/features/namespaces", false); staxXmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); - staxXmlReader.setContentHandler(contentHandler); staxXmlReader.parse(new InputSource()); - contentHandlerControl.verify(); + + verifyIdenticalInvocations(standardContentHandler, contentHandler); } @Test - public void lexicalHandler() throws SAXException, IOException, XMLStreamException { - MockControl lexicalHandlerControl = MockControl.createStrictControl(LexicalHandler.class); - lexicalHandlerControl.setDefaultMatcher(new SaxArgumentMatcher()); - LexicalHandler lexicalHandlerMock = (LexicalHandler) lexicalHandlerControl.getMock(); - LexicalHandler lexicalHandler = new CopyingLexicalHandler(lexicalHandlerMock); - + public void lexicalHandler() throws Exception { Resource testLexicalHandlerXml = new ClassPathResource("testLexicalHandler.xml", getClass()); + LexicalHandler expectedLexicalHandler = mockLexicalHandler(); standardReader.setContentHandler(null); - standardReader.setProperty("http://xml.org/sax/properties/lexical-handler", lexicalHandler); + standardReader.setProperty("http://xml.org/sax/properties/lexical-handler", expectedLexicalHandler); standardReader.parse(new InputSource(testLexicalHandlerXml.getInputStream())); - lexicalHandlerControl.replay(); - inputFactory.setProperty("javax.xml.stream.isCoalescing", Boolean.FALSE); inputFactory.setProperty("http://java.sun.com/xml/stream/properties/report-cdata-event", Boolean.TRUE); inputFactory.setProperty("javax.xml.stream.isReplacingEntityReferences", Boolean.FALSE); inputFactory.setProperty("javax.xml.stream.isSupportingExternalEntities", Boolean.FALSE); + LexicalHandler actualLexicalHandler = mockLexicalHandler(); + willAnswer(new Answer() { + public Object answer(InvocationOnMock invocation) throws Throwable { + return invocation.getArguments()[0] = "element"; + } + }).given(actualLexicalHandler).startDTD(anyString(), anyString(), anyString()); AbstractStaxXMLReader staxXmlReader = createStaxXmlReader(testLexicalHandlerXml.getInputStream()); - - staxXmlReader.setProperty("http://xml.org/sax/properties/lexical-handler", lexicalHandler); + staxXmlReader.setProperty("http://xml.org/sax/properties/lexical-handler", actualLexicalHandler); staxXmlReader.parse(new InputSource()); - lexicalHandlerControl.verify(); + + verifyIdenticalInvocations(expectedLexicalHandler, actualLexicalHandler); } - protected abstract AbstractStaxXMLReader createStaxXmlReader(InputStream inputStream) throws XMLStreamException; + private final LexicalHandler mockLexicalHandler() throws Exception { + LexicalHandler lexicalHandler = mock(LexicalHandler.class); + willAnswer(new CopyCharsAnswer()).given(lexicalHandler).comment(any(char[].class), anyInt(), anyInt()); + return lexicalHandler; + } - /** Easymock {@code AbstractMatcher} implementation that matches SAX arguments. */ - @SuppressWarnings("serial") - protected static class SaxArgumentMatcher extends AbstractMatcher { + private InputStream createTestInputStream() { + return getClass().getResourceAsStream("testContentHandler.xml"); + } - @Override - public boolean matches(Object[] expected, Object[] actual) { - if (expected == actual) { - return true; - } - if (expected == null || actual == null) { - return false; - } - if (expected.length != actual.length) { - throw new IllegalArgumentException("Expected and actual arguments must have the same size"); - } - if (expected.length == 3 && expected[0] instanceof char[] && expected[1] instanceof Integer && - expected[2] instanceof Integer) { - // handling of the character(char[], int, int) methods - String expectedString = new String((char[]) expected[0], (Integer) expected[1], (Integer) expected[2]); - String actualString = new String((char[]) actual[0], (Integer) actual[1], (Integer) actual[2]); - return expectedString.equals(actualString); - } - else if (expected.length == 1 && (expected[0] instanceof Locator)) { - return true; - } - else { - return super.matches(expected, actual); - } - } + protected abstract AbstractStaxXMLReader createStaxXmlReader(InputStream inputStream) throws XMLStreamException; - @Override - protected boolean argumentMatches(Object expected, Object actual) { - if (expected instanceof char[]) { - return Arrays.equals((char[]) expected, (char[]) actual); + protected final ContentHandler mockContentHandler() throws Exception { + ContentHandler contentHandler = mock(ContentHandler.class); + willAnswer(new CopyCharsAnswer()).given(contentHandler).characters(any(char[].class), anyInt(), anyInt()); + willAnswer(new CopyCharsAnswer()).given(contentHandler).ignorableWhitespace(any(char[].class), anyInt(), anyInt()); + willAnswer(new Answer() { + public Object answer(InvocationOnMock invocation) throws Throwable { + invocation.getArguments()[3] = new AttributesImpl((Attributes) invocation.getArguments()[3]); + return null; } - else if (expected instanceof Attributes) { - Attributes expectedAttributes = (Attributes) expected; - Attributes actualAttributes = (Attributes) actual; - if (expectedAttributes.getLength() != actualAttributes.getLength()) { - return false; - } - for (int i = 0; i < expectedAttributes.getLength(); i++) { - boolean found = false; - for (int j = 0; j < actualAttributes.getLength(); j++) { - if (expectedAttributes.getURI(i).equals(actualAttributes.getURI(j)) && - expectedAttributes.getQName(i).equals(actualAttributes.getQName(j)) && - expectedAttributes.getType(i).equals(actualAttributes.getType(j)) && - expectedAttributes.getValue(i).equals(actualAttributes.getValue(j))) { - found = true; - break; - } - } - if (!found) { - return false; - } - } - return true; - } - else { - return super.argumentMatches(expected, actual); - } - } + }).given(contentHandler).startElement(anyString(), anyString(), anyString(), any(Attributes.class)); + return contentHandler; + } - @Override - public String toString(Object[] arguments) { - if (arguments != null && arguments.length == 3 && arguments[0] instanceof char[] && - arguments[1] instanceof Integer && arguments[2] instanceof Integer) { - return new String((char[]) arguments[0], (Integer) arguments[1], (Integer) arguments[2]); - } - else { - return super.toString(arguments); - } - } + protected void verifyIdenticalInvocations(T expected, T actual) { + MockitoUtils.verifySameInvocations(expected, actual, + new SkipLocatorArgumentsAdapter(), new CharArrayToStringAdapter(), new PartialAttributesAdapter()); + } - @Override - protected String argumentToString(Object argument) { - if (argument instanceof char[]) { - char[] array = (char[]) argument; - StringBuilder buffer = new StringBuilder(); - for (char anArray : array) { - buffer.append(anArray); - } - return buffer.toString(); - } - else if (argument instanceof Attributes) { - Attributes attributes = (Attributes) argument; - StringBuilder buffer = new StringBuilder("["); - for (int i = 0; i < attributes.getLength(); i++) { - if (attributes.getURI(i).length() != 0) { - buffer.append('{'); - buffer.append(attributes.getURI(i)); - buffer.append('}'); - } - if (attributes.getQName(i).length() != 0) { - buffer.append(attributes.getQName(i)); - } - buffer.append('='); - buffer.append(attributes.getValue(i)); - if (i < attributes.getLength() - 1) { - buffer.append(", "); - } + private static class SkipLocatorArgumentsAdapter implements InvocationArgumentsAdapter { + public Object[] adaptArguments(Object[] arguments) { + for(int i=0; i { + public Object answer(InvocationOnMock invocation) throws Throwable { + char[] chars = (char[]) invocation.getArguments()[0]; + char[] copy = new char[chars.length]; + System.arraycopy(chars, 0, copy, 0, chars.length); + invocation.getArguments()[0] = copy; + return null; } + } - public void startEntity(String name) throws SAXException { - wrappee.startEntity(name); - } + private static class PartialAttributes { - public void endEntity(String name) throws SAXException { - wrappee.endEntity(name); - } + private Attributes attributes; - public void startCDATA() throws SAXException { - wrappee.startCDATA(); + public PartialAttributes(Attributes attributes) { + this.attributes = attributes; } - public void endCDATA() throws SAXException { - wrappee.endCDATA(); + @Override + public int hashCode() { + return 1; } - public void comment(char ch[], int start, int length) throws SAXException { - wrappee.comment(copy(ch), start, length); + @Override + public boolean equals(Object obj) { + Attributes other = ((PartialAttributes) obj).attributes; + for (int i = 0; i < other.getLength(); i++) { + boolean found = false; + for (int j = 0; j < attributes.getLength(); j++) { + if (other.getURI(i).equals(attributes.getURI(j)) + && other.getQName(i).equals(attributes.getQName(j)) + && other.getType(i).equals(attributes.getType(j)) + && other.getValue(i).equals(attributes.getValue(j))) { + found = true; + break; + } + } + if (!found) { + return false; + } + } + return true; } } - - private static char[] copy(char[] ch) { - char[] copy = new char[ch.length]; - System.arraycopy(ch, 0, copy, 0, ch.length); - return copy; - } - } diff --git a/spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java b/spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java index f13cf00318f..39e6bd1f351 100644 --- a/spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java +++ b/spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java @@ -16,13 +16,15 @@ package org.springframework.util.xml; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + import java.io.InputStream; import java.io.StringReader; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; -import org.easymock.MockControl; import org.xml.sax.ContentHandler; import org.xml.sax.InputSource; import org.xml.sax.helpers.AttributesImpl; @@ -41,21 +43,13 @@ public class StaxEventXMLReaderTests extends AbstractStaxXMLReaderTestCase { XMLEventReader eventReader = inputFactory.createXMLEventReader(new StringReader(CONTENT)); eventReader.nextTag(); // skip to root StaxEventXMLReader xmlReader = new StaxEventXMLReader(eventReader); - - MockControl mockControl = MockControl.createStrictControl(ContentHandler.class); - mockControl.setDefaultMatcher(new SaxArgumentMatcher()); - ContentHandler contentHandlerMock = (ContentHandler) mockControl.getMock(); - - contentHandlerMock.startDocument(); - contentHandlerMock.startElement("http://springframework.org/spring-ws", "child", "child", new AttributesImpl()); - contentHandlerMock.endElement("http://springframework.org/spring-ws", "child", "child"); - contentHandlerMock.endDocument(); - - xmlReader.setContentHandler(contentHandlerMock); - mockControl.replay(); + ContentHandler contentHandler = mock(ContentHandler.class); + xmlReader.setContentHandler(contentHandler); xmlReader.parse(new InputSource()); - mockControl.verify(); + verify(contentHandler).startDocument(); + verify(contentHandler).startElement("http://springframework.org/spring-ws", "child", "child", new AttributesImpl()); + verify(contentHandler).endElement("http://springframework.org/spring-ws", "child", "child"); + verify(contentHandler).endDocument(); } - } diff --git a/spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java b/spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java index f9a00625d04..2552d2b7ac8 100644 --- a/spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java +++ b/spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java @@ -23,12 +23,17 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; -import org.easymock.MockControl; import static org.junit.Assert.*; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + import org.junit.Test; +import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.InputSource; -import org.xml.sax.helpers.AttributesImpl; +import org.xml.sax.Locator; public class StaxStreamXMLReaderTests extends AbstractStaxXMLReaderTestCase { @@ -51,22 +56,15 @@ public class StaxStreamXMLReaderTests extends AbstractStaxXMLReaderTestCase { streamReader.getName()); StaxStreamXMLReader xmlReader = new StaxStreamXMLReader(streamReader); - MockControl mockControl = MockControl.createStrictControl(ContentHandler.class); - mockControl.setDefaultMatcher(new SaxArgumentMatcher()); - ContentHandler contentHandlerMock = (ContentHandler) mockControl.getMock(); - - contentHandlerMock.setDocumentLocator(null); - mockControl.setMatcher(MockControl.ALWAYS_MATCHER); - contentHandlerMock.startDocument(); - contentHandlerMock.startElement("http://springframework.org/spring-ws", "child", "child", new AttributesImpl()); - contentHandlerMock.endElement("http://springframework.org/spring-ws", "child", "child"); - contentHandlerMock.endDocument(); - - xmlReader.setContentHandler(contentHandlerMock); - mockControl.replay(); + ContentHandler contentHandler = mock(ContentHandler.class); + xmlReader.setContentHandler(contentHandler); xmlReader.parse(new InputSource()); - mockControl.verify(); - } + verify(contentHandler).setDocumentLocator(any(Locator.class)); + verify(contentHandler).startDocument(); + verify(contentHandler).startElement(eq("http://springframework.org/spring-ws"), eq("child"), eq("child"), any(Attributes.class)); + verify(contentHandler).endElement("http://springframework.org/spring-ws", "child", "child"); + verify(contentHandler).endDocument(); + } } diff --git a/spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java b/spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java new file mode 100644 index 00000000000..da69a9831f9 --- /dev/null +++ b/spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java @@ -0,0 +1,67 @@ +/* + * Copyright 2002-2007 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.build.test.hamcrest; + +import org.hamcrest.BaseMatcher; +import org.hamcrest.Description; +import org.hamcrest.Matcher; +import org.junit.Rule; +import org.junit.rules.ExpectedException; + +/** + * Additional hamcrest matchers. + * + * @author Phillip Webb + */ +public class Matchers { + + /** + * Create a matcher that wrapps the specified matcher and tests against the + * {@link Throwable#getCause() cause} of an exception. If the item tested + * is {@code null} not a {@link Throwable} the wrapped matcher will be called + * with a {@code null} item. + * + *

Often useful when working with JUnit {@link ExpectedException} + * {@link Rule @Rule}s, for example: + * 

+	 * thrown.expect(DataAccessException.class);
+	 * thrown.except(exceptionCause(isA(SQLException.class)));
+	 *
+ * + * @param matcher the matcher to wrap (must not be null) + * @return a matcher that tests using the exception cause + */ + @SuppressWarnings("unchecked") + public static Matcher exceptionCause(final Matcher matcher) { + return (Matcher) new BaseMatcher() { + @Override + public boolean matches(Object item) { + Throwable cause = null; + if(item != null && item instanceof Throwable) { + cause = ((Throwable)item).getCause(); + } + return matcher.matches(cause); + } + + @Override + public void describeTo(Description description) { + description.appendText("exception cause ").appendDescriptionOf(matcher); + } + }; + } + +} diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java deleted file mode 100644 index 8cf9e5fdaf1..00000000000 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/AbstractJdbcTests.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * AbstractJdbcTests.java - * - * Copyright (C) 2002 by Interprise Software. All rights reserved. - */ -/* - * Copyright 2002-2005 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.jdbc; - -import java.sql.Connection; - -import javax.sql.DataSource; - -import junit.framework.TestCase; -import org.easymock.MockControl; - -/** - * @author Trevor D. Cook - */ -public abstract class AbstractJdbcTests extends TestCase { - - protected MockControl ctrlDataSource; - protected DataSource mockDataSource; - protected MockControl ctrlConnection; - protected Connection mockConnection; - - /** - * Set to true if the user wants verification, indicated - * by a call to replay(). We need to make this optional, - * otherwise we setUp() will always result in verification failures - */ - private boolean shouldVerify; - - @Override - protected void setUp() throws Exception { - this.shouldVerify = false; - super.setUp(); - - ctrlConnection = MockControl.createControl(Connection.class); - mockConnection = (Connection) ctrlConnection.getMock(); - mockConnection.getMetaData(); - ctrlConnection.setDefaultReturnValue(null); - mockConnection.close(); - ctrlConnection.setDefaultVoidCallable(); - - ctrlDataSource = MockControl.createControl(DataSource.class); - mockDataSource = (DataSource) ctrlDataSource.getMock(); - mockDataSource.getConnection(); - ctrlDataSource.setDefaultReturnValue(mockConnection); - } - - protected void replay() { - ctrlDataSource.replay(); - ctrlConnection.replay(); - this.shouldVerify = true; - } - - @Override - protected void tearDown() throws Exception { - super.tearDown(); - - // we shouldn't verify unless the user called replay() - if (shouldVerify()) { - ctrlDataSource.verify(); - //ctrlConnection.verify(); - } - } - - protected boolean shouldVerify() { - return this.shouldVerify; - } - -} diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java index ed87fd3edc1..996f96f3298 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java @@ -16,6 +16,12 @@ package org.springframework.jdbc.core; +import static org.junit.Assert.assertEquals; +import static org.mockito.BDDMockito.given; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + import java.math.BigDecimal; import java.sql.Connection; import java.sql.ResultSet; @@ -23,9 +29,6 @@ import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.sql.Statement; import java.sql.Timestamp; -import junit.framework.TestCase; -import org.easymock.MockControl; -import org.apache.commons.logging.LogFactory; import org.springframework.jdbc.core.test.ConcretePerson; import org.springframework.jdbc.core.test.Person; @@ -39,254 +42,16 @@ import org.springframework.jdbc.support.SQLStateSQLExceptionTranslator; * * @author Thomas Risberg */ -public abstract class AbstractRowMapperTests extends TestCase { - - private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled(); - - protected MockControl conControl; - protected Connection con; - protected MockControl conControl2; - protected Connection con2; - protected MockControl conControl3; - protected Connection con3; - - protected MockControl rsmdControl; - protected ResultSetMetaData rsmd; - protected MockControl rsControl; - protected ResultSet rs; - protected MockControl stmtControl; - protected Statement stmt; - protected JdbcTemplate jdbcTemplate; - - protected MockControl rsmdControl2; - protected ResultSetMetaData rsmd2; - protected MockControl rsControl2; - protected ResultSet rs2; - protected MockControl stmtControl2; - protected Statement stmt2; - protected JdbcTemplate jdbcTemplate2; - - protected MockControl rsmdControl3; - protected ResultSetMetaData rsmd3; - protected MockControl rsControl3; - protected ResultSet rs3; - protected MockControl stmtControl3; - protected Statement stmt3; - protected JdbcTemplate jdbcTemplate3; - - @Override - protected void setUp() throws SQLException { - conControl = MockControl.createControl(Connection.class); - con = (Connection) conControl.getMock(); - con.isClosed(); - conControl.setDefaultReturnValue(false); - - rsmdControl = MockControl.createControl(ResultSetMetaData.class); - rsmd = (ResultSetMetaData)rsmdControl.getMock(); - rsmd.getColumnCount(); - rsmdControl.setReturnValue(4, 1); - rsmd.getColumnLabel(1); - rsmdControl.setReturnValue("name", 1); - rsmd.getColumnLabel(2); - rsmdControl.setReturnValue("age", 1); - rsmd.getColumnLabel(3); - rsmdControl.setReturnValue("birth_date", 1); - rsmd.getColumnLabel(4); - rsmdControl.setReturnValue("balance", 1); - rsmdControl.replay(); - - rsControl = MockControl.createControl(ResultSet.class); - rs = (ResultSet) rsControl.getMock(); - rs.getMetaData(); - rsControl.setReturnValue(rsmd, 1); - rs.next(); - rsControl.setReturnValue(true, 1); - rs.getString(1); - rsControl.setReturnValue("Bubba", 1); - rs.wasNull(); - rsControl.setReturnValue(false, 1); - rs.getLong(2); - rsControl.setReturnValue(22, 1); - rs.getTimestamp(3); - rsControl.setReturnValue(new Timestamp(1221222L), 1); - rs.getBigDecimal(4); - rsControl.setReturnValue(new BigDecimal("1234.56"), 1); - rs.next(); - rsControl.setReturnValue(false, 1); - rs.close(); - rsControl.setVoidCallable(1); - rsControl.replay(); - - stmtControl = MockControl.createControl(Statement.class); - stmt = (Statement) stmtControl.getMock(); - - con.createStatement(); - conControl.setReturnValue(stmt, 1); - stmt.executeQuery("select name, age, birth_date, balance from people"); - stmtControl.setReturnValue(rs, 1); - if (debugEnabled) { - stmt.getWarnings(); - stmtControl.setReturnValue(null, 1); - } - stmt.close(); - stmtControl.setVoidCallable(1); - - conControl.replay(); - stmtControl.replay(); - - conControl2 = MockControl.createControl(Connection.class); - con2 = (Connection) conControl2.getMock(); - con2.isClosed(); - conControl2.setDefaultReturnValue(false); - - rsmdControl2 = MockControl.createControl(ResultSetMetaData.class); - rsmd2 = (ResultSetMetaData)rsmdControl2.getMock(); - rsmd2.getColumnCount(); - rsmdControl2.setReturnValue(4, 2); - rsmd2.getColumnLabel(1); - rsmdControl2.setReturnValue("name", 2); - rsmd2.getColumnLabel(2); - rsmdControl2.setReturnValue("age", 2); - rsmd2.getColumnLabel(3); - rsmdControl2.setReturnValue("birth_date", 1); - rsmd2.getColumnLabel(4); - rsmdControl2.setReturnValue("balance", 1); - rsmdControl2.replay(); - - rsControl2 = MockControl.createControl(ResultSet.class); - rs2 = (ResultSet) rsControl2.getMock(); - rs2.getMetaData(); - rsControl2.setReturnValue(rsmd2, 2); - rs2.next(); - rsControl2.setReturnValue(true, 2); - rs2.getString(1); - rsControl2.setReturnValue("Bubba", 2); - rs2.wasNull(); - rsControl2.setReturnValue(true, 2); - rs2.getLong(2); - rsControl2.setReturnValue(0, 2); - rs2.getTimestamp(3); - rsControl2.setReturnValue(new Timestamp(1221222L), 1); - rs2.getBigDecimal(4); - rsControl2.setReturnValue(new BigDecimal("1234.56"), 1); - rs2.next(); - rsControl2.setReturnValue(false, 1); - rs2.close(); - rsControl2.setVoidCallable(2); - rsControl2.replay(); - - stmtControl2 = MockControl.createControl(Statement.class); - stmt2 = (Statement) stmtControl2.getMock(); - - con2.createStatement(); - conControl2.setReturnValue(stmt2, 2); - stmt2.executeQuery("select name, null as age, birth_date, balance from people"); - stmtControl2.setReturnValue(rs2, 2); - if (debugEnabled) { - stmt2.getWarnings(); - stmtControl2.setReturnValue(null, 2); - } - stmt2.close(); - stmtControl2.setVoidCallable(2); - - conControl2.replay(); - stmtControl2.replay(); - - conControl3 = MockControl.createControl(Connection.class); - con3 = (Connection) conControl3.getMock(); - con3.isClosed(); - conControl3.setDefaultReturnValue(false); - - rsmdControl3 = MockControl.createControl(ResultSetMetaData.class); - rsmd3 = (ResultSetMetaData)rsmdControl3.getMock(); - rsmd3.getColumnCount(); - rsmdControl3.setReturnValue(4, 1); - rsmd3.getColumnLabel(1); - rsmdControl3.setReturnValue("Last Name", 1); - rsmd3.getColumnLabel(2); - rsmdControl3.setReturnValue("age", 1); - rsmd3.getColumnLabel(3); - rsmdControl3.setReturnValue("birth_date", 1); - rsmd3.getColumnLabel(4); - rsmdControl3.setReturnValue("balance", 1); - rsmdControl3.replay(); - - rsControl3 = MockControl.createControl(ResultSet.class); - rs3 = (ResultSet) rsControl3.getMock(); - rs3.getMetaData(); - rsControl3.setReturnValue(rsmd3, 1); - rs3.next(); - rsControl3.setReturnValue(true, 1); - rs3.getString(1); - rsControl3.setReturnValue("Gagarin", 1); - rs3.wasNull(); - rsControl3.setReturnValue(false, 1); - rs3.getLong(2); - rsControl3.setReturnValue(22, 1); - rs3.getTimestamp(3); - rsControl3.setReturnValue(new Timestamp(1221222L), 1); - rs3.getBigDecimal(4); - rsControl3.setReturnValue(new BigDecimal("1234.56"), 1); - rs3.next(); - rsControl3.setReturnValue(false, 1); - rs3.close(); - rsControl3.setVoidCallable(1); - rsControl3.replay(); - - stmtControl3 = MockControl.createControl(Statement.class); - stmt3 = (Statement) stmtControl3.getMock(); - - con3.createStatement(); - conControl3.setReturnValue(stmt3, 1); - stmt3.executeQuery("select last_name as \"Last Name\", age, birth_date, balance from people"); - stmtControl3.setReturnValue(rs3, 1); - if (debugEnabled) { - stmt3.getWarnings(); - stmtControl3.setReturnValue(null, 1); - } - stmt3.close(); - stmtControl3.setVoidCallable(1); +public abstract class AbstractRowMapperTests { - conControl3.replay(); - stmtControl3.replay(); - - jdbcTemplate = new JdbcTemplate(); - jdbcTemplate.setDataSource(new SingleConnectionDataSource(con, false)); - jdbcTemplate.setExceptionTranslator(new SQLStateSQLExceptionTranslator()); - jdbcTemplate.afterPropertiesSet(); - - jdbcTemplate2 = new JdbcTemplate(); - jdbcTemplate2.setDataSource(new SingleConnectionDataSource(con2, false)); - jdbcTemplate2.setExceptionTranslator(new SQLStateSQLExceptionTranslator()); - jdbcTemplate2.afterPropertiesSet(); - - jdbcTemplate3 = new JdbcTemplate(); - jdbcTemplate3.setDataSource(new SingleConnectionDataSource(con3, false)); - jdbcTemplate3.setExceptionTranslator(new SQLStateSQLExceptionTranslator()); - jdbcTemplate3.afterPropertiesSet(); - } - - protected void verifyPerson(Person bean) { - verify(); + protected void verifyPerson(Person bean) throws Exception { assertEquals("Bubba", bean.getName()); assertEquals(22L, bean.getAge()); assertEquals(new java.util.Date(1221222L), bean.getBirth_date()); assertEquals(new BigDecimal("1234.56"), bean.getBalance()); } - protected void verifyPersonWithZeroAge(Person bean) { - conControl2.verify(); - rsControl2.verify(); - rsmdControl2.verify(); - stmtControl2.verify(); - assertEquals("Bubba", bean.getName()); - assertEquals(0L, bean.getAge()); - assertEquals(new java.util.Date(1221222L), bean.getBirth_date()); - assertEquals(new BigDecimal("1234.56"), bean.getBalance()); - } - - protected void verifyConcretePerson(ConcretePerson bean) { - verify(); + protected void verifyConcretePerson(ConcretePerson bean) throws Exception { assertEquals("Bubba", bean.getName()); assertEquals(22L, bean.getAge()); assertEquals(new java.util.Date(1221222L), bean.getBirth_date()); @@ -294,21 +59,68 @@ public abstract class AbstractRowMapperTests extends TestCase { } protected void verifySpacePerson(SpacePerson bean) { - conControl3.verify(); - rsControl3.verify(); - rsmdControl3.verify(); - stmtControl3.verify(); - assertEquals("Gagarin", bean.getLastName()); + assertEquals("Bubba", bean.getLastName()); assertEquals(22L, bean.getAge()); assertEquals(new java.util.Date(1221222L), bean.getBirthDate()); assertEquals(new BigDecimal("1234.56"), bean.getBalance()); } - private void verify() { - conControl.verify(); - rsControl.verify(); - rsmdControl.verify(); - stmtControl.verify(); - } + protected static enum MockType {ONE,TWO,THREE}; + + protected static class Mock { + + private Connection connection; + private ResultSetMetaData resultSetMetaData; + + private ResultSet resultSet; + + private Statement statement; + + private JdbcTemplate jdbcTemplate; + + public Mock() throws Exception { + this(MockType.ONE); + } + + public Mock(MockType type) + throws Exception { + connection = mock(Connection.class); + statement = mock(Statement.class); + resultSet = mock(ResultSet.class); + resultSetMetaData = mock(ResultSetMetaData.class); + + given(connection.createStatement()).willReturn(statement); + given(statement.executeQuery(anyString())).willReturn(resultSet); + given(resultSet.getMetaData()).willReturn(resultSetMetaData); + + given(resultSet.next()).willReturn(true, false); + given(resultSet.getString(1)).willReturn("Bubba"); + given(resultSet.getLong(2)).willReturn(22L); + given(resultSet.getTimestamp(3)).willReturn(new Timestamp(1221222L)); + given(resultSet.getBigDecimal(4)).willReturn(new BigDecimal("1234.56")); + given(resultSet.wasNull()).willReturn(type == MockType.TWO ? true : false); + + given(resultSetMetaData.getColumnCount()).willReturn(4); + given(resultSetMetaData.getColumnLabel(1)).willReturn( + type == MockType.THREE ? "Last Name" : "name"); + given(resultSetMetaData.getColumnLabel(2)).willReturn("age"); + given(resultSetMetaData.getColumnLabel(3)).willReturn("birth_date"); + given(resultSetMetaData.getColumnLabel(4)).willReturn("balance"); + + jdbcTemplate = new JdbcTemplate(); + jdbcTemplate.setDataSource(new SingleConnectionDataSource(connection, false)); + jdbcTemplate.setExceptionTranslator(new SQLStateSQLExceptionTranslator()); + jdbcTemplate.afterPropertiesSet(); + } + + public JdbcTemplate getJdbcTemplate() { + return jdbcTemplate; + } + + public void verifyClosed() throws Exception { + verify(resultSet).close(); + verify(statement).close(); + } + } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/BatchUpdateTestHelper.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/BatchUpdateTestHelper.java deleted file mode 100644 index 4da3cd40bf3..00000000000 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/BatchUpdateTestHelper.java +++ /dev/null @@ -1,112 +0,0 @@ -package org.springframework.jdbc.core; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.DatabaseMetaData; -import java.sql.SQLException; -import java.util.List; -import java.util.Map; -import javax.sql.DataSource; - -import org.easymock.MockControl; -import org.apache.commons.logging.LogFactory; - -import org.springframework.jdbc.core.namedparam.SqlParameterSource; - -/** - * @author Thomas Risberg - */ -public abstract class BatchUpdateTestHelper { - - public static void prepareBatchUpdateMocks(String sqlToUse, Object ids, int[] sqlTypes, - int[] rowsAffected, - MockControl ctrlDataSource, DataSource mockDataSource, MockControl ctrlConnection, Connection mockConnection, - MockControl ctrlPreparedStatement, - PreparedStatement mockPreparedStatement, MockControl ctrlDatabaseMetaData, DatabaseMetaData mockDatabaseMetaData) - throws SQLException { - mockConnection.getMetaData(); - ctrlConnection.setDefaultReturnValue(null); - mockConnection.close(); - ctrlConnection.setDefaultVoidCallable(); - - mockDataSource.getConnection(); - ctrlDataSource.setDefaultReturnValue(mockConnection); - - mockPreparedStatement.getConnection(); - ctrlPreparedStatement.setReturnValue(mockConnection); - int idLength = 0; - if (ids instanceof SqlParameterSource[]) { - idLength = ((SqlParameterSource[])ids).length; - } - else if (ids instanceof Map[]) { - idLength = ((Map[])ids).length; - } - else { - idLength = ((List)ids).size(); - } - - for (int i = 0; i < idLength; i++) { - if (ids instanceof SqlParameterSource[]) { - if (sqlTypes != null) { - mockPreparedStatement.setObject(1, ((SqlParameterSource[])ids)[i].getValue("id"), sqlTypes[0]); - } - else { - mockPreparedStatement.setObject(1, ((SqlParameterSource[])ids)[i].getValue("id")); - } - } - else if (ids instanceof Map[]) { - if (sqlTypes != null) { - mockPreparedStatement.setObject(1, ((Map[])ids)[i].get("id"), sqlTypes[0]); - } - else { - mockPreparedStatement.setObject(1, ((Map[])ids)[i].get("id")); - } - } - else { - if (sqlTypes != null) { - mockPreparedStatement.setObject(1, ((Object[])((List)ids).get(i))[0], sqlTypes[0]); - } - else { - mockPreparedStatement.setObject(1, ((Object[])((List)ids).get(i))[0]); - } - } - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.addBatch(); - ctrlPreparedStatement.setVoidCallable(); - } - mockPreparedStatement.executeBatch(); - ctrlPreparedStatement.setReturnValue(rowsAffected); - if (LogFactory.getLog(JdbcTemplate.class).isDebugEnabled()) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("MySQL"); - mockDatabaseMetaData.supportsBatchUpdates(); - ctrlDatabaseMetaData.setReturnValue(true); - - mockConnection.prepareStatement(sqlToUse); - ctrlConnection.setReturnValue(mockPreparedStatement); - mockConnection.getMetaData(); - ctrlConnection.setReturnValue(mockDatabaseMetaData, 2); - } - - public static void replayBatchUpdateMocks(MockControl ctrlDataSource, - MockControl ctrlConnection, - MockControl ctrlPreparedStatement, - MockControl ctrlDatabaseMetaData) { - ctrlPreparedStatement.replay(); - ctrlDatabaseMetaData.replay(); - ctrlDataSource.replay(); - ctrlConnection.replay(); - } - - public static void verifyBatchUpdateMocks(MockControl ctrlPreparedStatement, MockControl ctrlDatabaseMetaData) { - ctrlPreparedStatement.verify(); - ctrlDatabaseMetaData.verify(); - } - -} diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java index 006666d1ce8..66eb5b54966 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java @@ -16,15 +16,19 @@ package org.springframework.jdbc.core; -import java.sql.SQLException; +import static org.junit.Assert.assertEquals; + import java.util.List; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.springframework.beans.TypeMismatchException; import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.jdbc.core.test.ConcretePerson; import org.springframework.jdbc.core.test.ExtendedPerson; import org.springframework.jdbc.core.test.Person; import org.springframework.jdbc.core.test.SpacePerson; -import org.springframework.beans.TypeMismatchException; /** * @author Thomas Risberg @@ -32,89 +36,94 @@ import org.springframework.beans.TypeMismatchException; */ public class BeanPropertyRowMapperTests extends AbstractRowMapperTests { - public void testOverridingClassDefinedForMapping() { + @Rule + public ExpectedException thrown = ExpectedException.none(); + + @Test + @SuppressWarnings({ "unchecked", "rawtypes" }) + public void testOverridingDifferentClassDefinedForMapping() { BeanPropertyRowMapper mapper = new BeanPropertyRowMapper(Person.class); - try { - mapper.setMappedClass(Long.class); - fail("Setting new class should have thrown InvalidDataAccessApiUsageException"); - } - catch (InvalidDataAccessApiUsageException ex) { - } - try { - mapper.setMappedClass(Person.class); - } - catch (InvalidDataAccessApiUsageException ex) { - fail("Setting same class should not have thrown InvalidDataAccessApiUsageException"); - } + thrown.expect(InvalidDataAccessApiUsageException.class); + mapper.setMappedClass(Long.class); + } + + @Test + public void testOverridingSameClassDefinedForMapping() { + BeanPropertyRowMapper mapper = new BeanPropertyRowMapper(Person.class); + mapper.setMappedClass(Person.class); } - public void testStaticQueryWithRowMapper() throws SQLException { - List result = jdbcTemplate.query("select name, age, birth_date, balance from people", - new BeanPropertyRowMapper(Person.class)); + @Test + public void testStaticQueryWithRowMapper() throws Exception { + Mock mock = new Mock(); + List result = mock.getJdbcTemplate().query( + "select name, age, birth_date, balance from people", + new BeanPropertyRowMapper(Person.class)); assertEquals(1, result.size()); - Person bean = (Person) result.get(0); - verifyPerson(bean); + verifyPerson(result.get(0)); + mock.verifyClosed(); } - public void testMappingWithInheritance() throws SQLException { - List result = jdbcTemplate.query("select name, age, birth_date, balance from people", - new BeanPropertyRowMapper(ConcretePerson.class)); + @Test + public void testMappingWithInheritance() throws Exception { + Mock mock = new Mock(); + List result = mock.getJdbcTemplate().query( + "select name, age, birth_date, balance from people", + new BeanPropertyRowMapper(ConcretePerson.class)); assertEquals(1, result.size()); - ConcretePerson bean = (ConcretePerson) result.get(0); - verifyConcretePerson(bean); + verifyConcretePerson(result.get(0)); + mock.verifyClosed(); } - public void testMappingWithNoUnpopulatedFieldsFound() throws SQLException { - List result = jdbcTemplate.query("select name, age, birth_date, balance from people", - new BeanPropertyRowMapper(ConcretePerson.class, true)); + @Test + public void testMappingWithNoUnpopulatedFieldsFound() throws Exception { + Mock mock = new Mock(); + List result = mock.getJdbcTemplate().query( + "select name, age, birth_date, balance from people", + new BeanPropertyRowMapper(ConcretePerson.class, true)); assertEquals(1, result.size()); - ConcretePerson bean = (ConcretePerson) result.get(0); - verifyConcretePerson(bean); + verifyConcretePerson(result.get(0)); + mock.verifyClosed(); } - public void testMappingWithUnpopulatedFieldsNotChecked() throws SQLException { - List result = jdbcTemplate.query("select name, age, birth_date, balance from people", - new BeanPropertyRowMapper(ExtendedPerson.class)); + @Test + public void testMappingWithUnpopulatedFieldsNotChecked() throws Exception { + Mock mock = new Mock(); + List result = mock.getJdbcTemplate().query( + "select name, age, birth_date, balance from people", + new BeanPropertyRowMapper(ExtendedPerson.class)); assertEquals(1, result.size()); - ExtendedPerson bean = (ExtendedPerson) result.get(0); + ExtendedPerson bean = result.get(0); verifyConcretePerson(bean); + mock.verifyClosed(); } - public void testMappingWithUnpopulatedFieldsNotAccepted() throws SQLException { - try { - List result = jdbcTemplate.query("select name, age, birth_date, balance from people", - new BeanPropertyRowMapper(ExtendedPerson.class, true)); - fail("Should have thrown InvalidDataAccessApiUsageException because of missing field"); - } - catch (InvalidDataAccessApiUsageException ex) { - // expected - } + @Test + public void testMappingWithUnpopulatedFieldsNotAccepted() throws Exception { + Mock mock = new Mock(); + thrown.expect(InvalidDataAccessApiUsageException.class); + mock.getJdbcTemplate().query( + "select name, age, birth_date, balance from people", + new BeanPropertyRowMapper(ExtendedPerson.class, true)); } - public void testMappingNullValue() throws SQLException { - BeanPropertyRowMapper mapper = new BeanPropertyRowMapper(Person.class); - try { - List result1 = jdbcTemplate2.query("select name, null as age, birth_date, balance from people", - mapper); - fail("Should have thrown TypeMismatchException because of null value"); - } - catch (TypeMismatchException ex) { - // expected - } - mapper.setPrimitivesDefaultedForNullValue(true); - List result2 = jdbcTemplate2.query("select name, null as age, birth_date, balance from people", - mapper); - assertEquals(1, result2.size()); - Person bean = (Person) result2.get(0); - verifyPersonWithZeroAge(bean); + @Test + public void testMappingNullValue() throws Exception { + BeanPropertyRowMapper mapper = new BeanPropertyRowMapper(Person.class); + Mock mock = new Mock(MockType.TWO); + thrown.expect(TypeMismatchException.class); + mock.getJdbcTemplate().query( + "select name, null as age, birth_date, balance from people", mapper); } - public void testQueryWithSpaceInColumnName() throws SQLException { - List result = jdbcTemplate3.query("select last_name as \"Last Name\", age, birth_date, balance from people", - new BeanPropertyRowMapper(SpacePerson.class)); + @Test + public void testQueryWithSpaceInColumnName() throws Exception { + Mock mock = new Mock(MockType.THREE); + List result = mock.getJdbcTemplate().query( + "select last_name as \"Last Name\", age, birth_date, balance from people", + new BeanPropertyRowMapper(SpacePerson.class)); assertEquals(1, result.size()); - SpacePerson bean = (SpacePerson) result.get(0); - verifySpacePerson(bean); + verifySpacePerson(result.get(0)); + mock.verifyClosed(); } - } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java index c681fc1ed66..86518a5f876 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateQueryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,17 @@ package org.springframework.jdbc.core; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + import java.math.BigDecimal; import java.math.BigInteger; +import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.ResultSetMetaData; @@ -26,963 +35,334 @@ import java.sql.Statement; import java.util.List; import java.util.Map; -import org.easymock.MockControl; -import org.apache.commons.logging.LogFactory; +import javax.sql.DataSource; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; import org.springframework.dao.IncorrectResultSizeDataAccessException; -import org.springframework.jdbc.AbstractJdbcTests; /** * @author Juergen Hoeller + * @author Phillip Webb * @since 19.12.2004 */ -public class JdbcTemplateQueryTests extends AbstractJdbcTests { - - private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled(); - - private MockControl ctrlStatement; - private Statement mockStatement; - private MockControl ctrlPreparedStatement; - private PreparedStatement mockPreparedStatement; - private MockControl ctrlResultSet; - private ResultSet mockResultSet; - private MockControl ctrlResultSetMetaData; - private ResultSetMetaData mockResultSetMetaData; - - @Override - protected void setUp() throws Exception { - super.setUp(); - - ctrlStatement = MockControl.createControl(Statement.class); - mockStatement = (Statement) ctrlStatement.getMock(); - ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - ctrlResultSet = MockControl.createControl(ResultSet.class); - mockResultSet = (ResultSet) ctrlResultSet.getMock(); - ctrlResultSetMetaData = MockControl.createControl(ResultSetMetaData.class); - mockResultSetMetaData = (ResultSetMetaData) ctrlResultSetMetaData.getMock(); - } - - @Override - protected void replay() { - super.replay(); - ctrlStatement.replay(); - ctrlPreparedStatement.replay(); - ctrlResultSet.replay(); - ctrlResultSetMetaData.replay(); - } - - @Override - protected void tearDown() throws Exception { - super.tearDown(); - if (shouldVerify()) { - ctrlStatement.verify(); - ctrlPreparedStatement.verify(); - ctrlResultSet.verify(); - ctrlResultSetMetaData.verify(); - } +public class JdbcTemplateQueryTests { + + @Rule + public ExpectedException thrown = ExpectedException.none(); + + private Connection connection; + private DataSource dataSource; + private Statement statement; + private PreparedStatement preparedStatement; + private ResultSet resultSet; + private ResultSetMetaData resultSetMetaData; + private JdbcTemplate template; + + @Before + public void setUp() throws Exception { + this.connection = mock(Connection.class); + this.dataSource = mock(DataSource.class); + this.statement = mock(Statement.class); + this.preparedStatement = mock(PreparedStatement.class); + this.resultSet = mock(ResultSet.class); + this.resultSetMetaData = mock(ResultSetMetaData.class); + this.template = new JdbcTemplate(this.dataSource); + given(this.dataSource.getConnection()).willReturn(this.connection); + given(this.resultSet.getMetaData()).willReturn(this.resultSetMetaData); + given(this.resultSetMetaData.getColumnCount()).willReturn(1); + given(this.resultSetMetaData.getColumnLabel(1)).willReturn("age"); + given(this.connection.createStatement()).willReturn(this.statement); + given(this.connection.prepareStatement(anyString())).willReturn(this.preparedStatement); + given(this.preparedStatement.executeQuery()).willReturn(this.resultSet); + given(this.statement.executeQuery(anyString())).willReturn(this.resultSet); } + @Test public void testQueryForList() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID < 3"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1, 2); - mockResultSetMetaData.getColumnLabel(1); - ctrlResultSetMetaData.setReturnValue("age", 2); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData, 2); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getObject(1); - ctrlResultSet.setReturnValue(new Integer(11)); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getObject(1); - ctrlResultSet.setReturnValue(new Integer(12)); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - - List li = template.queryForList(sql); + given(this.resultSet.next()).willReturn(true, true, false); + given(this.resultSet.getObject(1)).willReturn(11, 12); + List li = this.template.queryForList(sql); assertEquals("All rows returned", 2, li.size()); assertEquals("First row is Integer", 11, ((Integer)((Map)li.get(0)).get("age")).intValue()); assertEquals("Second row is Integer", 12, ((Integer)((Map)li.get(1)).get("age")).intValue()); + verify(this.resultSet).close(); + verify(this.statement).close(); } + @Test public void testQueryForListWithEmptyResult() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID < 3"; - - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - List li = template.queryForList(sql); + given(this.resultSet.next()).willReturn(false); + List li = this.template.queryForList(sql); assertEquals("All rows returned", 0, li.size()); + verify(this.resultSet).close(); + verify(this.statement).close(); } + @Test public void testQueryForListWithSingleRowAndColumn() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID < 3"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - mockResultSetMetaData.getColumnLabel(1); - ctrlResultSetMetaData.setReturnValue("age", 1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getObject(1); - ctrlResultSet.setReturnValue(new Integer(11)); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - - List li = template.queryForList(sql); + given(this.resultSet.next()).willReturn(true, false); + given(this.resultSet.getObject(1)).willReturn(11); + List li = this.template.queryForList(sql); assertEquals("All rows returned", 1, li.size()); assertEquals("First row is Integer", 11, ((Integer)((Map)li.get(0)).get("age")).intValue()); + verify(this.resultSet).close(); + verify(this.statement).close(); } + @Test public void testQueryForListWithIntegerElement() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID < 3"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt(1); - ctrlResultSet.setReturnValue(11); - mockResultSet.wasNull(); - ctrlResultSet.setReturnValue(false); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - - List li = template.queryForList(sql, Integer.class); + given(this.resultSet.next()).willReturn(true, false); + given(this.resultSet.getInt(1)).willReturn(11); + List li = this.template.queryForList(sql, Integer.class); assertEquals("All rows returned", 1, li.size()); assertEquals("Element is Integer", 11, ((Integer) li.get(0)).intValue()); + verify(this.resultSet).close(); + verify(this.statement).close(); } + @Test public void testQueryForMapWithSingleRowAndColumn() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID < 3"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - mockResultSetMetaData.getColumnLabel(1); - ctrlResultSetMetaData.setReturnValue("age", 1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getObject(1); - ctrlResultSet.setReturnValue(new Integer(11)); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - - Map map = template.queryForMap(sql); + given(this.resultSet.next()).willReturn(true, false); + given(this.resultSet.getObject(1)).willReturn(11); + Map map = this.template.queryForMap(sql); assertEquals("Wow is Integer", 11, ((Integer) map.get("age")).intValue()); + verify(this.resultSet).close(); + verify(this.statement).close(); } + @Test public void testQueryForObjectThrowsIncorrectResultSizeForMoreThanOneRow() throws Exception { String sql = "select pass from t_account where first_name='Alef'"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getString(1); - ctrlResultSet.setReturnValue("pass"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - mockResultSet.getString(1); - ctrlResultSet.setReturnValue("pass"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); + given(this.resultSet.next()).willReturn(true, true, false); + given(this.resultSet.getString(1)).willReturn("pass"); + this.thrown.expect(IncorrectResultSizeDataAccessException.class); try { - template.queryForObject(sql, String.class); - fail("Should have thrown IncorrectResultSizeDataAccessException"); - } - catch (IncorrectResultSizeDataAccessException ex) { - // expected + this.template.queryForObject(sql, String.class); + } finally { + verify(this.resultSet).close(); + verify(this.statement).close(); } } + @Test public void testQueryForObjectWithRowMapper() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3"; - - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt(1); - ctrlResultSet.setReturnValue(22); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - - Object o = template.queryForObject(sql, new RowMapper() { + given(this.resultSet.next()).willReturn(true, false); + given(this.resultSet.getInt(1)).willReturn(22); + Object o = this.template.queryForObject(sql, new RowMapper() { @Override - public Object mapRow(ResultSet rs, int rowNum) throws SQLException { - return new Integer(rs.getInt(1)); + public Integer mapRow(ResultSet rs, int rowNum) throws SQLException { + return rs.getInt(1); } }); assertTrue("Correct result type", o instanceof Integer); + verify(this.resultSet).close(); + verify(this.statement).close(); } + @Test public void testQueryForObjectWithString() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getString(1); - ctrlResultSet.setReturnValue("myvalue"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - assertEquals("myvalue", template.queryForObject(sql, String.class)); + given(this.resultSet.next()).willReturn(true, false); + given(this.resultSet.getString(1)).willReturn("myvalue"); + assertEquals("myvalue", this.template.queryForObject(sql, String.class)); + verify(this.resultSet).close(); + verify(this.statement).close(); } + @Test public void testQueryForObjectWithBigInteger() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getObject(1); - ctrlResultSet.setReturnValue("22"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - assertEquals(new BigInteger("22"), template.queryForObject(sql, BigInteger.class)); + given(this.resultSet.next()).willReturn(true, false); + given(this.resultSet.getObject(1)).willReturn("22"); + assertEquals(new BigInteger("22"), this.template.queryForObject(sql, BigInteger.class)); + verify(this.resultSet).close(); + verify(this.statement).close(); } + @Test public void testQueryForObjectWithBigDecimal() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getBigDecimal(1); - ctrlResultSet.setReturnValue(new BigDecimal(22.5)); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - assertEquals(new BigDecimal(22.5), template.queryForObject(sql, BigDecimal.class)); + given(this.resultSet.next()).willReturn(true, false); + given(this.resultSet.getBigDecimal(1)).willReturn(new BigDecimal(22.5)); + assertEquals(new BigDecimal(22.5), this.template.queryForObject(sql, BigDecimal.class)); + verify(this.resultSet).close(); + verify(this.statement).close(); } + @Test public void testQueryForObjectWithInteger() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt(1); - ctrlResultSet.setReturnValue(22); - mockResultSet.wasNull(); - ctrlResultSet.setReturnValue(false); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - assertEquals(new Integer(22), template.queryForObject(sql, Integer.class)); + given(this.resultSet.next()).willReturn(true, false); + given(this.resultSet.getInt(1)).willReturn(22); + assertEquals(new Integer(22), this.template.queryForObject(sql, Integer.class)); + verify(this.resultSet).close(); + verify(this.statement).close(); } + @Test public void testQueryForObjectWithIntegerAndNull() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt(1); - ctrlResultSet.setReturnValue(0); - mockResultSet.wasNull(); - ctrlResultSet.setReturnValue(true); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - assertNull(template.queryForObject(sql, Integer.class)); + given(this.resultSet.next()).willReturn(true, false); + given(this.resultSet.getInt(1)).willReturn(0); + given(this.resultSet.wasNull()).willReturn(true); + assertNull(this.template.queryForObject(sql, Integer.class)); + verify(this.resultSet).close(); + verify(this.statement).close(); } + @Test public void testQueryForInt() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt(1); - ctrlResultSet.setReturnValue(22); - mockResultSet.wasNull(); - ctrlResultSet.setReturnValue(false); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - int i = template.queryForInt(sql); + given(this.resultSet.next()).willReturn(true, false); + given(this.resultSet.getInt(1)).willReturn(22); + int i = this.template.queryForInt(sql); assertEquals("Return of an int", 22, i); + verify(this.resultSet).close(); + verify(this.statement).close(); } + @Test public void testQueryForLong() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = 3"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getLong(1); - ctrlResultSet.setReturnValue(87); - mockResultSet.wasNull(); - ctrlResultSet.setReturnValue(false); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - long l = template.queryForLong(sql); + given(this.resultSet.next()).willReturn(true, false); + given(this.resultSet.getLong(1)).willReturn(87L); + long l = this.template.queryForLong(sql); assertEquals("Return of a long", 87, l); + verify(this.resultSet).close(); + verify(this.statement).close(); } + @Test public void testQueryForListWithArgs() throws Exception { doTestQueryForListWithArgs("SELECT AGE FROM CUSTMR WHERE ID < ?"); } + @Test public void testQueryForListIsNotConfusedByNamedParameterPrefix() throws Exception { doTestQueryForListWithArgs("SELECT AGE FROM PREFIX:CUSTMR WHERE ID < ?"); } private void doTestQueryForListWithArgs(String sql) throws Exception { - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1, 2); - mockResultSetMetaData.getColumnLabel(1); - ctrlResultSetMetaData.setReturnValue("age", 2); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData, 2); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getObject(1); - ctrlResultSet.setReturnValue(new Integer(11)); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getObject(1); - ctrlResultSet.setReturnValue(new Integer(12)); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(3)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - - List li = template.queryForList(sql, new Object[] {new Integer(3)}); + given(this.resultSet.next()).willReturn(true, true, false); + given(this.resultSet.getObject(1)).willReturn(11, 12); + List li = this.template.queryForList(sql, new Object[] {new Integer(3)}); assertEquals("All rows returned", 2, li.size()); assertEquals("First row is Integer", 11, ((Integer)((Map)li.get(0)).get("age")).intValue()); assertEquals("Second row is Integer", 12, ((Integer)((Map)li.get(1)).get("age")).intValue()); + verify(this.preparedStatement).setObject(1, 3); + verify(this.resultSet).close(); + verify(this.preparedStatement).close(); } + @Test public void testQueryForListWithArgsAndEmptyResult() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID < ?"; - - ctrlResultSet = MockControl.createControl(ResultSet.class); - mockResultSet = (ResultSet) ctrlResultSet.getMock(); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(3)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - - List li = template.queryForList(sql, new Object[] {new Integer(3)}); + given(this.resultSet.next()).willReturn(false); + List li = this.template.queryForList(sql, new Object[] {new Integer(3)}); assertEquals("All rows returned", 0, li.size()); + verify(this.preparedStatement).setObject(1, 3); + verify(this.resultSet).close(); + verify(this.preparedStatement).close(); } + @Test public void testQueryForListWithArgsAndSingleRowAndColumn() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID < ?"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - mockResultSetMetaData.getColumnLabel(1); - ctrlResultSetMetaData.setReturnValue("age", 1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getObject(1); - ctrlResultSet.setReturnValue(new Integer(11)); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(3)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - - List li = template.queryForList(sql, new Object[] {new Integer(3)}); + given(this.resultSet.next()).willReturn(true, false); + given(this.resultSet.getObject(1)).willReturn(11); + List li = this.template.queryForList(sql, new Object[] {new Integer(3)}); assertEquals("All rows returned", 1, li.size()); assertEquals("First row is Integer", 11, ((Integer)((Map)li.get(0)).get("age")).intValue()); + verify(this.preparedStatement).setObject(1, 3); + verify(this.resultSet).close(); + verify(this.preparedStatement).close(); } + @Test public void testQueryForListWithArgsAndIntegerElementAndSingleRowAndColumn() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID < ?"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt(1); - ctrlResultSet.setReturnValue(11); - mockResultSet.wasNull(); - ctrlResultSet.setReturnValue(false); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(3)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - - List li = template.queryForList(sql, new Object[] {new Integer(3)}, Integer.class); + given(this.resultSet.next()).willReturn(true, false); + given(this.resultSet.getInt(1)).willReturn(11); + List li = this.template.queryForList(sql, new Object[] {new Integer(3)}, Integer.class); assertEquals("All rows returned", 1, li.size()); assertEquals("First row is Integer", 11, ((Integer) li.get(0)).intValue()); + verify(this.preparedStatement).setObject(1, 3); + verify(this.resultSet).close(); + verify(this.preparedStatement).close(); } + @Test public void testQueryForMapWithArgsAndSingleRowAndColumn() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID < ?"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - mockResultSetMetaData.getColumnLabel(1); - ctrlResultSetMetaData.setReturnValue("age", 1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getObject(1); - ctrlResultSet.setReturnValue(new Integer(11)); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(3)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - - Map map = template.queryForMap(sql, new Object[] {new Integer(3)}); + given(this.resultSet.next()).willReturn(true, false); + given(this.resultSet.getObject(1)).willReturn(11); + Map map = this.template.queryForMap(sql, new Object[] {new Integer(3)}); assertEquals("Row is Integer", 11, ((Integer) map.get("age")).intValue()); + verify(this.preparedStatement).setObject(1, 3); + verify(this.resultSet).close(); + verify(this.preparedStatement).close(); } + @Test public void testQueryForObjectWithArgsAndRowMapper() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = ?"; - - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt(1); - ctrlResultSet.setReturnValue(22); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(3)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - - Object o = template.queryForObject(sql, new Object[] {new Integer(3)}, new RowMapper() { + given(this.resultSet.next()).willReturn(true, false); + given(this.resultSet.getInt(1)).willReturn(22); + Object o = this.template.queryForObject(sql, new Object[] {new Integer(3)}, new RowMapper() { @Override - public Object mapRow(ResultSet rs, int rowNum) throws SQLException { - return new Integer(rs.getInt(1)); + public Integer mapRow(ResultSet rs, int rowNum) throws SQLException { + return rs.getInt(1); } }); assertTrue("Correct result type", o instanceof Integer); + verify(this.preparedStatement).setObject(1, 3); + verify(this.resultSet).close(); + verify(this.preparedStatement).close(); } + @Test public void testQueryForObjectWithArgsAndInteger() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = ?"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt(1); - ctrlResultSet.setReturnValue(22); - mockResultSet.wasNull(); - ctrlResultSet.setReturnValue(false); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(3)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - - Object o = template.queryForObject(sql, new Object[] {new Integer(3)}, Integer.class); + given(this.resultSet.next()).willReturn(true, false); + given(this.resultSet.getInt(1)).willReturn(22); + Object o = this.template.queryForObject(sql, new Object[] {new Integer(3)}, Integer.class); assertTrue("Correct result type", o instanceof Integer); + verify(this.preparedStatement).setObject(1, 3); + verify(this.resultSet).close(); + verify(this.preparedStatement).close(); } + @Test public void testQueryForIntWithArgs() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = ?"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt(1); - ctrlResultSet.setReturnValue(22); - mockResultSet.wasNull(); - ctrlResultSet.setReturnValue(false); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(3)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - int i = template.queryForInt(sql, new Object[] {new Integer(3)}); + given(this.resultSet.next()).willReturn(true, false); + given(this.resultSet.getInt(1)).willReturn(22); + int i = this.template.queryForInt(sql, new Object[] {new Integer(3)}); assertEquals("Return of an int", 22, i); + verify(this.preparedStatement).setObject(1, 3); + verify(this.resultSet).close(); + verify(this.preparedStatement).close(); } + @Test public void testQueryForLongWithArgs() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID = ?"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getLong(1); - ctrlResultSet.setReturnValue(87); - mockResultSet.wasNull(); - ctrlResultSet.setReturnValue(false); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(3)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - long l = template.queryForLong(sql, new Object[] {new Integer(3)}); + given(this.resultSet.next()).willReturn(true, false); + given(this.resultSet.getLong(1)).willReturn(87L); + long l = this.template.queryForLong(sql, new Object[] {new Integer(3)}); assertEquals("Return of a long", 87, l); + verify(this.preparedStatement).setObject(1, 3); + verify(this.resultSet).close(); + verify(this.preparedStatement).close(); } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java index ba9b97dcae1..e0748aef5af 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java @@ -16,6 +16,27 @@ package org.springframework.jdbc.core; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.isA; +import static org.hamcrest.Matchers.sameInstance; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.willThrow; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.springframework.build.test.hamcrest.Matchers.exceptionCause; + import java.sql.CallableStatement; import java.sql.Connection; import java.sql.DatabaseMetaData; @@ -26,18 +47,19 @@ import java.sql.SQLWarning; import java.sql.Statement; import java.sql.Types; import java.util.ArrayList; +import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.Map; -import javax.sql.DataSource; -import org.apache.commons.logging.LogFactory; -import org.easymock.MockControl; +import javax.sql.DataSource; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; import org.springframework.dao.DataAccessException; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.dao.UncategorizedDataAccessException; -import org.springframework.jdbc.AbstractJdbcTests; import org.springframework.jdbc.BadSqlGrammarException; import org.springframework.jdbc.CannotGetJdbcConnectionException; import org.springframework.jdbc.SQLWarningException; @@ -56,139 +78,124 @@ import org.springframework.util.LinkedCaseInsensitiveMap; * @author Rod Johnson * @author Thomas Risberg * @author Juergen Hoeller + * @author Phillip Webb */ -public class JdbcTemplateTests extends AbstractJdbcTests { - - private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled(); - +public class JdbcTemplateTests { + + @Rule + public ExpectedException thrown = ExpectedException.none(); + + private Connection connection; + private DataSource dataSource; + private PreparedStatement preparedStatement; + private Statement statement; + private ResultSet resultSet; + private JdbcTemplate template; + private CallableStatement callableStatement; + + @Before + public void setup() throws Exception { + this.connection = mock(Connection.class); + this.dataSource = mock(DataSource.class); + this.preparedStatement = mock(PreparedStatement.class); + this.statement = mock(Statement.class); + this.resultSet = mock(ResultSet.class); + this.template = new JdbcTemplate(this.dataSource); + this.callableStatement = mock(CallableStatement.class); + given(this.dataSource.getConnection()).willReturn(this.connection); + given(this.connection.prepareStatement(anyString())).willReturn(this.preparedStatement); + given(this.preparedStatement.executeQuery()).willReturn(this.resultSet); + given(this.preparedStatement.executeQuery(anyString())).willReturn(this.resultSet); + given(this.preparedStatement.getConnection()).willReturn(this.connection); + given(this.statement.getConnection()).willReturn(this.connection); + given(this.statement.executeQuery(anyString())).willReturn(this.resultSet); + given(this.connection.prepareCall(anyString())).willReturn(this.callableStatement); + given(this.callableStatement.getResultSet()).willReturn(this.resultSet); + } + @Test public void testBeanProperties() throws Exception { - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - assertTrue("datasource ok", template.getDataSource() == mockDataSource); - assertTrue("ignores warnings by default", template.isIgnoreWarnings()); - template.setIgnoreWarnings(false); - assertTrue("can set NOT to ignore warnings", !template.isIgnoreWarnings()); + assertTrue("datasource ok", this.template.getDataSource() == this.dataSource); + assertTrue("ignores warnings by default", this.template.isIgnoreWarnings()); + this.template.setIgnoreWarnings(false); + assertTrue("can set NOT to ignore warnings", !this.template.isIgnoreWarnings()); } + @Test public void testUpdateCount() throws Exception { - final String sql = - "UPDATE INVOICE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; + final String sql = "UPDATE INVOICE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; int idParam = 11111; - - MockControl ctrlPreparedStatement = - MockControl.createControl(PreparedStatement.class); - PreparedStatement mockPreparedStatement = - (PreparedStatement) ctrlPreparedStatement.getMock(); - mockPreparedStatement.setInt(1, idParam); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(1); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockPreparedStatement); - - ctrlPreparedStatement.replay(); - replay(); - + given(this.preparedStatement.executeUpdate()).willReturn(1); Dispatcher d = new Dispatcher(idParam, sql); - JdbcTemplate template = new JdbcTemplate(mockDataSource); - - int rowsAffected = template.update(d); + int rowsAffected = this.template.update(d); assertTrue("1 update affected 1 row", rowsAffected == 1); - - /* - d = new Dispatcher(idParam); - rowsAffected = template.update(d); - assertTrue("bogus update affected 0 rows", rowsAffected == 0); - */ - - ctrlPreparedStatement.verify(); + verify(this.preparedStatement).setInt(1, idParam); + verify(this.preparedStatement).close(); + verify(this.connection).close(); } + @Test public void testBogusUpdate() throws Exception { - final String sql = - "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; + final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; final int idParam = 6666; // It's because Integers aren't canonical - SQLException sex = new SQLException("bad update"); - - MockControl ctrlPreparedStatement = - MockControl.createControl(PreparedStatement.class); - PreparedStatement mockPreparedStatement = - (PreparedStatement) ctrlPreparedStatement.getMock(); - mockPreparedStatement.setInt(1, idParam); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setThrowable(sex); - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockPreparedStatement); - - ctrlPreparedStatement.replay(); - replay(); + SQLException sqlException = new SQLException("bad update"); + given(this.preparedStatement.executeUpdate()).willThrow(sqlException); Dispatcher d = new Dispatcher(idParam, sql); - JdbcTemplate template = new JdbcTemplate(mockDataSource); - + this.thrown.expect(UncategorizedSQLException.class); + this.thrown.expect(exceptionCause(equalTo(sqlException))); try { - template.update(d); - fail("Bogus update should throw exception"); + this.template.update(d); } - catch (UncategorizedDataAccessException ex) { - // pass - assertTrue( - "Correct exception", - ex instanceof UncategorizedSQLException); - assertTrue("Root cause is correct", ex.getCause() == sex); - //assertTrue("no update occurred", !je.getDataWasUpdated()); + finally { + verify(this.preparedStatement).setInt(1, idParam); + verify(this.preparedStatement).close(); + verify(this.connection, atLeastOnce()).close(); } - - ctrlPreparedStatement.verify(); } + @Test public void testStringsWithStaticSql() throws Exception { - doTestStrings(new JdbcTemplateCallback() { + doTestStrings(false, null, null, null, null, new JdbcTemplateCallback() { @Override - public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) { + public void doInJdbcTemplate(JdbcTemplate template, String sql, + RowCallbackHandler rch) { template.query(sql, rch); } - }, false, null, null, null, null); + }); } + @Test public void testStringsWithStaticSqlAndFetchSizeAndMaxRows() throws Exception { - doTestStrings(new JdbcTemplateCallback() { + doTestStrings(false, 10, 20, 30, null, new JdbcTemplateCallback() { @Override - public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) { + public void doInJdbcTemplate(JdbcTemplate template, String sql, + RowCallbackHandler rch) { template.query(sql, rch); } - }, false, new Integer(10), new Integer(20), new Integer(30), null); + }); } + @Test public void testStringsWithEmptyPreparedStatementSetter() throws Exception { - doTestStrings(new JdbcTemplateCallback() { + doTestStrings(true, null, null, null, null, new JdbcTemplateCallback() { @Override - public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) { + public void doInJdbcTemplate(JdbcTemplate template, String sql, + RowCallbackHandler rch) { template.query(sql, (PreparedStatementSetter) null, rch); } - }, true, null, null, null, null); + }); } + @Test public void testStringsWithPreparedStatementSetter() throws Exception { - final Integer argument = new Integer(99); - doTestStrings(new JdbcTemplateCallback() { + final Integer argument = 99; + doTestStrings(true, null, null, null, argument, new JdbcTemplateCallback() { @Override - public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) { + public void doInJdbcTemplate(JdbcTemplate template, String sql, + RowCallbackHandler rch) { template.query(sql, new PreparedStatementSetter() { @Override public void setValues(PreparedStatement ps) throws SQLException { @@ -196,109 +203,59 @@ public class JdbcTemplateTests extends AbstractJdbcTests { } }, rch); } - }, true, null, null, null, argument); + }); } + @Test public void testStringsWithEmptyPreparedStatementArgs() throws Exception { - doTestStrings(new JdbcTemplateCallback() { + doTestStrings(true, null, null, null, null, new JdbcTemplateCallback() { @Override - public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) { + public void doInJdbcTemplate(JdbcTemplate template, String sql, + RowCallbackHandler rch) { template.query(sql, (Object[]) null, rch); } - }, true, null, null, null, null); + }); } + @Test public void testStringsWithPreparedStatementArgs() throws Exception { - final Integer argument = new Integer(99); - doTestStrings(new JdbcTemplateCallback() { + final Integer argument = 99; + doTestStrings(true, null, null, null, argument, new JdbcTemplateCallback() { @Override - public void doInJdbcTemplate(JdbcTemplate template, String sql, RowCallbackHandler rch) { - template.query(sql, new Object[] {argument}, rch); + public void doInJdbcTemplate(JdbcTemplate template, String sql, + RowCallbackHandler rch) { + template.query(sql, new Object[] { argument }, rch); } - }, true, null, null, null, argument); + }); } private void doTestStrings( - JdbcTemplateCallback jdbcTemplateCallback, boolean usePreparedStatement, - Integer fetchSize, Integer maxRows, Integer queryTimeout, Object argument) + boolean usePreparedStatement, + Integer fetchSize, Integer maxRows, Integer queryTimeout, Object argument, + JdbcTemplateCallback jdbcTemplateCallback) throws Exception { String sql = "SELECT FORENAME FROM CUSTMR"; String[] results = { "rod", "gary", " portia" }; class StringHandler implements RowCallbackHandler { - private List list = new LinkedList(); + private List list = new LinkedList(); @Override public void processRow(ResultSet rs) throws SQLException { - list.add(rs.getString(1)); + this.list.add(rs.getString(1)); } public String[] getStrings() { - return (String[]) list.toArray(new String[list.size()]); + return this.list.toArray(new String[this.list.size()]); } } - MockControl ctrlResultSet = MockControl.createControl(ResultSet.class); - ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock(); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getString(1); - ctrlResultSet.setReturnValue(results[0]); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getString(1); - ctrlResultSet.setReturnValue(results[1]); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getString(1); - ctrlResultSet.setReturnValue(results[2]); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - MockControl ctrlStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockStatement = (PreparedStatement) ctrlStatement.getMock(); - if (fetchSize != null) { - mockStatement.setFetchSize(fetchSize.intValue()); - } - if (maxRows != null) { - mockStatement.setMaxRows(maxRows.intValue()); - } - if (queryTimeout != null) { - mockStatement.setQueryTimeout(queryTimeout.intValue()); - } - if (argument != null) { - mockStatement.setObject(1, argument); - } - if (usePreparedStatement) { - mockStatement.executeQuery(); - } - else { - mockStatement.executeQuery(sql); - } - ctrlStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - if (usePreparedStatement) { - mockConnection.prepareStatement(sql); - } - else { - mockConnection.createStatement(); - } - ctrlConnection.setReturnValue(mockStatement); - - ctrlResultSet.replay(); - ctrlStatement.replay(); - replay(); + given(this.resultSet.next()).willReturn(true, true, true, false); + given(this.resultSet.getString(1)).willReturn(results[0], results[1], results[2]); + given(this.connection.createStatement()).willReturn(this.preparedStatement); StringHandler sh = new StringHandler(); JdbcTemplate template = new JdbcTemplate(); - template.setDataSource(mockDataSource); + template.setDataSource(this.dataSource); if (fetchSize != null) { template.setFetchSize(fetchSize.intValue()); } @@ -317,487 +274,259 @@ public class JdbcTemplateTests extends AbstractJdbcTests { assertTrue("Row " + i + " matches", forenames[i].equals(results[i])); } - ctrlResultSet.verify(); - ctrlStatement.verify(); + if (fetchSize != null) { + verify(this.preparedStatement).setFetchSize(fetchSize.intValue()); + } + if (maxRows != null) { + verify(this.preparedStatement).setMaxRows(maxRows.intValue()); + } + if (queryTimeout != null) { + verify(this.preparedStatement).setQueryTimeout(queryTimeout.intValue()); + } + if (argument != null) { + verify(this.preparedStatement).setObject(1, argument); + } + verify(this.resultSet).close(); + verify(this.preparedStatement).close(); + verify(this.connection).close(); } + @Test public void testLeaveConnectionOpenOnRequest() throws Exception { String sql = "SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3"; - MockControl ctrlResultSet = MockControl.createControl(ResultSet.class); - ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock(); - ctrlResultSet = MockControl.createControl(ResultSet.class); - mockResultSet = (ResultSet) ctrlResultSet.getMock(); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - MockControl ctrlStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockStatement = (PreparedStatement) ctrlStatement.getMock(); - ctrlStatement = MockControl.createControl(PreparedStatement.class); - mockStatement = (PreparedStatement) ctrlStatement.getMock(); - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.isClosed(); - ctrlConnection.setReturnValue(false, 2); - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); + given(this.resultSet.next()).willReturn(false); + given(this.connection.isClosed()).willReturn(false); + given(this.connection.createStatement()).willReturn(this.preparedStatement); // if close is called entire test will fail - mockConnection.close(); - ctrlConnection.setDefaultThrowable(new RuntimeException()); - - ctrlResultSet.replay(); - ctrlStatement.replay(); - replay(); + willThrow(new RuntimeException()).given(this.connection).close(); - SingleConnectionDataSource scf = new SingleConnectionDataSource(mockDataSource.getConnection(), false); - JdbcTemplate template2 = new JdbcTemplate(scf, false); + SingleConnectionDataSource scf = new SingleConnectionDataSource(this.dataSource.getConnection(), false); + this.template = new JdbcTemplate(scf, false); RowCountCallbackHandler rcch = new RowCountCallbackHandler(); - template2.query(sql, rcch); + this.template.query(sql, rcch); - ctrlResultSet.verify(); - ctrlStatement.verify(); + verify(this.resultSet).close(); + verify(this.preparedStatement).close(); } + @Test public void testConnectionCallback() throws Exception { - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - template.setNativeJdbcExtractor(new PlainNativeJdbcExtractor()); - Object result = template.execute(new ConnectionCallback() { + this.template.setNativeJdbcExtractor(new PlainNativeJdbcExtractor()); + String result = this.template.execute(new ConnectionCallback() { @Override - public Object doInConnection(Connection con) { - assertSame(mockConnection, con); + public String doInConnection(Connection con) { + assertSame(JdbcTemplateTests.this.connection, con); return "test"; } }); - assertEquals("test", result); } + @Test public void testConnectionCallbackWithStatementSettings() throws Exception { - MockControl ctrlStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockStatement = (PreparedStatement) ctrlStatement.getMock(); - mockConnection.prepareStatement("some SQL"); - ctrlConnection.setReturnValue(mockStatement, 1); - mockStatement.setFetchSize(10); - ctrlStatement.setVoidCallable(1); - mockStatement.setMaxRows(20); - ctrlStatement.setVoidCallable(1); - mockStatement.close(); - ctrlStatement.setVoidCallable(1); - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - Object result = template.execute(new ConnectionCallback() { + String result = this.template.execute(new ConnectionCallback() { @Override - public Object doInConnection(Connection con) throws SQLException { + public String doInConnection(Connection con) throws SQLException { PreparedStatement ps = con.prepareStatement("some SQL"); + ps.setFetchSize(10); + ps.setMaxRows(20); ps.close(); - assertSame(mockConnection, new PlainNativeJdbcExtractor().getNativeConnection(con)); + assertSame(JdbcTemplateTests.this.connection, new PlainNativeJdbcExtractor().getNativeConnection(con)); return "test"; } }); assertEquals("test", result); + verify(this.preparedStatement).setFetchSize(10); + verify(this.preparedStatement).setMaxRows(20); + verify(this.preparedStatement).close(); + verify(this.connection).close(); } + @Test public void testCloseConnectionOnRequest() throws Exception { String sql = "SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3"; - MockControl ctrlResultSet = MockControl.createControl(ResultSet.class); - ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock(); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - MockControl ctrlStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockStatement = (PreparedStatement) ctrlStatement.getMock(); - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - ctrlResultSet.replay(); - ctrlStatement.replay(); - replay(); + given(this.resultSet.next()).willReturn(false); + given(this.connection.createStatement()).willReturn(this.preparedStatement); - JdbcTemplate template = new JdbcTemplate(mockDataSource); RowCountCallbackHandler rcch = new RowCountCallbackHandler(); - template.query(sql, rcch); + this.template.query(sql, rcch); - ctrlResultSet.verify(); - ctrlStatement.verify(); + verify(this.resultSet).close(); + verify(this.preparedStatement).close(); + verify(this.connection).close(); } /** * Test that we see a runtime exception come back. */ + @Test public void testExceptionComesBack() throws Exception { final String sql = "SELECT ID FROM CUSTMR"; - final RuntimeException rex = new RuntimeException("What I want to see"); - - MockControl ctrlResultSet = MockControl.createControl(ResultSet.class); - ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock(); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - MockControl ctrlStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockStatement = (PreparedStatement) ctrlStatement.getMock(); - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); + final RuntimeException runtimeException = new RuntimeException("Expected"); - ctrlResultSet.replay(); - ctrlStatement.replay(); - replay(); + given(this.resultSet.next()).willReturn(true); + given(this.connection.createStatement()).willReturn(this.preparedStatement); - JdbcTemplate template = new JdbcTemplate(mockDataSource); + this.thrown.expect(sameInstance(runtimeException)); try { - template.query(sql, new RowCallbackHandler() { + this.template.query(sql, new RowCallbackHandler() { @Override public void processRow(ResultSet rs) { - throw rex; + throw runtimeException; } }); - fail("Should have thrown exception"); } - catch (RuntimeException ex) { - assertTrue("Wanted same exception back, not " + ex, ex == rex); + finally { + verify(this.resultSet).close(); + verify(this.preparedStatement).close(); + verify(this.connection).close(); } } /** * Test update with static SQL. */ + @Test public void testSqlUpdate() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 4"; int rowsAffected = 33; - MockControl ctrlStatement = MockControl.createControl(Statement.class); - Statement mockStatement = (Statement) ctrlStatement.getMock(); - mockStatement.executeUpdate(sql); - ctrlStatement.setReturnValue(rowsAffected); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - ctrlStatement.replay(); - replay(); + given(this.statement.executeUpdate(sql)).willReturn(rowsAffected); + given(this.connection.createStatement()).willReturn(this.statement); - JdbcTemplate template = new JdbcTemplate(mockDataSource); - int actualRowsAffected = template.update(sql); + int actualRowsAffected = this.template.update(sql); assertTrue("Actual rows affected is correct", actualRowsAffected == rowsAffected); - ctrlStatement.verify(); + verify(this.statement).close(); + verify(this.connection).close(); } /** * Test update with dynamic SQL. */ + @Test public void testSqlUpdateWithArguments() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ? and PR = ?"; int rowsAffected = 33; + given(this.preparedStatement.executeUpdate()).willReturn(rowsAffected); - MockControl ctrlStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockStatement = (PreparedStatement) ctrlStatement.getMock(); - mockStatement.setObject(1, new Integer(4)); - ctrlStatement.setVoidCallable(); - mockStatement.setObject(2, new Float(1.4142), Types.NUMERIC, 2); - ctrlStatement.setVoidCallable(); - mockStatement.executeUpdate(); - ctrlStatement.setReturnValue(33); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockStatement); - ctrlStatement.replay(); - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - int actualRowsAffected = template.update(sql, - new Object[] {new Integer(4), new SqlParameterValue(Types.NUMERIC, 2, new Float(1.4142))}); + int actualRowsAffected = this.template.update(sql, + new Object[] {4, new SqlParameterValue(Types.NUMERIC, 2, new Float(1.4142))}); assertTrue("Actual rows affected is correct", actualRowsAffected == rowsAffected); - ctrlStatement.verify(); + verify(this.preparedStatement).setObject(1, 4); + verify(this.preparedStatement).setObject(2, new Float(1.4142), Types.NUMERIC, 2); + verify(this.preparedStatement).close(); + verify(this.connection).close(); } + @Test public void testSqlUpdateEncountersSqlException() throws Exception { - SQLException sex = new SQLException("bad update"); + SQLException sqlException = new SQLException("bad update"); final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 4"; - MockControl ctrlStatement = MockControl.createControl(Statement.class); - Statement mockStatement = (Statement) ctrlStatement.getMock(); - mockStatement.executeUpdate(sql); - ctrlStatement.setThrowable(sex); - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - ctrlStatement.replay(); - replay(); + given(this.statement.executeUpdate(sql)).willThrow(sqlException); + given(this.connection.createStatement()).willReturn(this.statement); - JdbcTemplate template = new JdbcTemplate(mockDataSource); + this.thrown.expect(exceptionCause(sameInstance(sqlException))); try { - template.update(sql); + this.template.update(sql); } - catch (DataAccessException ex) { - assertTrue("root cause is correct", ex.getCause() == sex); + finally { + verify(this.statement).close(); + verify(this.connection, atLeastOnce()).close(); } - - ctrlStatement.verify(); } + @Test public void testSqlUpdateWithThreadConnection() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 4"; int rowsAffected = 33; - MockControl ctrlStatement = MockControl.createControl(Statement.class); - Statement mockStatement = (Statement) ctrlStatement.getMock(); - mockStatement.executeUpdate(sql); - ctrlStatement.setReturnValue(rowsAffected); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); + given(this.statement.executeUpdate(sql)).willReturn(rowsAffected); + given(this.connection.createStatement()).willReturn(this.statement); - ctrlStatement.replay(); - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - - int actualRowsAffected = template.update(sql); - assertTrue( - "Actual rows affected is correct", - actualRowsAffected == rowsAffected); + int actualRowsAffected = this.template.update(sql); + assertTrue("Actual rows affected is correct", actualRowsAffected == rowsAffected); - ctrlStatement.verify(); + verify(this.statement).close(); + verify(this.connection).close(); } + @Test public void testBatchUpdate() throws Exception { final String[] sql = {"UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 1", "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 2"}; - MockControl ctrlStatement = MockControl.createControl(Statement.class); - Statement mockStatement = (Statement) ctrlStatement.getMock(); - mockStatement.getConnection(); - ctrlStatement.setReturnValue(mockConnection); - mockStatement.addBatch(sql[0]); - ctrlStatement.setVoidCallable(); - mockStatement.addBatch(sql[1]); - ctrlStatement.setVoidCallable(); - mockStatement.executeBatch(); - ctrlStatement.setReturnValue(new int[] {1, 1}); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("MySQL"); - mockDatabaseMetaData.supportsBatchUpdates(); - ctrlDatabaseMetaData.setReturnValue(true); - - mockConnection.getMetaData(); - ctrlConnection.setReturnValue(mockDatabaseMetaData, 2); - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); + given(this.statement.executeBatch()).willReturn(new int[] {1, 1}); + mockDatabaseMetaData(true); + given(this.connection.createStatement()).willReturn(this.statement); - ctrlStatement.replay(); - ctrlDatabaseMetaData.replay(); - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource, false); + JdbcTemplate template = new JdbcTemplate(this.dataSource, false); int[] actualRowsAffected = template.batchUpdate(sql); assertTrue("executed 2 updates", actualRowsAffected.length == 2); - ctrlStatement.verify(); - ctrlDatabaseMetaData.verify(); + verify(this.statement).addBatch(sql[0]); + verify(this.statement).addBatch(sql[1]); + verify(this.statement).close(); + verify(this.connection, atLeastOnce()).close(); } + @Test public void testBatchUpdateWithNoBatchSupport() throws Exception { final String[] sql = {"UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 1", "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 2"}; - MockControl ctrlStatement = MockControl.createControl(Statement.class); - Statement mockStatement = (Statement) ctrlStatement.getMock(); - mockStatement.getConnection(); - ctrlStatement.setReturnValue(mockConnection); - mockStatement.execute(sql[0]); - ctrlStatement.setReturnValue(false); - mockStatement.getUpdateCount(); - ctrlStatement.setReturnValue(1); - mockStatement.execute(sql[1]); - ctrlStatement.setReturnValue(false); - mockStatement.getUpdateCount(); - ctrlStatement.setReturnValue(1); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("MySQL"); - mockDatabaseMetaData.supportsBatchUpdates(); - ctrlDatabaseMetaData.setReturnValue(false); - - mockConnection.getMetaData(); - ctrlConnection.setReturnValue(mockDatabaseMetaData, 2); - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); + given(this.statement.execute(sql[0])).willReturn(false); + given(this.statement.getUpdateCount()).willReturn(1, 1); + given(this.statement.execute(sql[1])).willReturn(false); - ctrlStatement.replay(); - ctrlDatabaseMetaData.replay(); - replay(); + mockDatabaseMetaData(false); + given(this.connection.createStatement()).willReturn(this.statement); - JdbcTemplate template = new JdbcTemplate(mockDataSource, false); + JdbcTemplate template = new JdbcTemplate(this.dataSource, false); int[] actualRowsAffected = template.batchUpdate(sql); assertTrue("executed 2 updates", actualRowsAffected.length == 2); - ctrlStatement.verify(); - ctrlDatabaseMetaData.verify(); + verify(this.statement, never()).addBatch(anyString()); + verify(this.statement).close(); + verify(this.connection, atLeastOnce()).close(); } + @Test public void testBatchUpdateWithNoBatchSupportAndSelect() throws Exception { final String[] sql = {"UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = 1", "SELECT * FROM NOSUCHTABLE"}; - MockControl ctrlStatement = MockControl.createControl(Statement.class); - Statement mockStatement = (Statement) ctrlStatement.getMock(); - mockStatement.getConnection(); - ctrlStatement.setReturnValue(mockConnection); - mockStatement.execute(sql[0]); - ctrlStatement.setReturnValue(false); - mockStatement.getUpdateCount(); - ctrlStatement.setReturnValue(1); - mockStatement.execute(sql[1]); - ctrlStatement.setReturnValue(true); - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("MySQL"); - mockDatabaseMetaData.supportsBatchUpdates(); - ctrlDatabaseMetaData.setReturnValue(false); - - mockConnection.getMetaData(); - ctrlConnection.setReturnValue(mockDatabaseMetaData, 2); - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - ctrlStatement.replay(); - ctrlDatabaseMetaData.replay(); - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource, false); + given(this.statement.execute(sql[0])).willReturn(false); + given(this.statement.getUpdateCount()).willReturn(1); + given(this.statement.execute(sql[1])).willReturn(true); + mockDatabaseMetaData(false); + given(this.connection.createStatement()).willReturn(this.statement); + JdbcTemplate template = new JdbcTemplate(this.dataSource, false); + this.thrown.expect(InvalidDataAccessApiUsageException.class); try { template.batchUpdate(sql); - fail("Shouldn't have executed batch statement with a select"); } - catch (DataAccessException ex) { - // pass - assertTrue("Check exception type", ex.getClass() == InvalidDataAccessApiUsageException.class); + finally { + verify(this.statement, never()).addBatch(anyString()); + verify(this.statement).close(); + verify(this.connection, atLeastOnce()).close(); } - - ctrlStatement.verify(); - ctrlDatabaseMetaData.verify(); } + @Test public void testBatchUpdateWithPreparedStatement() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; final int[] ids = new int[] { 100, 200 }; final int[] rowsAffected = new int[] { 1, 2 }; - MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - mockPreparedStatement.getConnection(); - ctrlPreparedStatement.setReturnValue(mockConnection); - mockPreparedStatement.setInt(1, ids[0]); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.addBatch(); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setInt(1, ids[1]); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.addBatch(); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeBatch(); - ctrlPreparedStatement.setReturnValue(rowsAffected); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("MySQL"); - mockDatabaseMetaData.supportsBatchUpdates(); - ctrlDatabaseMetaData.setReturnValue(true); - - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockPreparedStatement); - mockConnection.getMetaData(); - ctrlConnection.setReturnValue(mockDatabaseMetaData, 2); - - ctrlPreparedStatement.replay(); - ctrlDatabaseMetaData.replay(); - replay(); + given(this.preparedStatement.executeBatch()).willReturn(rowsAffected); + mockDatabaseMetaData(true); BatchPreparedStatementSetter setter = new BatchPreparedStatementSetter() { @@ -812,58 +541,28 @@ public class JdbcTemplateTests extends AbstractJdbcTests { } }; - JdbcTemplate template = new JdbcTemplate(mockDataSource, false); + JdbcTemplate template = new JdbcTemplate(this.dataSource, false); int[] actualRowsAffected = template.batchUpdate(sql, setter); assertTrue("executed 2 updates", actualRowsAffected.length == 2); assertEquals(rowsAffected[0], actualRowsAffected[0]); assertEquals(rowsAffected[1], actualRowsAffected[1]); - ctrlPreparedStatement.verify(); - ctrlDatabaseMetaData.verify(); + verify(this.preparedStatement, times(2)).addBatch(); + verify(this.preparedStatement).setInt(1, ids[0]); + verify(this.preparedStatement).setInt(1, ids[1]); + verify(this.preparedStatement).close(); + verify(this.connection, atLeastOnce()).close(); } + @Test public void testInterruptibleBatchUpdate() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; final int[] ids = new int[] { 100, 200 }; final int[] rowsAffected = new int[] { 1, 2 }; - MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - mockPreparedStatement.getConnection(); - ctrlPreparedStatement.setReturnValue(mockConnection); - mockPreparedStatement.setInt(1, ids[0]); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.addBatch(); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setInt(1, ids[1]); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.addBatch(); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeBatch(); - ctrlPreparedStatement.setReturnValue(rowsAffected); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("MySQL"); - mockDatabaseMetaData.supportsBatchUpdates(); - ctrlDatabaseMetaData.setReturnValue(true); - - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockPreparedStatement); - mockConnection.getMetaData(); - ctrlConnection.setReturnValue(mockDatabaseMetaData, 2); - - ctrlPreparedStatement.replay(); - ctrlDatabaseMetaData.replay(); - replay(); + given(this.preparedStatement.executeBatch()).willReturn(rowsAffected); + mockDatabaseMetaData(true); BatchPreparedStatementSetter setter = new InterruptibleBatchPreparedStatementSetter() { @@ -883,58 +582,28 @@ public class JdbcTemplateTests extends AbstractJdbcTests { } }; - JdbcTemplate template = new JdbcTemplate(mockDataSource, false); + JdbcTemplate template = new JdbcTemplate(this.dataSource, false); int[] actualRowsAffected = template.batchUpdate(sql, setter); assertTrue("executed 2 updates", actualRowsAffected.length == 2); assertEquals(rowsAffected[0], actualRowsAffected[0]); assertEquals(rowsAffected[1], actualRowsAffected[1]); - ctrlPreparedStatement.verify(); - ctrlDatabaseMetaData.verify(); + verify(this.preparedStatement, times(2)).addBatch(); + verify(this.preparedStatement).setInt(1, ids[0]); + verify(this.preparedStatement).setInt(1, ids[1]); + verify(this.preparedStatement).close(); + verify(this.connection, atLeastOnce()).close(); } + @Test public void testInterruptibleBatchUpdateWithBaseClass() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; final int[] ids = new int[] { 100, 200 }; final int[] rowsAffected = new int[] { 1, 2 }; - MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - mockPreparedStatement.getConnection(); - ctrlPreparedStatement.setReturnValue(mockConnection); - mockPreparedStatement.setInt(1, ids[0]); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.addBatch(); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setInt(1, ids[1]); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.addBatch(); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeBatch(); - ctrlPreparedStatement.setReturnValue(rowsAffected); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("MySQL"); - mockDatabaseMetaData.supportsBatchUpdates(); - ctrlDatabaseMetaData.setReturnValue(true); - - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockPreparedStatement); - mockConnection.getMetaData(); - ctrlConnection.setReturnValue(mockDatabaseMetaData, 2); - - ctrlPreparedStatement.replay(); - ctrlDatabaseMetaData.replay(); - replay(); + given(this.preparedStatement.executeBatch()).willReturn(rowsAffected); + mockDatabaseMetaData(true); BatchPreparedStatementSetter setter = new AbstractInterruptibleBatchPreparedStatementSetter() { @@ -950,56 +619,28 @@ public class JdbcTemplateTests extends AbstractJdbcTests { } }; - JdbcTemplate template = new JdbcTemplate(mockDataSource, false); + JdbcTemplate template = new JdbcTemplate(this.dataSource, false); int[] actualRowsAffected = template.batchUpdate(sql, setter); assertTrue("executed 2 updates", actualRowsAffected.length == 2); assertEquals(rowsAffected[0], actualRowsAffected[0]); assertEquals(rowsAffected[1], actualRowsAffected[1]); - ctrlPreparedStatement.verify(); - ctrlDatabaseMetaData.verify(); + verify(this.preparedStatement, times(2)).addBatch(); + verify(this.preparedStatement).setInt(1, ids[0]); + verify(this.preparedStatement).setInt(1, ids[1]); + verify(this.preparedStatement).close(); + verify(this.connection, atLeastOnce()).close(); } + @Test public void testInterruptibleBatchUpdateWithBaseClassAndNoBatchSupport() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; final int[] ids = new int[] { 100, 200 }; final int[] rowsAffected = new int[] { 1, 2 }; - MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - mockPreparedStatement.getConnection(); - ctrlPreparedStatement.setReturnValue(mockConnection); - mockPreparedStatement.setInt(1, ids[0]); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(rowsAffected[0]); - mockPreparedStatement.setInt(1, ids[1]); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(rowsAffected[1]); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("MySQL"); - mockDatabaseMetaData.supportsBatchUpdates(); - ctrlDatabaseMetaData.setReturnValue(false); - - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockPreparedStatement); - mockConnection.getMetaData(); - ctrlConnection.setReturnValue(mockDatabaseMetaData, 2); - - ctrlPreparedStatement.replay(); - ctrlDatabaseMetaData.replay(); - replay(); + given(this.preparedStatement.executeUpdate()).willReturn(rowsAffected[0], rowsAffected[1]); + mockDatabaseMetaData(false); BatchPreparedStatementSetter setter = new AbstractInterruptibleBatchPreparedStatementSetter() { @@ -1015,46 +656,27 @@ public class JdbcTemplateTests extends AbstractJdbcTests { } }; - JdbcTemplate template = new JdbcTemplate(mockDataSource, false); + JdbcTemplate template = new JdbcTemplate(this.dataSource, false); int[] actualRowsAffected = template.batchUpdate(sql, setter); assertTrue("executed 2 updates", actualRowsAffected.length == 2); assertEquals(rowsAffected[0], actualRowsAffected[0]); assertEquals(rowsAffected[1], actualRowsAffected[1]); - ctrlPreparedStatement.verify(); - ctrlDatabaseMetaData.verify(); + verify(this.preparedStatement, never()).addBatch(); + verify(this.preparedStatement).setInt(1, ids[0]); + verify(this.preparedStatement).setInt(1, ids[1]); + verify(this.preparedStatement).close(); + verify(this.connection, atLeastOnce()).close(); } + @Test public void testBatchUpdateWithPreparedStatementAndNoBatchSupport() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; final int[] ids = new int[] { 100, 200 }; final int[] rowsAffected = new int[] { 1, 2 }; - MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - mockPreparedStatement.getConnection(); - ctrlPreparedStatement.setReturnValue(mockConnection); - mockPreparedStatement.setInt(1, ids[0]); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(rowsAffected[0]); - mockPreparedStatement.setInt(1, ids[1]); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(rowsAffected[1]); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockPreparedStatement); - - ctrlPreparedStatement.replay(); - replay(); + given(this.preparedStatement.executeUpdate()).willReturn(rowsAffected[0], rowsAffected[1]); BatchPreparedStatementSetter setter = new BatchPreparedStatementSetter() { @Override @@ -1067,56 +689,26 @@ public class JdbcTemplateTests extends AbstractJdbcTests { } }; - JdbcTemplate template = new JdbcTemplate(mockDataSource); - - int[] actualRowsAffected = template.batchUpdate(sql, setter); + int[] actualRowsAffected = this.template.batchUpdate(sql, setter); assertTrue("executed 2 updates", actualRowsAffected.length == 2); assertEquals(rowsAffected[0], actualRowsAffected[0]); assertEquals(rowsAffected[1], actualRowsAffected[1]); - ctrlPreparedStatement.verify(); + verify(this.preparedStatement, never()).addBatch(); + verify(this.preparedStatement).setInt(1, ids[0]); + verify(this.preparedStatement).setInt(1, ids[1]); + verify(this.preparedStatement).close(); + verify(this.connection).close(); } + @Test public void testBatchUpdateFails() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; final int[] ids = new int[] { 100, 200 }; - SQLException sex = new SQLException(); - - MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - mockPreparedStatement.getConnection(); - ctrlPreparedStatement.setReturnValue(mockConnection); - mockPreparedStatement.setInt(1, ids[0]); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.addBatch(); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setInt(1, ids[1]); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.addBatch(); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeBatch(); - ctrlPreparedStatement.setThrowable(sex); - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("MySQL"); - mockDatabaseMetaData.supportsBatchUpdates(); - ctrlDatabaseMetaData.setReturnValue(true); - - ctrlConnection.reset(); - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockPreparedStatement); - mockConnection.getMetaData(); - ctrlConnection.setReturnValue(mockDatabaseMetaData, 2); - mockConnection.close(); - ctrlConnection.setVoidCallable(2); - - ctrlPreparedStatement.replay(); - ctrlDatabaseMetaData.replay(); - replay(); + SQLException sqlException = new SQLException(); + + given(this.preparedStatement.executeBatch()).willThrow(sqlException); + mockDatabaseMetaData(true); BatchPreparedStatementSetter setter = new BatchPreparedStatementSetter() { @Override @@ -1129,19 +721,21 @@ public class JdbcTemplateTests extends AbstractJdbcTests { } }; + this.thrown.expect(DataAccessException.class); + this.thrown.expect(exceptionCause(sameInstance(sqlException))); try { - JdbcTemplate template = new JdbcTemplate(mockDataSource); - template.batchUpdate(sql, setter); - fail("Should have failed because of SQLException in bulk update"); + this.template.batchUpdate(sql, setter); } - catch (DataAccessException ex) { - assertTrue("Root cause is SQLException", ex.getCause() == sex); + finally { + verify(this.preparedStatement, times(2)).addBatch(); + verify(this.preparedStatement).setInt(1, ids[0]); + verify(this.preparedStatement).setInt(1, ids[1]); + verify(this.preparedStatement).close(); + verify(this.connection, atLeastOnce()).close(); } - - ctrlPreparedStatement.verify(); - ctrlDatabaseMetaData.verify(); } + @Test public void testBatchUpdateWithListOfObjectArrays() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; @@ -1150,22 +744,10 @@ public class JdbcTemplateTests extends AbstractJdbcTests { ids.add(new Object[] {200}); final int[] rowsAffected = new int[] { 1, 2 }; - MockControl ctrlDataSource = MockControl.createControl(DataSource.class); - DataSource mockDataSource = (DataSource) ctrlDataSource.getMock(); - MockControl ctrlConnection = MockControl.createControl(Connection.class); - Connection mockConnection = (Connection) ctrlConnection.getMock(); - MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - - BatchUpdateTestHelper.prepareBatchUpdateMocks(sql, ids, null, rowsAffected, ctrlDataSource, mockDataSource, ctrlConnection, - mockConnection, ctrlPreparedStatement, mockPreparedStatement, ctrlDatabaseMetaData, - mockDatabaseMetaData); - - BatchUpdateTestHelper.replayBatchUpdateMocks(ctrlDataSource, ctrlConnection, ctrlPreparedStatement, ctrlDatabaseMetaData); + given(this.preparedStatement.executeBatch()).willReturn(rowsAffected); + mockDatabaseMetaData(true); - JdbcTemplate template = new JdbcTemplate(mockDataSource, false); + JdbcTemplate template = new JdbcTemplate(this.dataSource, false); int[] actualRowsAffected = template.batchUpdate(sql, ids); @@ -1173,11 +755,15 @@ public class JdbcTemplateTests extends AbstractJdbcTests { assertEquals(rowsAffected[0], actualRowsAffected[0]); assertEquals(rowsAffected[1], actualRowsAffected[1]); - BatchUpdateTestHelper.verifyBatchUpdateMocks(ctrlPreparedStatement, ctrlDatabaseMetaData); + verify(this.preparedStatement, times(2)).addBatch(); + verify(this.preparedStatement).setObject(1, 100); + verify(this.preparedStatement).setObject(1, 200); + verify(this.preparedStatement).close(); + verify(this.connection, atLeastOnce()).close(); } + @Test public void testBatchUpdateWithListOfObjectArraysPlusTypeInfo() throws Exception { - final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; final List ids = new ArrayList(); ids.add(new Object[] {100}); @@ -1185,92 +771,40 @@ public class JdbcTemplateTests extends AbstractJdbcTests { final int[] sqlTypes = new int[] {Types.NUMERIC}; final int[] rowsAffected = new int[] { 1, 2 }; - MockControl ctrlDataSource = MockControl.createControl(DataSource.class); - DataSource mockDataSource = (DataSource) ctrlDataSource.getMock(); - MockControl ctrlConnection = MockControl.createControl(Connection.class); - Connection mockConnection = (Connection) ctrlConnection.getMock(); - MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - - BatchUpdateTestHelper.prepareBatchUpdateMocks(sql, ids, sqlTypes, rowsAffected, ctrlDataSource, mockDataSource, ctrlConnection, - mockConnection, ctrlPreparedStatement, mockPreparedStatement, ctrlDatabaseMetaData, - mockDatabaseMetaData); - - BatchUpdateTestHelper.replayBatchUpdateMocks(ctrlDataSource, ctrlConnection, ctrlPreparedStatement, ctrlDatabaseMetaData); + given(this.preparedStatement.executeBatch()).willReturn(rowsAffected); + mockDatabaseMetaData(true); - JdbcTemplate template = new JdbcTemplate(mockDataSource, false); - - int[] actualRowsAffected = template.batchUpdate(sql, ids, sqlTypes); + this.template = new JdbcTemplate(this.dataSource, false); + int[] actualRowsAffected = this.template.batchUpdate(sql, ids, sqlTypes); assertTrue("executed 2 updates", actualRowsAffected.length == 2); assertEquals(rowsAffected[0], actualRowsAffected[0]); assertEquals(rowsAffected[1], actualRowsAffected[1]); - - BatchUpdateTestHelper.verifyBatchUpdateMocks(ctrlPreparedStatement, ctrlDatabaseMetaData); + verify(this.preparedStatement, times(2)).addBatch(); + verify(this.preparedStatement).setObject(1, 100, sqlTypes[0]); + verify(this.preparedStatement).setObject(1, 200, sqlTypes[0]); + verify(this.preparedStatement).close(); + verify(this.connection, atLeastOnce()).close(); } + @Test public void testBatchUpdateWithCollectionOfObjects() throws Exception { final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; - final List ids = new ArrayList(); - ids.add(Integer.valueOf(100)); - ids.add(Integer.valueOf(200)); - ids.add(Integer.valueOf(300)); + final List ids = Arrays.asList(100, 200, 300); final int[] rowsAffected1 = new int[] { 1, 2 }; final int[] rowsAffected2 = new int[] { 3 }; - MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - mockPreparedStatement.getConnection(); - ctrlPreparedStatement.setReturnValue(mockConnection); - mockPreparedStatement.setInt(1, ids.get(0)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.addBatch(); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setInt(1, ids.get(1)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.addBatch(); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setInt(1, ids.get(2)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeBatch(); - ctrlPreparedStatement.setReturnValue(rowsAffected1); - mockPreparedStatement.addBatch(); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeBatch(); - ctrlPreparedStatement.setReturnValue(rowsAffected2); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("MySQL"); - mockDatabaseMetaData.supportsBatchUpdates(); - ctrlDatabaseMetaData.setReturnValue(true); - - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockPreparedStatement); - mockConnection.getMetaData(); - ctrlConnection.setReturnValue(mockDatabaseMetaData, 2); - - ctrlPreparedStatement.replay(); - ctrlDatabaseMetaData.replay(); - replay(); - - ParameterizedPreparedStatementSetter setter = new ParameterizedPreparedStatementSetter() { + given(this.preparedStatement.executeBatch()).willReturn(rowsAffected1, rowsAffected2); + mockDatabaseMetaData(true); + + ParameterizedPreparedStatementSetter setter = new ParameterizedPreparedStatementSetter() { @Override public void setValues(PreparedStatement ps, Integer argument) throws SQLException { ps.setInt(1, argument.intValue()); } }; - JdbcTemplate template = new JdbcTemplate(mockDataSource, false); + JdbcTemplate template = new JdbcTemplate(this.dataSource, false); int[][] actualRowsAffected = template.batchUpdate(sql, ids, 2, setter); assertTrue("executed 2 updates", actualRowsAffected[0].length == 2); @@ -1278,131 +812,47 @@ public class JdbcTemplateTests extends AbstractJdbcTests { assertEquals(rowsAffected1[1], actualRowsAffected[0][1]); assertEquals(rowsAffected2[0], actualRowsAffected[1][0]); - ctrlPreparedStatement.verify(); - ctrlDatabaseMetaData.verify(); - } - - public void testCouldntGetConnectionOrExceptionTranslator() throws SQLException { - SQLException sex = new SQLException("foo", "07xxx"); - - ctrlDataSource = MockControl.createControl(DataSource.class); - mockDataSource = (DataSource) ctrlDataSource.getMock(); - mockDataSource.getConnection(); - // Expect two calls (one call after caching data product name): make get metadata fail also - ctrlDataSource.setThrowable(sex, 2); - replay(); - - try { - JdbcTemplate template = new JdbcTemplate(mockDataSource, false); - RowCountCallbackHandler rcch = new RowCountCallbackHandler(); - template.query("SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3", rcch); - fail("Shouldn't have executed query without a connection"); - } - catch (CannotGetJdbcConnectionException ex) { - // pass - assertTrue("Check root cause", ex.getCause() == sex); - } - - ctrlDataSource.verify(); + verify(this.preparedStatement, times(3)).addBatch(); + verify(this.preparedStatement).setInt(1, ids.get(0)); + verify(this.preparedStatement).setInt(1, ids.get(1)); + verify(this.preparedStatement).setInt(1, ids.get(2)); + verify(this.preparedStatement).close(); + verify(this.connection, atLeastOnce()).close(); } + @Test public void testCouldntGetConnectionForOperationOrExceptionTranslator() throws SQLException { - SQLException sex = new SQLException("foo", "07xxx"); - - // Change behavior in setUp() because we only expect one call to getConnection(): - // none is necessary to get metadata for exception translator - ctrlDataSource = MockControl.createControl(DataSource.class); - mockDataSource = (DataSource) ctrlDataSource.getMock(); - mockDataSource.getConnection(); - // Expect two calls (one call after caching data product name): make get Metadata fail also - ctrlDataSource.setThrowable(sex, 2); - replay(); - - try { - JdbcTemplate template = new JdbcTemplate(mockDataSource, false); - RowCountCallbackHandler rcch = new RowCountCallbackHandler(); - template.query("SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3", rcch); - fail("Shouldn't have executed query without a connection"); - } - catch (CannotGetJdbcConnectionException ex) { - // pass - assertTrue("Check root cause", ex.getCause() == sex); - } - - ctrlDataSource.verify(); + SQLException sqlException = new SQLException("foo", "07xxx"); + this.dataSource = mock(DataSource.class); + given(this.dataSource.getConnection()).willThrow(sqlException); + JdbcTemplate template = new JdbcTemplate(this.dataSource, false); + RowCountCallbackHandler rcch = new RowCountCallbackHandler(); + this.thrown.expect(CannotGetJdbcConnectionException.class); + this.thrown.expect(exceptionCause(sameInstance(sqlException))); + template.query("SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3", rcch); } + @Test public void testCouldntGetConnectionForOperationWithLazyExceptionTranslator() throws SQLException { - SQLException sex = new SQLException("foo", "07xxx"); - - ctrlDataSource = MockControl.createControl(DataSource.class); - mockDataSource = (DataSource) ctrlDataSource.getMock(); - mockDataSource.getConnection(); - ctrlDataSource.setThrowable(sex, 1); - replay(); - - try { - JdbcTemplate template2 = new JdbcTemplate(); - template2.setDataSource(mockDataSource); - template2.afterPropertiesSet(); - RowCountCallbackHandler rcch = new RowCountCallbackHandler(); - template2.query("SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3", rcch); - fail("Shouldn't have executed query without a connection"); - } - catch (CannotGetJdbcConnectionException ex) { - // pass - assertTrue("Check root cause", ex.getCause() == sex); - } - - ctrlDataSource.verify(); - } - - /** - * Verify that afterPropertiesSet invokes exception translator. - */ - public void testCouldntGetConnectionInOperationWithExceptionTranslatorInitialized() throws SQLException { - SQLException sex = new SQLException("foo", "07xxx"); - - ctrlDataSource = MockControl.createControl(DataSource.class); - mockDataSource = (DataSource) ctrlDataSource.getMock(); - //mockConnection.getMetaData(); - //ctrlConnection.setReturnValue(null, 1); - //mockConnection.close(); - //ctrlConnection.setVoidCallable(1); - ctrlConnection.replay(); - - // Change behaviour in setUp() because we only expect one call to getConnection(): - // none is necessary to get metadata for exception translator - ctrlDataSource = MockControl.createControl(DataSource.class); - mockDataSource = (DataSource) ctrlDataSource.getMock(); - // Upfront call for metadata - no longer the case - //mockDataSource.getConnection(); - //ctrlDataSource.setReturnValue(mockConnection, 1); - // One call for operation - mockDataSource.getConnection(); - ctrlDataSource.setThrowable(sex, 2); - ctrlDataSource.replay(); - - try { - JdbcTemplate template = new JdbcTemplate(mockDataSource, false); - RowCountCallbackHandler rcch = new RowCountCallbackHandler(); - template.query("SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3", rcch); - fail("Shouldn't have executed query without a connection"); - } - catch (CannotGetJdbcConnectionException ex) { - // pass - assertTrue("Check root cause", ex.getCause() == sex); - } - - ctrlDataSource.verify(); - ctrlConnection.verify(); + SQLException sqlException = new SQLException("foo", "07xxx"); + this.dataSource = mock(DataSource.class); + given(this.dataSource.getConnection()).willThrow(sqlException); + this.template = new JdbcTemplate(); + this.template.setDataSource(this.dataSource); + this.template.afterPropertiesSet(); + RowCountCallbackHandler rcch = new RowCountCallbackHandler(); + this.thrown.expect(CannotGetJdbcConnectionException.class); + this.thrown.expect(exceptionCause(sameInstance(sqlException))); + this.template.query("SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3", rcch); } + @Test public void testCouldntGetConnectionInOperationWithExceptionTranslatorInitializedViaBeanProperty() throws Exception { doTestCouldntGetConnectionInOperationWithExceptionTranslatorInitialized(true); } + @Test public void testCouldntGetConnectionInOperationWithExceptionTranslatorInitializedInAfterPropertiesSet() throws Exception { doTestCouldntGetConnectionInOperationWithExceptionTranslatorInitialized(false); @@ -1414,83 +864,33 @@ public class JdbcTemplateTests extends AbstractJdbcTests { */ private void doTestCouldntGetConnectionInOperationWithExceptionTranslatorInitialized(boolean beanProperty) throws SQLException { - - SQLException sex = new SQLException("foo", "07xxx"); - - ctrlConnection = MockControl.createControl(Connection.class); - mockConnection = (Connection) ctrlConnection.getMock(); - //mockConnection.getMetaData(); - //ctrlConnection.setReturnValue(null, 1); - //mockConnection.close(); - //ctrlConnection.setVoidCallable(1); - ctrlConnection.replay(); - - // Change behaviour in setUp() because we only expect one call to getConnection(): - // none is necessary to get metadata for exception translator - ctrlDataSource = MockControl.createControl(DataSource.class); - mockDataSource = (DataSource) ctrlDataSource.getMock(); - // Upfront call for metadata - no longer the case - //mockDataSource.getConnection(); - //ctrlDataSource.setReturnValue(mockConnection, 1); - // One call for operation - mockDataSource.getConnection(); - ctrlDataSource.setThrowable(sex, 2); - ctrlDataSource.replay(); - - try { - JdbcTemplate template2 = new JdbcTemplate(); - template2.setDataSource(mockDataSource); - template2.setLazyInit(false); - if (beanProperty) { - // This will get a connection. - template2.setExceptionTranslator(new SQLErrorCodeSQLExceptionTranslator(mockDataSource)); - } - else { - // This will cause creation of default SQL translator. - // Note that only call should be effective. - template2.afterPropertiesSet(); - template2.afterPropertiesSet(); - } - RowCountCallbackHandler rcch = new RowCountCallbackHandler(); - template2.query( - "SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3", - rcch); - fail("Shouldn't have executed query without a connection"); + SQLException sqlException = new SQLException("foo", "07xxx"); + this.dataSource = mock(DataSource.class); + given(this.dataSource.getConnection()).willThrow(sqlException); + this.template = new JdbcTemplate(); + this.template.setDataSource(this.dataSource); + this.template.setLazyInit(false); + if (beanProperty) { + // This will get a connection. + this.template.setExceptionTranslator(new SQLErrorCodeSQLExceptionTranslator(this.dataSource)); } - catch (CannotGetJdbcConnectionException ex) { - // pass - assertTrue("Check root cause", ex.getCause() == sex); + else { + // This will cause creation of default SQL translator. + this.template.afterPropertiesSet(); } - - ctrlDataSource.verify(); - ctrlConnection.verify(); + RowCountCallbackHandler rcch = new RowCountCallbackHandler(); + this.thrown.expect(CannotGetJdbcConnectionException.class); + this.thrown.expect(exceptionCause(sameInstance(sqlException))); + this.template.query("SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3", rcch); } + @Test public void testPreparedStatementSetterSucceeds() throws Exception { final String sql = "UPDATE FOO SET NAME=? WHERE ID = 1"; final String name = "Gary"; int expectedRowsUpdated = 1; - MockControl ctrlPreparedStatement = - MockControl.createControl(PreparedStatement.class); - PreparedStatement mockPreparedStatement = - (PreparedStatement) ctrlPreparedStatement.getMock(); - mockPreparedStatement.setString(1, name); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(expectedRowsUpdated); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockPreparedStatement); - - ctrlPreparedStatement.replay(); - replay(); + given(this.preparedStatement.executeUpdate()).willReturn(expectedRowsUpdated); PreparedStatementSetter pss = new PreparedStatementSetter() { @Override @@ -1498,36 +898,19 @@ public class JdbcTemplateTests extends AbstractJdbcTests { ps.setString(1, name); } }; - int actualRowsUpdated = - new JdbcTemplate(mockDataSource).update(sql, pss); - assertTrue( - "updated correct # of rows", - actualRowsUpdated == expectedRowsUpdated); - - ctrlPreparedStatement.verify(); + int actualRowsUpdated = new JdbcTemplate(this.dataSource).update(sql, pss); + assertTrue("updated correct # of rows", actualRowsUpdated == expectedRowsUpdated); + verify(this.preparedStatement).setString(1, name); + verify(this.preparedStatement).close(); + verify(this.connection).close(); } + @Test public void testPreparedStatementSetterFails() throws Exception { final String sql = "UPDATE FOO SET NAME=? WHERE ID = 1"; final String name = "Gary"; - SQLException sex = new SQLException(); - - MockControl ctrlPreparedStatement = - MockControl.createControl(PreparedStatement.class); - PreparedStatement mockPreparedStatement = - (PreparedStatement) ctrlPreparedStatement.getMock(); - mockPreparedStatement.setString(1, name); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setThrowable(sex); - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockPreparedStatement); - - ctrlPreparedStatement.replay(); - replay(); + SQLException sqlException = new SQLException(); + given(this.preparedStatement.executeUpdate()).willThrow(sqlException); PreparedStatementSetter pss = new PreparedStatementSetter() { @Override @@ -1535,85 +918,48 @@ public class JdbcTemplateTests extends AbstractJdbcTests { ps.setString(1, name); } }; + this.thrown.expect(DataAccessException.class); + this.thrown.expect(exceptionCause(sameInstance(sqlException))); try { - new JdbcTemplate(mockDataSource).update(sql, pss); - fail("Should have failed with SQLException"); + new JdbcTemplate(this.dataSource).update(sql, pss); } - catch (DataAccessException ex) { - assertTrue("root cause was preserved", ex.getCause() == sex); + finally { + verify(this.preparedStatement).setString(1, name); + verify(this.preparedStatement).close(); + verify(this.connection, atLeastOnce()).close(); } - - ctrlPreparedStatement.verify(); } + @Test public void testCouldntClose() throws Exception { - MockControl ctrlStatement = MockControl.createControl(Statement.class); - Statement mockStatement = (Statement) ctrlStatement.getMock(); - MockControl ctrlResultSet = MockControl.createControl(ResultSet.class); - ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock(); - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - String sql = "SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3"; - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - SQLException sex = new SQLException("bar"); - mockResultSet.close(); - ctrlResultSet.setThrowable(sex); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setThrowable(sex); - mockConnection.close(); - ctrlConnection.setThrowable(sex); - - ctrlStatement.replay(); - ctrlResultSet.replay(); - replay(); + SQLException sqlException = new SQLException("bar"); + given(this.connection.createStatement()).willReturn(this.statement); + given(this.resultSet.next()).willReturn(false); + willThrow(sqlException).given(this.resultSet).close(); + willThrow(sqlException).given(this.statement).close(); + willThrow(sqlException).given(this.connection).close(); - JdbcTemplate template2 = new JdbcTemplate(mockDataSource); RowCountCallbackHandler rcch = new RowCountCallbackHandler(); - template2.query("SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3", rcch); - - ctrlStatement.verify(); - ctrlResultSet.verify(); + this.template.query("SELECT ID, FORENAME FROM CUSTMR WHERE ID < 3", rcch); + verify(this.connection).close(); } /** * Mock objects allow us to produce warnings at will */ + @Test public void testFatalWarning() throws Exception { String sql = "SELECT forename from custmr"; SQLWarning warnings = new SQLWarning("My warning"); - MockControl ctrlResultSet = MockControl.createControl(ResultSet.class); - ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock(); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - MockControl ctrlStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockStatement = (PreparedStatement) ctrlStatement.getMock(); - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(warnings); - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - ctrlResultSet.replay(); - ctrlStatement.replay(); - replay(); - - JdbcTemplate t = new JdbcTemplate(mockDataSource); + given(this.resultSet.next()).willReturn(false); + given(this.preparedStatement.getWarnings()).willReturn(warnings); + given(this.connection.createStatement()).willReturn(this.preparedStatement); + + JdbcTemplate t = new JdbcTemplate(this.dataSource); t.setIgnoreWarnings(false); + this.thrown.expect(SQLWarningException.class); + this.thrown.expect(exceptionCause(sameInstance(warnings))); try { t.query(sql, new RowCallbackHandler() { @Override @@ -1621,163 +967,93 @@ public class JdbcTemplateTests extends AbstractJdbcTests { rs.getByte(1); } }); - fail("Should have thrown exception on warning"); } - catch (SQLWarningException ex) { - // Pass - assertTrue( - "Root cause of warning was correct", - ex.getCause() == warnings); + finally { + verify(this.resultSet).close(); + verify(this.preparedStatement).close(); + verify(this.connection).close(); } - - ctrlResultSet.verify(); - ctrlStatement.verify(); } + @Test public void testIgnoredWarning() throws Exception { String sql = "SELECT forename from custmr"; SQLWarning warnings = new SQLWarning("My warning"); - MockControl ctrlResultSet = MockControl.createControl(ResultSet.class); - ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock(); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - MockControl ctrlStatement = - MockControl.createControl(PreparedStatement.class); - PreparedStatement mockStatement = - (PreparedStatement) ctrlStatement.getMock(); - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - ctrlResultSet.replay(); - ctrlStatement.replay(); - replay(); + given(this.resultSet.next()).willReturn(false); + given(this.connection.createStatement()).willReturn(this.preparedStatement); + given(this.preparedStatement.getWarnings()).willReturn(warnings); // Too long: truncation - JdbcTemplate template = new JdbcTemplate(mockDataSource); - template.setIgnoreWarnings(true); - template.query(sql, new RowCallbackHandler() { + + this.template.setIgnoreWarnings(true); + this.template.query(sql, new RowCallbackHandler() { @Override - public void processRow(ResultSet rs) - throws java.sql.SQLException { + public void processRow(ResultSet rs) throws java.sql.SQLException { rs.getByte(1); } }); - ctrlResultSet.verify(); - ctrlStatement.verify(); + verify(this.resultSet).close(); + verify(this.preparedStatement).close(); + verify(this.connection).close(); } + @Test public void testSQLErrorCodeTranslation() throws Exception { - final SQLException sex = new SQLException("I have a known problem", "99999", 1054); + final SQLException sqlException = new SQLException("I have a known problem", "99999", 1054); final String sql = "SELECT ID FROM CUSTOMER"; - MockControl ctrlResultSet = MockControl.createControl(ResultSet.class); - ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock(); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - MockControl ctrlStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockStatement = (PreparedStatement) ctrlStatement.getMock(); - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("MySQL"); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - mockConnection.getMetaData(); - ctrlConnection.setReturnValue(mockDatabaseMetaData); - - ctrlResultSet.replay(); - ctrlStatement.replay(); - ctrlDatabaseMetaData.replay(); - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); + given(this.resultSet.next()).willReturn(true); + mockDatabaseMetaData(false); + given(this.connection.createStatement()).willReturn(this.preparedStatement); + + this.thrown.expect(BadSqlGrammarException.class); + this.thrown.expect(exceptionCause(sameInstance(sqlException))); try { - template.query(sql, new RowCallbackHandler() { + this.template.query(sql, new RowCallbackHandler() { @Override public void processRow(ResultSet rs) throws SQLException { - throw sex; + throw sqlException; } }); fail("Should have thrown BadSqlGrammarException"); } - catch (BadSqlGrammarException ex) { - // expected - assertTrue("Wanted same exception back, not " + ex, sex == ex.getCause()); + finally { + verify(this.resultSet).close(); + verify(this.preparedStatement).close(); + verify(this.connection, atLeastOnce()).close(); } - - ctrlResultSet.verify(); - ctrlStatement.verify(); - ctrlDatabaseMetaData.verify(); } + @Test public void testSQLErrorCodeTranslationWithSpecifiedDbName() throws Exception { - final SQLException sex = new SQLException("I have a known problem", "99999", 1054); + final SQLException sqlException = new SQLException("I have a known problem", "99999", 1054); final String sql = "SELECT ID FROM CUSTOMER"; - MockControl ctrlResultSet = MockControl.createControl(ResultSet.class); - ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock(); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - MockControl ctrlStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockStatement = (PreparedStatement) ctrlStatement.getMock(); - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - ctrlResultSet.replay(); - ctrlStatement.replay(); - replay(); + given(this.resultSet.next()).willReturn(true); + given(this.connection.createStatement()).willReturn(this.preparedStatement); JdbcTemplate template = new JdbcTemplate(); - template.setDataSource(mockDataSource); + template.setDataSource(this.dataSource); template.setDatabaseProductName("MySQL"); template.afterPropertiesSet(); + + this.thrown.expect(BadSqlGrammarException.class); + this.thrown.expect(exceptionCause(sameInstance(sqlException))); try { template.query(sql, new RowCallbackHandler() { @Override public void processRow(ResultSet rs) throws SQLException { - throw sex; + throw sqlException; } }); - fail("Should have thrown BadSqlGrammarException"); } - catch (BadSqlGrammarException ex) { - // expected - assertTrue("Wanted same exception back, not " + ex, sex == ex.getCause()); + finally { + verify(this.resultSet).close(); + verify(this.preparedStatement).close(); + verify(this.connection).close(); } - - ctrlResultSet.verify(); - ctrlStatement.verify(); } /** @@ -1785,152 +1061,60 @@ public class JdbcTemplateTests extends AbstractJdbcTests { * If we provide the SQLExceptionTranslator, we shouldn't use a connection * to get the metadata */ + @Test public void testUseCustomSQLErrorCodeTranslator() throws Exception { // Bad SQL state - final SQLException sex = new SQLException("I have a known problem", "07000", 1054); + final SQLException sqlException = new SQLException("I have a known problem", "07000", 1054); final String sql = "SELECT ID FROM CUSTOMER"; - MockControl ctrlResultSet = MockControl.createControl(ResultSet.class); - ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock(); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - MockControl ctrlStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockStatement = (PreparedStatement) ctrlStatement.getMock(); - mockStatement.executeQuery(sql); - ctrlStatement.setReturnValue(mockResultSet); - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - // Change behaviour in setUp() because we only expect one call to getConnection(): - // none is necessary to get metadata for exception translator - ctrlConnection = MockControl.createControl(Connection.class); - mockConnection = (Connection) ctrlConnection.getMock(); - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement, 1); - mockConnection.close(); - ctrlConnection.setVoidCallable(1); - ctrlConnection.replay(); - - ctrlDataSource = MockControl.createControl(DataSource.class); - mockDataSource = (DataSource) ctrlDataSource.getMock(); - mockDataSource.getConnection(); - ctrlDataSource.setReturnValue(mockConnection, 1); - ctrlDataSource.replay(); - ///// end changed behaviour - - ctrlResultSet.replay(); - ctrlStatement.replay(); + given(this.resultSet.next()).willReturn(true); + given(this.connection.createStatement()).willReturn(this.preparedStatement); JdbcTemplate template = new JdbcTemplate(); - template.setDataSource(mockDataSource); + template.setDataSource(this.dataSource); // Set custom exception translator template.setExceptionTranslator(new SQLStateSQLExceptionTranslator()); template.afterPropertiesSet(); + + this.thrown.expect(BadSqlGrammarException.class); + this.thrown.expect(exceptionCause(sameInstance(sqlException))); try { template.query(sql, new RowCallbackHandler() { @Override - public void processRow(ResultSet rs) - throws SQLException { - throw sex; + public void processRow(ResultSet rs) throws SQLException { + throw sqlException; } }); - fail("Should have thrown exception"); } - catch (BadSqlGrammarException ex) { - assertTrue( - "Wanted same exception back, not " + ex, - sex == ex.getCause()); + finally { + verify(this.resultSet).close(); + verify(this.preparedStatement).close(); + verify(this.connection).close(); } - - ctrlResultSet.verify(); - ctrlStatement.verify(); - - // We didn't call superclass replay() so we need to check these ourselves - ctrlDataSource.verify(); - ctrlConnection.verify(); } + @Test public void testNativeJdbcExtractorInvoked() throws Exception { - MockControl ctrlResultSet = MockControl.createControl(ResultSet.class); - final ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock(); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(2); - - MockControl ctrlStatement = MockControl.createControl(Statement.class); - final Statement mockStatement = (Statement) ctrlStatement.getMock(); - if (debugEnabled) { - mockStatement.getWarnings(); - ctrlStatement.setReturnValue(null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - MockControl ctrlStatement2 = MockControl.createControl(Statement.class); - final Statement mockStatement2 = (Statement) ctrlStatement2.getMock(); - mockStatement2.executeQuery("my query"); - ctrlStatement2.setReturnValue(mockResultSet, 1); - - MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - final PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - MockControl ctrlPreparedStatement2 = MockControl.createControl(PreparedStatement.class); - final PreparedStatement mockPreparedStatement2 = (PreparedStatement) ctrlPreparedStatement2.getMock(); - mockPreparedStatement2.executeQuery(); - ctrlPreparedStatement2.setReturnValue(mockResultSet, 1); - - MockControl ctrlReturnResultSet = MockControl.createControl(ResultSet.class); - final ResultSet mockReturnResultSet = (ResultSet) ctrlReturnResultSet.getMock(); - mockReturnResultSet.next(); - ctrlReturnResultSet.setReturnValue(false); - mockReturnResultSet.close(); - ctrlReturnResultSet.setVoidCallable(2); - - MockControl ctrlCallableStatement = MockControl.createControl(CallableStatement.class); - final CallableStatement mockCallableStatement = (CallableStatement) ctrlCallableStatement.getMock(); - if (debugEnabled) { - mockCallableStatement.getWarnings(); - ctrlCallableStatement.setReturnValue(null); - } - mockCallableStatement.close(); - ctrlCallableStatement.setVoidCallable(); - MockControl ctrlCallableStatement2 = MockControl.createControl(CallableStatement.class); - final CallableStatement mockCallableStatement2 = (CallableStatement) ctrlCallableStatement2.getMock(); - mockCallableStatement2.execute(); - ctrlCallableStatement2.setReturnValue(true); - mockCallableStatement2.getUpdateCount(); - ctrlCallableStatement2.setReturnValue(-1); - mockCallableStatement2.getResultSet(); - ctrlCallableStatement2.setReturnValue(mockReturnResultSet); - mockCallableStatement2.getMoreResults(); - ctrlCallableStatement2.setReturnValue(false); - mockCallableStatement2.getUpdateCount(); - ctrlCallableStatement2.setReturnValue(-1); - - ctrlResultSet.replay(); - ctrlStatement.replay(); - ctrlStatement2.replay(); - ctrlPreparedStatement.replay(); - ctrlPreparedStatement2.replay(); - ctrlReturnResultSet.replay();; - ctrlCallableStatement.replay(); - ctrlCallableStatement2.replay(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement, 1); - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); - template.setNativeJdbcExtractor(new NativeJdbcExtractor() { + + final Statement statement2 = mock(Statement.class); + given(statement2.executeQuery(anyString())).willReturn(this.resultSet); + + final PreparedStatement preparedStatement2 = mock(PreparedStatement.class); + given(preparedStatement2.executeQuery()).willReturn(this.resultSet); + + final ResultSet returnResultSet = mock(ResultSet.class); + given(returnResultSet.next()).willReturn(false); + + final CallableStatement callableStatement = mock(CallableStatement.class); + final CallableStatement callableStatement2 = mock(CallableStatement.class); + given(callableStatement2.execute()).willReturn(true); + given(callableStatement2.getUpdateCount()).willReturn(-1); + given(callableStatement2.getResultSet()).willReturn(returnResultSet); + given(callableStatement2.getUpdateCount()).willReturn(-1); + + given(this.connection.createStatement()).willReturn(this.statement); + + this.template.setNativeJdbcExtractor(new NativeJdbcExtractor() { @Override public boolean isNativeConnectionNecessaryForNativeStatements() { return false; @@ -1953,18 +1137,18 @@ public class JdbcTemplateTests extends AbstractJdbcTests { } @Override public Statement getNativeStatement(Statement stmt) { - assertTrue(stmt == mockStatement); - return mockStatement2; + assertTrue(stmt == JdbcTemplateTests.this.statement); + return statement2; } @Override public PreparedStatement getNativePreparedStatement(PreparedStatement ps) { - assertTrue(ps == mockPreparedStatement); - return mockPreparedStatement2; + assertTrue(ps == JdbcTemplateTests.this.preparedStatement); + return preparedStatement2; } @Override public CallableStatement getNativeCallableStatement(CallableStatement cs) { - assertTrue(cs == mockCallableStatement); - return mockCallableStatement2; + assertTrue(cs == callableStatement); + return callableStatement2; } @Override public ResultSet getNativeResultSet(ResultSet rs) { @@ -1972,92 +1156,51 @@ public class JdbcTemplateTests extends AbstractJdbcTests { } }); - template.query("my query", new ResultSetExtractor() { + this.template.query("my query", new ResultSetExtractor() { @Override public Object extractData(ResultSet rs2) { - assertEquals(mockResultSet, rs2); + assertEquals(JdbcTemplateTests.this.resultSet, rs2); return null; } }); - template.query(new PreparedStatementCreator() { + this.template.query(new PreparedStatementCreator() { @Override public PreparedStatement createPreparedStatement(Connection conn) { - return mockPreparedStatement; + return JdbcTemplateTests.this.preparedStatement; } - }, new ResultSetExtractor() { + }, new ResultSetExtractor() { @Override public Object extractData(ResultSet rs2) { - assertEquals(mockResultSet, rs2); + assertEquals(JdbcTemplateTests.this.resultSet, rs2); return null; } }); - template.call(new CallableStatementCreator() { + this.template.call(new CallableStatementCreator() { @Override public CallableStatement createCallableStatement(Connection con) { - return mockCallableStatement; + return callableStatement; } - }, - new ArrayList()); - - ctrlStatement.verify(); - ctrlStatement2.verify(); - ctrlPreparedStatement.verify(); - ctrlPreparedStatement2.verify(); - ctrlCallableStatement.verify(); - ctrlCallableStatement2.verify(); + }, new ArrayList()); + + verify(this.resultSet, times(2)).close(); + verify(this.statement).close(); + verify(this.preparedStatement).close(); + verify(returnResultSet).close(); + verify(callableStatement).close(); + verify(this.connection, atLeastOnce()).close(); } + @Test public void testStaticResultSetClosed() throws Exception { - MockControl ctrlResultSet; - ResultSet mockResultSet; - MockControl ctrlStatement; - Statement mockStatement; - MockControl ctrlResultSet2; - ResultSet mockResultSet2; - MockControl ctrlPreparedStatement; - PreparedStatement mockPreparedStatement; - - ctrlResultSet = MockControl.createControl(ResultSet.class); - mockResultSet = (ResultSet) ctrlResultSet.getMock(); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - ctrlStatement = MockControl.createControl(Statement.class); - mockStatement = (Statement) ctrlStatement.getMock(); - mockStatement.executeQuery("my query"); - ctrlStatement.setReturnValue(mockResultSet); - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - ctrlResultSet2 = MockControl.createControl(ResultSet.class); - mockResultSet2 = (ResultSet) ctrlResultSet2.getMock(); - mockResultSet2.close(); - ctrlResultSet2.setVoidCallable(); - - ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet2); - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - mockConnection.prepareStatement("my query"); - ctrlConnection.setReturnValue(mockPreparedStatement); - - ctrlResultSet.replay(); - ctrlStatement.replay(); - ctrlResultSet2.replay(); - ctrlPreparedStatement.replay(); - replay(); - - JdbcTemplate template = new JdbcTemplate(mockDataSource); + ResultSet resultSet2 = mock(ResultSet.class); + reset(this.preparedStatement); + given(this.preparedStatement.executeQuery()).willReturn(resultSet2); + given(this.connection.createStatement()).willReturn(this.statement); try { - template.query("my query", new ResultSetExtractor() { + this.template.query("my query", new ResultSetExtractor() { @Override public Object extractData(ResultSet rs) { throw new InvalidDataAccessApiUsageException(""); @@ -2070,15 +1213,13 @@ public class JdbcTemplateTests extends AbstractJdbcTests { } try { - template.query(new PreparedStatementCreator() { + this.template.query(new PreparedStatementCreator() { @Override - public PreparedStatement createPreparedStatement(Connection con) throws SQLException { + public PreparedStatement createPreparedStatement(Connection con) + throws SQLException { return con.prepareStatement("my query"); } - public String getSql() { - return null; - } - }, new ResultSetExtractor() { + }, new ResultSetExtractor() { @Override public Object extractData(ResultSet rs2) { throw new InvalidDataAccessApiUsageException(""); @@ -2090,45 +1231,19 @@ public class JdbcTemplateTests extends AbstractJdbcTests { // ok } - // verify confirms if test is successful by checking if close() called - ctrlResultSet.verify(); - ctrlStatement.verify(); - ctrlResultSet2.verify(); - ctrlPreparedStatement.verify(); + verify(this.resultSet).close(); + verify(resultSet2).close(); + verify(this.preparedStatement).close(); + verify(this.connection, atLeastOnce()).close(); } + @Test public void testExecuteClosed() throws Exception { - MockControl ctrlResultSet; - ResultSet mockResultSet; - MockControl ctrlCallable; - CallableStatement mockCallable; - - ctrlResultSet = MockControl.createControl(ResultSet.class); - mockResultSet = (ResultSet) ctrlResultSet.getMock(); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - ctrlCallable = MockControl.createControl(CallableStatement.class); - mockCallable = (CallableStatement) ctrlCallable.getMock(); - mockCallable.execute(); - ctrlCallable.setReturnValue(true); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - mockCallable.getResultSet(); - ctrlCallable.setReturnValue(mockResultSet); - mockCallable.close(); - ctrlCallable.setVoidCallable(); - - mockConnection.prepareCall("my query"); - ctrlConnection.setReturnValue(mockCallable); - - ctrlResultSet.replay(); - ctrlCallable.replay(); - replay(); - - List params = new ArrayList(); + given(this.resultSet.next()).willReturn(true); + given(this.callableStatement.execute()).willReturn(true); + given(this.callableStatement.getUpdateCount()).willReturn(-1); + + List params = new ArrayList(); params.add(new SqlReturnResultSet("", new RowCallbackHandler() { @Override public void processRow(ResultSet rs) { @@ -2137,78 +1252,67 @@ public class JdbcTemplateTests extends AbstractJdbcTests { })); - JdbcTemplate template = new JdbcTemplate(mockDataSource); + this.thrown.expect(InvalidDataAccessApiUsageException.class); try { - template.call(new CallableStatementCreator() { + this.template.call(new CallableStatementCreator() { @Override - public CallableStatement createCallableStatement(Connection conn) throws SQLException { + public CallableStatement createCallableStatement(Connection conn) + throws SQLException { return conn.prepareCall("my query"); } }, params); } - catch (InvalidDataAccessApiUsageException idaauex) { - // ok + finally { + verify(this.resultSet).close(); + verify(this.callableStatement).close(); + verify(this.connection).close(); } - - // verify confirms if test is successful by checking if close() called - ctrlResultSet.verify(); - ctrlCallable.verify(); } + @Test public void testCaseInsensitiveResultsMap() throws Exception { - MockControl ctrlCallable; - CallableStatement mockCallable; - - ctrlCallable = MockControl.createControl(CallableStatement.class); - mockCallable = (CallableStatement) ctrlCallable.getMock(); - mockCallable.execute(); - ctrlCallable.setReturnValue(false); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - mockCallable.getObject(1); - ctrlCallable.setReturnValue("X"); - if (debugEnabled) { - mockCallable.getWarnings(); - ctrlCallable.setReturnValue(null); - } - mockCallable.close(); - ctrlCallable.setVoidCallable(); - - mockConnection.prepareCall("my query"); - ctrlConnection.setReturnValue(mockCallable); + given(this.callableStatement.execute()).willReturn(false); + given(this.callableStatement.getUpdateCount()).willReturn(-1); + given(this.callableStatement.getObject(1)).willReturn("X"); - ctrlCallable.replay(); - replay(); + assertTrue("default should have been NOT case insensitive", + !this.template.isResultsMapCaseInsensitive()); - JdbcTemplate template = new JdbcTemplate(mockDataSource); - assertTrue("default should have been NOT case insensitive", !template.isResultsMapCaseInsensitive()); + this.template.setResultsMapCaseInsensitive(true); + assertTrue("now it should have been set to case insensitive", + this.template.isResultsMapCaseInsensitive()); - template.setResultsMapCaseInsensitive(true); - assertTrue("now it should have been set to case insensitive", template.isResultsMapCaseInsensitive()); - - List params = new ArrayList(); + List params = new ArrayList(); params.add(new SqlOutParameter("a", 12)); - Map out = template.call(new CallableStatementCreator() { + Map out = this.template.call(new CallableStatementCreator() { @Override - public CallableStatement createCallableStatement(Connection conn) throws SQLException { + public CallableStatement createCallableStatement(Connection conn) + throws SQLException { return conn.prepareCall("my query"); } }, params); - assertTrue("this should have been a LinkedCaseInsensitiveMap", out instanceof LinkedCaseInsensitiveMap); + + assertThat(out, instanceOf(LinkedCaseInsensitiveMap.class)); assertNotNull("we should have gotten the result with upper case", out.get("A")); assertNotNull("we should have gotten the result with lower case", out.get("a")); - - ctrlCallable.verify(); + verify(this.callableStatement).close(); + verify(this.connection).close(); } + private void mockDatabaseMetaData(boolean supportsBatchUpdates) throws SQLException { + DatabaseMetaData databaseMetaData = mock(DatabaseMetaData.class); + given(databaseMetaData.getDatabaseProductName()).willReturn("MySQL"); + given(databaseMetaData.supportsBatchUpdates()).willReturn(supportsBatchUpdates); + given(this.connection.getMetaData()).willReturn(databaseMetaData); + } private static class PlainNativeJdbcExtractor extends NativeJdbcExtractorAdapter { @Override - protected Connection doGetNativeConnection(Connection con) throws SQLException { - return con; + protected Connection doGetNativeConnection(Connection connection) throws SQLException { + return connection; } } @@ -2230,16 +1334,15 @@ public class JdbcTemplateTests extends AbstractJdbcTests { } @Override - public PreparedStatement createPreparedStatement(Connection conn) throws SQLException { - PreparedStatement ps = conn.prepareStatement(sql); - ps.setInt(1, id); + public PreparedStatement createPreparedStatement(Connection connection) throws SQLException { + PreparedStatement ps = connection.prepareStatement(this.sql); + ps.setInt(1, this.id); return ps; } @Override public String getSql() { - return sql; + return this.sql; } } - } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java index 5760ebfe34f..14a7d3d0cbe 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java @@ -16,6 +16,11 @@ package org.springframework.jdbc.core; +import static org.mockito.BDDMockito.given; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -25,9 +30,10 @@ import java.sql.Types; import java.util.List; import junit.framework.TestCase; -import org.easymock.MockControl; -import org.apache.commons.logging.LogFactory; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import org.springframework.beans.TestBean; import org.springframework.jdbc.datasource.SingleConnectionDataSource; import org.springframework.jdbc.support.SQLStateSQLExceptionTranslator; @@ -38,213 +44,104 @@ import org.springframework.jdbc.support.SQLStateSQLExceptionTranslator; */ public class RowMapperTests extends TestCase { - private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled(); - - private MockControl conControl; - private Connection con; - private MockControl rsControl; - private ResultSet rs; - private JdbcTemplate jdbcTemplate; - private List result; - - @Override - protected void setUp() throws SQLException { - conControl = MockControl.createControl(Connection.class); - con = (Connection) conControl.getMock(); - con.isClosed(); - conControl.setDefaultReturnValue(false); - - rsControl = MockControl.createControl(ResultSet.class); - rs = (ResultSet) rsControl.getMock(); - rs.next(); - rsControl.setReturnValue(true, 1); - rs.getString(1); - rsControl.setReturnValue("tb1", 1); - rs.getInt(2); - rsControl.setReturnValue(1, 1); - rs.next(); - rsControl.setReturnValue(true, 1); - rs.getString(1); - rsControl.setReturnValue("tb2", 1); - rs.getInt(2); - rsControl.setReturnValue(2, 1); - rs.next(); - rsControl.setReturnValue(false, 1); - rs.close(); - rsControl.setVoidCallable(1); - rsControl.replay(); - - jdbcTemplate = new JdbcTemplate(); - jdbcTemplate.setDataSource(new SingleConnectionDataSource(con, false)); - jdbcTemplate.setExceptionTranslator(new SQLStateSQLExceptionTranslator()); - jdbcTemplate.afterPropertiesSet(); + private Connection connection; + private Statement statement; + private PreparedStatement preparedStatement; + private ResultSet resultSet; + + private JdbcTemplate template; + + private List result; + + @Before + public void setUp() throws SQLException { + connection = mock(Connection.class); + statement = mock(Statement.class); + preparedStatement = mock(PreparedStatement.class); + resultSet = mock(ResultSet.class); + given(connection.createStatement()).willReturn(statement); + given(connection.prepareStatement(anyString())).willReturn(preparedStatement); + given(statement.executeQuery(anyString())).willReturn(resultSet); + given(preparedStatement.executeQuery()).willReturn(resultSet); + given(resultSet.next()).willReturn(true, true, false); + given(resultSet.getString(1)).willReturn("tb1", "tb2"); + given(resultSet.getInt(2)).willReturn(1, 2); + template = new JdbcTemplate(); + template.setDataSource(new SingleConnectionDataSource(connection, false)); + template.setExceptionTranslator(new SQLStateSQLExceptionTranslator()); + template.afterPropertiesSet(); } - public void testStaticQueryWithRowMapper() throws SQLException { - MockControl stmtControl = MockControl.createControl(Statement.class); - Statement stmt = (Statement) stmtControl.getMock(); - - con.createStatement(); - conControl.setReturnValue(stmt, 1); - stmt.executeQuery("some SQL"); - stmtControl.setReturnValue(rs, 1); - if (debugEnabled) { - stmt.getWarnings(); - stmtControl.setReturnValue(null, 1); - } - stmt.close(); - stmtControl.setVoidCallable(1); - - conControl.replay(); - stmtControl.replay(); + @After + public void verifyClosed() throws Exception { + verify(resultSet).close(); + verify(connection).close(); + } - result = jdbcTemplate.query("some SQL", new TestRowMapper()); + @After + public void verifyResults() { + assertTrue(result != null); + assertEquals(2, result.size()); + assertEquals("tb1", result.get(0).getName()); + assertEquals("tb2", result.get(1).getName()); + assertEquals(1, result.get(0).getAge()); + assertEquals(2, result.get(1).getAge()); + } - stmtControl.verify(); - verify(); + @Test + public void testStaticQueryWithRowMapper() throws SQLException { + result = template.query("some SQL", new TestRowMapper()); + verify(statement).close(); } + @Test public void testPreparedStatementCreatorWithRowMapper() throws SQLException { - MockControl psControl = MockControl.createControl(PreparedStatement.class); - final PreparedStatement ps = (PreparedStatement) psControl.getMock(); - - ps.executeQuery(); - psControl.setReturnValue(rs, 1); - if (debugEnabled) { - ps.getWarnings(); - psControl.setReturnValue(null, 1); - } - ps.close(); - psControl.setVoidCallable(1); - - conControl.replay(); - psControl.replay(); - - result = jdbcTemplate.query( - new PreparedStatementCreator() { - @Override - public PreparedStatement createPreparedStatement(Connection con) throws SQLException { - return ps; - } - }, new TestRowMapper()); - - psControl.verify(); - verify(); + result = template.query(new PreparedStatementCreator() { + @Override + public PreparedStatement createPreparedStatement(Connection con) + throws SQLException { + return preparedStatement; + } + }, new TestRowMapper()); + verify(preparedStatement).close(); } + @Test public void testPreparedStatementSetterWithRowMapper() throws SQLException { - MockControl psControl = MockControl.createControl(PreparedStatement.class); - final PreparedStatement ps = (PreparedStatement) psControl.getMock(); - - con.prepareStatement("some SQL"); - conControl.setReturnValue(ps, 1); - ps.setString(1, "test"); - psControl.setVoidCallable(1); - ps.executeQuery(); - psControl.setReturnValue(rs, 1); - if (debugEnabled) { - ps.getWarnings(); - psControl.setReturnValue(null, 1); - } - ps.close(); - psControl.setVoidCallable(1); - - conControl.replay(); - psControl.replay(); - - result = jdbcTemplate.query( - "some SQL", - new PreparedStatementSetter() { - @Override - public void setValues(PreparedStatement ps) throws SQLException { - ps.setString(1, "test"); - } - }, new TestRowMapper()); - - psControl.verify(); - verify(); + result = template.query("some SQL", new PreparedStatementSetter() { + @Override + public void setValues(PreparedStatement ps) throws SQLException { + ps.setString(1, "test"); + } + }, new TestRowMapper()); + verify(preparedStatement).setString(1, "test"); + verify(preparedStatement).close(); } + @Test public void testQueryWithArgsAndRowMapper() throws SQLException { - MockControl psControl = MockControl.createControl(PreparedStatement.class); - final PreparedStatement ps = (PreparedStatement) psControl.getMock(); - - con.prepareStatement("some SQL"); - conControl.setReturnValue(ps, 1); - ps.setString(1, "test1"); - ps.setString(2, "test2"); - psControl.setVoidCallable(1); - ps.executeQuery(); - psControl.setReturnValue(rs, 1); - if (debugEnabled) { - ps.getWarnings(); - psControl.setReturnValue(null, 1); - } - ps.close(); - psControl.setVoidCallable(1); - - conControl.replay(); - psControl.replay(); - - result = jdbcTemplate.query( - "some SQL", - new Object[] {"test1", "test2"}, + result = template.query("some SQL", + new Object[] { "test1", "test2" }, new TestRowMapper()); - - psControl.verify(); - verify(); + preparedStatement.setString(1, "test1"); + preparedStatement.setString(2, "test2"); + preparedStatement.close(); } + @Test public void testQueryWithArgsAndTypesAndRowMapper() throws SQLException { - MockControl psControl = MockControl.createControl(PreparedStatement.class); - final PreparedStatement ps = (PreparedStatement) psControl.getMock(); - - con.prepareStatement("some SQL"); - conControl.setReturnValue(ps, 1); - ps.setString(1, "test1"); - ps.setString(2, "test2"); - psControl.setVoidCallable(1); - ps.executeQuery(); - psControl.setReturnValue(rs, 1); - if (debugEnabled) { - ps.getWarnings(); - psControl.setReturnValue(null, 1); - } - ps.close(); - psControl.setVoidCallable(1); - - conControl.replay(); - psControl.replay(); - - result = jdbcTemplate.query( - "some SQL", - new Object[] {"test1", "test2"}, - new int[] {Types.VARCHAR, Types.VARCHAR}, + result = template.query("some SQL", + new Object[] { "test1", "test2" }, + new int[] { Types.VARCHAR, Types.VARCHAR }, new TestRowMapper()); - - psControl.verify(); - verify(); + verify(preparedStatement).setString(1, "test1"); + verify(preparedStatement).setString(2, "test2"); + verify(preparedStatement).close(); } - protected void verify() { - conControl.verify(); - rsControl.verify(); - - assertTrue(result != null); - assertEquals(2, result.size()); - TestBean tb1 = (TestBean) result.get(0); - TestBean tb2 = (TestBean) result.get(1); - assertEquals("tb1", tb1.getName()); - assertEquals(1, tb1.getAge()); - assertEquals("tb2", tb2.getName()); - assertEquals(2, tb2.getAge()); - } - - - private static class TestRowMapper implements RowMapper { - + private static class TestRowMapper implements RowMapper { @Override - public Object mapRow(ResultSet rs, int rowNum) throws SQLException { + public TestBean mapRow(ResultSet rs, int rowNum) throws SQLException { return new TestBean(rs.getString(1), rs.getInt(2)); } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java index 15ce2e9504e..7e8631e6ec6 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java @@ -16,6 +16,10 @@ package org.springframework.jdbc.core; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.PreparedStatement; @@ -23,203 +27,156 @@ import java.sql.SQLException; import java.sql.Types; import java.util.GregorianCalendar; -import junit.framework.TestCase; -import org.easymock.MockControl; +import org.junit.Before; +import org.junit.Test; /** * @author Juergen Hoeller * @since 31.08.2004 */ -public class StatementCreatorUtilsTests extends TestCase { - - private MockControl psControl; - private PreparedStatement ps; +public class StatementCreatorUtilsTests { - @Override - protected void setUp() { - psControl = MockControl.createControl(PreparedStatement.class); - ps = (PreparedStatement) psControl.getMock(); - } + private PreparedStatement preparedStatement; - @Override - protected void tearDown() { - psControl.verify(); + @Before + public void setUp() { + preparedStatement = mock(PreparedStatement.class); } - public void testSetParameterValueWithNullAndType() throws SQLException { - ps.setNull(1, Types.VARCHAR); - psControl.setVoidCallable(1); - psControl.replay(); - StatementCreatorUtils.setParameterValue(ps, 1, Types.VARCHAR, null, null); + @Test public void testSetParameterValueWithNullAndType() throws SQLException { + StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.VARCHAR, null, null); + verify(preparedStatement).setNull(1, Types.VARCHAR); } - public void testSetParameterValueWithNullAndTypeName() throws SQLException { - ps.setNull(1, Types.VARCHAR, "mytype"); - psControl.setVoidCallable(1); - psControl.replay(); - StatementCreatorUtils.setParameterValue(ps, 1, Types.VARCHAR, "mytype", null); + @Test public void testSetParameterValueWithNullAndTypeName() throws SQLException { + StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.VARCHAR, "mytype", null); + verify(preparedStatement).setNull(1, Types.VARCHAR, "mytype"); } - public void testSetParameterValueWithNullAndUnknownType() throws SQLException { - ps.setNull(1, Types.NULL); - psControl.setVoidCallable(1); - psControl.replay(); - StatementCreatorUtils.setParameterValue(ps, 1, SqlTypeValue.TYPE_UNKNOWN, null, null); + @Test public void testSetParameterValueWithNullAndUnknownType() throws SQLException { + StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, null, null); + verify(preparedStatement).setNull(1, Types.NULL); } + @Test public void testSetParameterValueWithNullAndUnknownTypeOnInformix() throws SQLException { - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - MockControl metaDataControl = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData metaData = (DatabaseMetaData) metaDataControl.getMock(); - ps.getConnection(); - psControl.setReturnValue(con, 1); - con.getMetaData(); - conControl.setReturnValue(metaData, 1); - metaData.getDatabaseProductName(); - metaDataControl.setReturnValue("Informix Dynamic Server"); - metaData.getDriverName(); - metaDataControl.setReturnValue("Informix Driver"); - ps.setObject(1, null); - psControl.setVoidCallable(1); - psControl.replay(); - conControl.replay(); - metaDataControl.replay(); - StatementCreatorUtils.setParameterValue(ps, 1, SqlTypeValue.TYPE_UNKNOWN, null, null); - conControl.verify(); - metaDataControl.verify(); - } - - public void testSetParameterValueWithNullAndUnknownTypeOnDerbyEmbedded() throws SQLException { - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - MockControl metaDataControl = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData metaData = (DatabaseMetaData) metaDataControl.getMock(); - ps.getConnection(); - psControl.setReturnValue(con, 1); - con.getMetaData(); - conControl.setReturnValue(metaData, 1); - metaData.getDatabaseProductName(); - metaDataControl.setReturnValue("Apache Derby"); - metaData.getDriverName(); - metaDataControl.setReturnValue("Apache Derby Embedded Driver"); - ps.setNull(1, Types.VARCHAR); - psControl.setVoidCallable(1); - psControl.replay(); - conControl.replay(); - metaDataControl.replay(); - StatementCreatorUtils.setParameterValue(ps, 1, SqlTypeValue.TYPE_UNKNOWN, null, null); - conControl.verify(); - metaDataControl.verify(); - } - + Connection con = mock(Connection.class); + DatabaseMetaData metaData = mock(DatabaseMetaData.class); + given(preparedStatement.getConnection()).willReturn(con); + given(con.getMetaData()).willReturn(metaData); + given(metaData.getDatabaseProductName()).willReturn("Informix Dynamic Server"); + given(metaData.getDriverName()).willReturn("Informix Driver"); + StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, null, null); + verify(metaData).getDatabaseProductName(); + verify(metaData).getDriverName(); + verify(preparedStatement).setObject(1, null); + } + + @Test public void testSetParameterValueWithNullAndUnknownTypeOnDerbyEmbedded() throws SQLException { + Connection con = mock(Connection.class); + DatabaseMetaData metaData = mock(DatabaseMetaData.class); + given(preparedStatement.getConnection()).willReturn(con); + given(con.getMetaData()).willReturn(metaData); + given(metaData.getDatabaseProductName()).willReturn("Apache Derby"); + given(metaData.getDriverName()).willReturn("Apache Derby Embedded Driver"); + StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, null, null); + verify(metaData).getDatabaseProductName(); + verify(metaData).getDriverName(); + verify(preparedStatement).setNull(1, Types.VARCHAR); + } + + @Test public void testSetParameterValueWithString() throws SQLException { - ps.setString(1, "test"); - psControl.setVoidCallable(1); - psControl.replay(); - StatementCreatorUtils.setParameterValue(ps, 1, Types.VARCHAR, null, "test"); + StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.VARCHAR, null, "test"); + verify(preparedStatement).setString(1, "test"); } + @Test public void testSetParameterValueWithStringAndSpecialType() throws SQLException { - ps.setObject(1, "test", Types.CHAR); - psControl.setVoidCallable(1); - psControl.replay(); - StatementCreatorUtils.setParameterValue(ps, 1, Types.CHAR, null, "test"); + StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.CHAR, null, "test"); + verify(preparedStatement).setObject(1, "test", Types.CHAR); } - public void testSetParameterValueWithStringAndUnknownType() throws SQLException { - ps.setString(1, "test"); - psControl.setVoidCallable(1); - psControl.replay(); - StatementCreatorUtils.setParameterValue(ps, 1, SqlTypeValue.TYPE_UNKNOWN, null, "test"); + @Test public void testSetParameterValueWithStringAndUnknownType() throws SQLException { + StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, null, "test"); + verify(preparedStatement).setString(1, "test"); } + @Test public void testSetParameterValueWithSqlDate() throws SQLException { java.sql.Date date = new java.sql.Date(1000); - ps.setDate(1, date); - psControl.setVoidCallable(1); - psControl.replay(); - StatementCreatorUtils.setParameterValue(ps, 1, Types.DATE, null, date); + StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.DATE, null, date); + verify(preparedStatement).setDate(1, date); } + @Test public void testSetParameterValueWithDateAndUtilDate() throws SQLException { java.util.Date date = new java.util.Date(1000); - ps.setDate(1, new java.sql.Date(1000)); - psControl.setVoidCallable(1); - psControl.replay(); - StatementCreatorUtils.setParameterValue(ps, 1, Types.DATE, null, date); + StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.DATE, null, date); + verify(preparedStatement).setDate(1, new java.sql.Date(1000)); } + @Test public void testSetParameterValueWithDateAndCalendar() throws SQLException { java.util.Calendar cal = new GregorianCalendar(); - ps.setDate(1, new java.sql.Date(cal.getTime().getTime()), cal); - psControl.setVoidCallable(1); - psControl.replay(); - StatementCreatorUtils.setParameterValue(ps, 1, Types.DATE, null, cal); + StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.DATE, null, cal); + verify(preparedStatement).setDate(1, new java.sql.Date(cal.getTime().getTime()), cal); } + @Test public void testSetParameterValueWithSqlTime() throws SQLException { java.sql.Time time = new java.sql.Time(1000); - ps.setTime(1, time); - psControl.setVoidCallable(1); - psControl.replay(); - StatementCreatorUtils.setParameterValue(ps, 1, Types.TIME, null, time); + StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.TIME, null, time); + verify(preparedStatement).setTime(1, time); } + @Test public void testSetParameterValueWithTimeAndUtilDate() throws SQLException { java.util.Date date = new java.util.Date(1000); - ps.setTime(1, new java.sql.Time(1000)); - psControl.setVoidCallable(1); - psControl.replay(); - StatementCreatorUtils.setParameterValue(ps, 1, Types.TIME, null, date); + StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.TIME, null, date); + verify(preparedStatement).setTime(1, new java.sql.Time(1000)); } + @Test public void testSetParameterValueWithTimeAndCalendar() throws SQLException { java.util.Calendar cal = new GregorianCalendar(); - ps.setTime(1, new java.sql.Time(cal.getTime().getTime()), cal); - psControl.setVoidCallable(1); - psControl.replay(); - StatementCreatorUtils.setParameterValue(ps, 1, Types.TIME, null, cal); + StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.TIME, null, cal); + verify(preparedStatement).setTime(1, new java.sql.Time(cal.getTime().getTime()), cal); } + @Test public void testSetParameterValueWithSqlTimestamp() throws SQLException { java.sql.Timestamp timestamp = new java.sql.Timestamp(1000); - ps.setTimestamp(1, timestamp); - psControl.setVoidCallable(1); - psControl.replay(); - StatementCreatorUtils.setParameterValue(ps, 1, Types.TIMESTAMP, null, timestamp); + StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.TIMESTAMP, null, timestamp); + verify(preparedStatement).setTimestamp(1, timestamp); } + @Test public void testSetParameterValueWithTimestampAndUtilDate() throws SQLException { java.util.Date date = new java.util.Date(1000); - ps.setTimestamp(1, new java.sql.Timestamp(1000)); - psControl.setVoidCallable(1); - psControl.replay(); - StatementCreatorUtils.setParameterValue(ps, 1, Types.TIMESTAMP, null, date); + StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.TIMESTAMP, null, date); + verify(preparedStatement).setTimestamp(1, new java.sql.Timestamp(1000)); } + @Test public void testSetParameterValueWithTimestampAndCalendar() throws SQLException { java.util.Calendar cal = new GregorianCalendar(); - ps.setTimestamp(1, new java.sql.Timestamp(cal.getTime().getTime()), cal); - psControl.setVoidCallable(1); - psControl.replay(); - StatementCreatorUtils.setParameterValue(ps, 1, Types.TIMESTAMP, null, cal); + StatementCreatorUtils.setParameterValue(preparedStatement, 1, Types.TIMESTAMP, null, cal); + verify(preparedStatement).setTimestamp(1, new java.sql.Timestamp(cal.getTime().getTime()), cal); } + @Test public void testSetParameterValueWithDateAndUnknownType() throws SQLException { java.util.Date date = new java.util.Date(1000); - ps.setTimestamp(1, new java.sql.Timestamp(1000)); - psControl.setVoidCallable(1); - psControl.replay(); - StatementCreatorUtils.setParameterValue(ps, 1, SqlTypeValue.TYPE_UNKNOWN, null, date); + StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, null, date); + verify(preparedStatement).setTimestamp(1, new java.sql.Timestamp(1000)); } + @Test public void testSetParameterValueWithCalendarAndUnknownType() throws SQLException { java.util.Calendar cal = new GregorianCalendar(); - ps.setTimestamp(1, new java.sql.Timestamp(cal.getTime().getTime()), cal); - psControl.setVoidCallable(1); - psControl.replay(); - StatementCreatorUtils.setParameterValue(ps, 1, SqlTypeValue.TYPE_UNKNOWN, null, cal); + StatementCreatorUtils.setParameterValue(preparedStatement, 1, SqlTypeValue.TYPE_UNKNOWN, null, cal); + verify(preparedStatement).setTimestamp(1, new java.sql.Timestamp(cal.getTime().getTime()), cal); } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java index e18b28a19fa..60bec568176 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java @@ -16,41 +16,49 @@ package org.springframework.jdbc.core.namedparam; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +import java.sql.Connection; +import java.sql.DatabaseMetaData; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; -import java.sql.Connection; -import java.sql.DatabaseMetaData; +import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Collections; import javax.sql.DataSource; -import org.easymock.MockControl; -import org.apache.commons.logging.LogFactory; - +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; import org.springframework.dao.DataAccessException; -import org.springframework.jdbc.AbstractJdbcTests; import org.springframework.jdbc.Customer; import org.springframework.jdbc.core.JdbcOperations; +import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.PreparedStatementCallback; import org.springframework.jdbc.core.ResultSetExtractor; import org.springframework.jdbc.core.RowCallbackHandler; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.SqlParameterValue; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.jdbc.core.BatchUpdateTestHelper; /** * @author Rick Evans * @author Juergen Hoeller * @author Chris Beams */ -public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { +public class NamedParameterJdbcTemplateTests { private static final String SELECT_NAMED_PARAMETERS = "select id, forename from custmr where id = :id and country = :country"; @@ -64,255 +72,166 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { private static final String[] COLUMN_NAMES = new String[] {"id", "forename"}; - private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled(); - - private MockControl ctrlPreparedStatement; - private PreparedStatement mockPreparedStatement; - private MockControl ctrlResultSet; - private ResultSet mockResultSet; - - @Override - protected void setUp() throws Exception { - super.setUp(); - ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - ctrlResultSet = MockControl.createControl(ResultSet.class); - mockResultSet = (ResultSet) ctrlResultSet.getMock(); - } - - @Override - protected void tearDown() throws Exception { - super.tearDown(); - if (shouldVerify()) { - ctrlPreparedStatement.verify(); - ctrlResultSet.verify(); - } + @Rule + public ExpectedException thrown = ExpectedException.none(); + + private Connection connection; + private DataSource dataSource; + private PreparedStatement preparedStatement; + private ResultSet resultSet; + private DatabaseMetaData databaseMetaData; + private Map params = new HashMap(); + private NamedParameterJdbcTemplate namedParameterTemplate; + + @Before + public void setUp() throws Exception { + connection = mock(Connection.class); + dataSource = mock(DataSource.class); + preparedStatement = mock(PreparedStatement.class); + resultSet = mock(ResultSet.class); + namedParameterTemplate = new NamedParameterJdbcTemplate(dataSource); + databaseMetaData = mock(DatabaseMetaData.class); + given(dataSource.getConnection()).willReturn(connection); + given(connection.prepareStatement(anyString())).willReturn(preparedStatement); + given(preparedStatement.getConnection()).willReturn(connection); + given(preparedStatement.executeQuery()).willReturn(resultSet); + given(databaseMetaData.getDatabaseProductName()).willReturn("MySQL"); + given(databaseMetaData.supportsBatchUpdates()).willReturn(true); } - @Override - protected void replay() { - super.replay(); - ctrlPreparedStatement.replay(); - ctrlResultSet.replay(); - } - - + @Test public void testNullDataSourceProvidedToCtor() throws Exception { - try { - new NamedParameterJdbcTemplate((DataSource) null); - fail("should have thrown IllegalArgumentException"); - } catch (IllegalArgumentException ex) { /* expected */ } + thrown.expect(IllegalArgumentException.class); + new NamedParameterJdbcTemplate((DataSource) null); } + @Test public void testNullJdbcTemplateProvidedToCtor() throws Exception { - try { - new NamedParameterJdbcTemplate((JdbcOperations) null); - fail("should have thrown IllegalArgumentException"); - } catch (IllegalArgumentException ex) { /* expected */ } + thrown.expect(IllegalArgumentException.class); + new NamedParameterJdbcTemplate((JdbcOperations) null); } + @Test public void testExecute() throws SQLException { - mockPreparedStatement.setObject(1, new Integer(1)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setObject(2, new Integer(1)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(1); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(UPDATE_NAMED_PARAMETERS_PARSED); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - NamedParameterJdbcTemplate jt = new NamedParameterJdbcTemplate(mockDataSource); - Map params = new HashMap(); - params.put("perfId", new Integer(1)); - params.put("priceId", new Integer(1)); - assertEquals("result", jt.execute(UPDATE_NAMED_PARAMETERS, params, new PreparedStatementCallback() { - @Override - public Object doInPreparedStatement(PreparedStatement ps) throws SQLException { - assertEquals(mockPreparedStatement, ps); - ps.executeUpdate(); - return "result"; - } - })); + given(preparedStatement.executeUpdate()).willReturn(1); + + params.put("perfId", 1); + params.put("priceId", 1); + Object result = namedParameterTemplate.execute(UPDATE_NAMED_PARAMETERS, params, + new PreparedStatementCallback() { + @Override + public Object doInPreparedStatement(PreparedStatement ps) + throws SQLException { + assertEquals(preparedStatement, ps); + ps.executeUpdate(); + return "result"; + } + }); + + assertEquals("result", result); + verify(connection).prepareStatement(UPDATE_NAMED_PARAMETERS_PARSED); + verify(preparedStatement).setObject(1, 1); + verify(preparedStatement).setObject(2, 1); + verify(preparedStatement).close(); + verify(connection).close(); } + @Test public void testExecuteWithTypedParameters() throws SQLException { - mockPreparedStatement.setObject(1, new Integer(1), Types.DECIMAL); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setObject(2, new Integer(1), Types.INTEGER); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(1); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(UPDATE_NAMED_PARAMETERS_PARSED); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - NamedParameterJdbcTemplate jt = new NamedParameterJdbcTemplate(mockDataSource); - Map params = new HashMap(); - params.put("perfId", new SqlParameterValue(Types.DECIMAL, new Integer(1))); - params.put("priceId", new SqlParameterValue(Types.INTEGER, new Integer(1))); - assertEquals("result", jt.execute(UPDATE_NAMED_PARAMETERS, params, new PreparedStatementCallback() { - @Override - public Object doInPreparedStatement(PreparedStatement ps) throws SQLException { - assertEquals(mockPreparedStatement, ps); - ps.executeUpdate(); - return "result"; - } - })); + given(preparedStatement.executeUpdate()).willReturn(1); + + params.put("perfId", new SqlParameterValue(Types.DECIMAL, 1)); + params.put("priceId", new SqlParameterValue(Types.INTEGER, 1)); + Object result = namedParameterTemplate.execute(UPDATE_NAMED_PARAMETERS, params, + new PreparedStatementCallback() { + @Override + public Object doInPreparedStatement(PreparedStatement ps) + throws SQLException { + assertEquals(preparedStatement, ps); + ps.executeUpdate(); + return "result"; + } + }); + + assertEquals("result", result); + verify(connection).prepareStatement(UPDATE_NAMED_PARAMETERS_PARSED); + verify(preparedStatement).setObject(1, 1, Types.DECIMAL); + verify(preparedStatement).setObject(2, 1, Types.INTEGER); + verify(preparedStatement).close(); + verify(connection).close(); } - public void testUpdate() throws SQLException { - mockPreparedStatement.setObject(1, new Integer(1)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setObject(2, new Integer(1)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(1); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(UPDATE_NAMED_PARAMETERS_PARSED); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - NamedParameterJdbcTemplate jt = new NamedParameterJdbcTemplate(mockDataSource); - Map params = new HashMap(); - params.put("perfId", new Integer(1)); - params.put("priceId", new Integer(1)); - int rowsAffected = jt.update(UPDATE_NAMED_PARAMETERS, params); + @Test public void testUpdate() throws SQLException { + given(preparedStatement.executeUpdate()).willReturn(1); + + params.put("perfId", 1); + params.put("priceId", 1); + int rowsAffected = namedParameterTemplate.update(UPDATE_NAMED_PARAMETERS, params); + assertEquals(1, rowsAffected); + verify(connection).prepareStatement(UPDATE_NAMED_PARAMETERS_PARSED); + verify(preparedStatement).setObject(1, 1); + verify(preparedStatement).setObject(2, 1); + verify(preparedStatement).close(); + verify(connection).close(); } + @Test public void testUpdateWithTypedParameters() throws SQLException { - mockPreparedStatement.setObject(1, new Integer(1), Types.DECIMAL); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setObject(2, new Integer(1), Types.INTEGER); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(1); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(UPDATE_NAMED_PARAMETERS_PARSED); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - NamedParameterJdbcTemplate jt = new NamedParameterJdbcTemplate(mockDataSource); - Map params = new HashMap(); - params.put("perfId", new SqlParameterValue(Types.DECIMAL, new Integer(1))); - params.put("priceId", new SqlParameterValue(Types.INTEGER, new Integer(1))); - int rowsAffected = jt.update(UPDATE_NAMED_PARAMETERS, params); + given(preparedStatement.executeUpdate()).willReturn(1); + + params.put("perfId", new SqlParameterValue(Types.DECIMAL, 1)); + params.put("priceId", new SqlParameterValue(Types.INTEGER, 1)); + int rowsAffected = namedParameterTemplate.update(UPDATE_NAMED_PARAMETERS, params); + assertEquals(1, rowsAffected); + verify(connection).prepareStatement(UPDATE_NAMED_PARAMETERS_PARSED); + verify(preparedStatement).setObject(1, 1, Types.DECIMAL); + verify(preparedStatement).setObject(2, 1, Types.INTEGER); + verify(preparedStatement).close(); + verify(connection).close(); } + @Test public void testQueryWithResultSetExtractor() throws SQLException { - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt("id"); - ctrlResultSet.setReturnValue(1); - mockResultSet.getString("forename"); - ctrlResultSet.setReturnValue("rod"); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(1), Types.DECIMAL); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setString(2, "UK"); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(SELECT_NAMED_PARAMETERS_PARSED); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - NamedParameterJdbcTemplate jt = new NamedParameterJdbcTemplate(mockDataSource); - Map params = new HashMap(); - params.put("id", new SqlParameterValue(Types.DECIMAL, new Integer(1))); + given(resultSet.next()).willReturn(true); + given(resultSet.getInt("id")).willReturn(1); + given(resultSet.getString("forename")).willReturn("rod"); + + params.put("id", new SqlParameterValue(Types.DECIMAL, 1)); params.put("country", "UK"); - Customer cust = (Customer) jt.query(SELECT_NAMED_PARAMETERS, params, new ResultSetExtractor() { - @Override - public Object extractData(ResultSet rs) throws SQLException, DataAccessException { - rs.next(); - Customer cust = new Customer(); - cust.setId(rs.getInt(COLUMN_NAMES[0])); - cust.setForename(rs.getString(COLUMN_NAMES[1])); - return cust; - } - }); + Customer cust = namedParameterTemplate.query(SELECT_NAMED_PARAMETERS, params, + new ResultSetExtractor() { + @Override + public Customer extractData(ResultSet rs) throws SQLException, + DataAccessException { + rs.next(); + Customer cust = new Customer(); + cust.setId(rs.getInt(COLUMN_NAMES[0])); + cust.setForename(rs.getString(COLUMN_NAMES[1])); + return cust; + } + }); + assertTrue("Customer id was assigned correctly", cust.getId() == 1); assertTrue("Customer forename was assigned correctly", cust.getForename().equals("rod")); + verify(connection).prepareStatement(SELECT_NAMED_PARAMETERS_PARSED); + verify(preparedStatement).setObject(1, 1, Types.DECIMAL); + verify(preparedStatement).setString(2, "UK"); + verify(preparedStatement).close(); + verify(connection).close(); } + @Test public void testQueryWithRowCallbackHandler() throws SQLException { - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt("id"); - ctrlResultSet.setReturnValue(1); - mockResultSet.getString("forename"); - ctrlResultSet.setReturnValue("rod"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(1), Types.DECIMAL); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setString(2, "UK"); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(SELECT_NAMED_PARAMETERS_PARSED); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - NamedParameterJdbcTemplate jt = new NamedParameterJdbcTemplate(mockDataSource); - Map params = new HashMap(); - params.put("id", new SqlParameterValue(Types.DECIMAL, new Integer(1))); + given(resultSet.next()).willReturn(true, false); + given(resultSet.getInt("id")).willReturn(1); + given(resultSet.getString("forename")).willReturn("rod"); + + params.put("id", new SqlParameterValue(Types.DECIMAL, 1)); params.put("country", "UK"); - final List customers = new LinkedList(); - jt.query(SELECT_NAMED_PARAMETERS, params, new RowCallbackHandler() { + final List customers = new LinkedList(); + namedParameterTemplate.query(SELECT_NAMED_PARAMETERS, params, new RowCallbackHandler() { @Override public void processRow(ResultSet rs) throws SQLException { Customer cust = new Customer(); @@ -321,218 +240,148 @@ public class NamedParameterJdbcTemplateTests extends AbstractJdbcTests { customers.add(cust); } }); + assertEquals(1, customers.size()); - Customer cust = (Customer) customers.get(0); - assertTrue("Customer id was assigned correctly", cust.getId() == 1); - assertTrue("Customer forename was assigned correctly", cust.getForename().equals("rod")); + assertTrue("Customer id was assigned correctly", customers.get(0).getId() == 1); + assertTrue("Customer forename was assigned correctly", customers.get(0).getForename().equals("rod")); + verify(connection).prepareStatement(SELECT_NAMED_PARAMETERS_PARSED); + verify(preparedStatement).setObject(1, 1, Types.DECIMAL); + verify(preparedStatement).setString(2, "UK"); + verify(preparedStatement).close(); + verify(connection).close(); } + @Test public void testQueryWithRowMapper() throws SQLException { - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt("id"); - ctrlResultSet.setReturnValue(1); - mockResultSet.getString("forename"); - ctrlResultSet.setReturnValue("rod"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(1), Types.DECIMAL); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setString(2, "UK"); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(SELECT_NAMED_PARAMETERS_PARSED); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - NamedParameterJdbcTemplate jt = new NamedParameterJdbcTemplate(mockDataSource); - Map params = new HashMap(); - params.put("id", new SqlParameterValue(Types.DECIMAL, new Integer(1))); + given(resultSet.next()).willReturn(true, false); + given(resultSet.getInt("id")).willReturn(1); + given(resultSet.getString("forename")).willReturn("rod"); + + params.put("id", new SqlParameterValue(Types.DECIMAL, 1)); params.put("country", "UK"); - List customers = jt.query(SELECT_NAMED_PARAMETERS, params, new RowMapper() { - @Override - public Object mapRow(ResultSet rs, int rownum) throws SQLException { - Customer cust = new Customer(); - cust.setId(rs.getInt(COLUMN_NAMES[0])); - cust.setForename(rs.getString(COLUMN_NAMES[1])); - return cust; - } - }); + List customers = namedParameterTemplate.query(SELECT_NAMED_PARAMETERS, params, + new RowMapper() { + @Override + public Customer mapRow(ResultSet rs, int rownum) throws SQLException { + Customer cust = new Customer(); + cust.setId(rs.getInt(COLUMN_NAMES[0])); + cust.setForename(rs.getString(COLUMN_NAMES[1])); + return cust; + } + }); assertEquals(1, customers.size()); - Customer cust = (Customer) customers.get(0); - assertTrue("Customer id was assigned correctly", cust.getId() == 1); - assertTrue("Customer forename was assigned correctly", cust.getForename().equals("rod")); + assertTrue("Customer id was assigned correctly", customers.get(0).getId() == 1); + assertTrue("Customer forename was assigned correctly", customers.get(0).getForename().equals("rod")); + verify(connection).prepareStatement(SELECT_NAMED_PARAMETERS_PARSED); + verify(preparedStatement).setObject(1, 1, Types.DECIMAL); + verify(preparedStatement).setString(2, "UK"); + verify(preparedStatement).close(); + verify(connection).close(); } + @Test public void testQueryForObjectWithRowMapper() throws SQLException { - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt("id"); - ctrlResultSet.setReturnValue(1); - mockResultSet.getString("forename"); - ctrlResultSet.setReturnValue("rod"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(1), Types.DECIMAL); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setString(2, "UK"); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(SELECT_NAMED_PARAMETERS_PARSED); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - NamedParameterJdbcTemplate jt = new NamedParameterJdbcTemplate(mockDataSource); - Map params = new HashMap(); - params.put("id", new SqlParameterValue(Types.DECIMAL, new Integer(1))); + given(resultSet.next()).willReturn(true, false); + given(resultSet.getInt("id")).willReturn(1); + given(resultSet.getString("forename")).willReturn("rod"); + + params.put("id", new SqlParameterValue(Types.DECIMAL, 1)); params.put("country", "UK"); - Customer cust = (Customer) jt.queryForObject(SELECT_NAMED_PARAMETERS, params, new RowMapper() { - @Override - public Object mapRow(ResultSet rs, int rownum) throws SQLException { - Customer cust = new Customer(); - cust.setId(rs.getInt(COLUMN_NAMES[0])); - cust.setForename(rs.getString(COLUMN_NAMES[1])); - return cust; - } - }); + Customer cust = namedParameterTemplate.queryForObject(SELECT_NAMED_PARAMETERS, params, + new RowMapper() { + @Override + public Customer mapRow(ResultSet rs, int rownum) throws SQLException { + Customer cust = new Customer(); + cust.setId(rs.getInt(COLUMN_NAMES[0])); + cust.setForename(rs.getString(COLUMN_NAMES[1])); + return cust; + } + }); assertTrue("Customer id was assigned correctly", cust.getId() == 1); assertTrue("Customer forename was assigned correctly", cust.getForename().equals("rod")); + verify(connection).prepareStatement(SELECT_NAMED_PARAMETERS_PARSED); + verify(preparedStatement).setObject(1, 1, Types.DECIMAL); + verify(preparedStatement).setString(2, "UK"); + verify(preparedStatement).close(); + verify(connection).close(); } + @Test public void testBatchUpdateWithPlainMap() throws Exception { - final String sqlToUse = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; - final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = :id"; - final Map[] ids = new Map[2]; + @SuppressWarnings("unchecked") + final Map[] ids = new Map[2]; ids[0] = Collections.singletonMap("id", 100); ids[1] = Collections.singletonMap("id", 200); final int[] rowsAffected = new int[] { 1, 2 }; - MockControl ctrlDataSource = MockControl.createControl(DataSource.class); - DataSource mockDataSource = (DataSource) ctrlDataSource.getMock(); - MockControl ctrlConnection = MockControl.createControl(Connection.class); - Connection mockConnection = (Connection) ctrlConnection.getMock(); - MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - - BatchUpdateTestHelper.prepareBatchUpdateMocks(sqlToUse, ids, null, rowsAffected, ctrlDataSource, mockDataSource, ctrlConnection, - mockConnection, ctrlPreparedStatement, mockPreparedStatement, ctrlDatabaseMetaData, - mockDatabaseMetaData); - - BatchUpdateTestHelper.replayBatchUpdateMocks(ctrlDataSource, ctrlConnection, ctrlPreparedStatement, ctrlDatabaseMetaData); + given(preparedStatement.executeBatch()).willReturn(rowsAffected); + given(connection.getMetaData()).willReturn(databaseMetaData); - JdbcTemplate template = new JdbcTemplate(mockDataSource, false); - NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(template); - - int[] actualRowsAffected = namedParameterJdbcTemplate.batchUpdate(sql, ids); + JdbcTemplate template = new JdbcTemplate(dataSource, false); + namedParameterTemplate = new NamedParameterJdbcTemplate(template); + int[] actualRowsAffected = namedParameterTemplate.batchUpdate("UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = :id", ids); assertTrue("executed 2 updates", actualRowsAffected.length == 2); assertEquals(rowsAffected[0], actualRowsAffected[0]); assertEquals(rowsAffected[1], actualRowsAffected[1]); - - BatchUpdateTestHelper.verifyBatchUpdateMocks(ctrlPreparedStatement, ctrlDatabaseMetaData); - + verify(connection).prepareStatement("UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"); + verify(preparedStatement).setObject(1, 100); + verify(preparedStatement).setObject(1, 200); + verify(preparedStatement, times(2)).addBatch(); + verify(preparedStatement, atLeastOnce()).close(); + verify(connection, atLeastOnce()).close(); } + @Test public void testBatchUpdateWithSqlParameterSource() throws Exception { - - final String sqlToUse = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; - final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = :id"; final SqlParameterSource[] ids = new SqlParameterSource[2]; ids[0] = new MapSqlParameterSource("id", 100); ids[1] = new MapSqlParameterSource("id", 200); final int[] rowsAffected = new int[] { 1, 2 }; - MockControl ctrlDataSource = MockControl.createControl(DataSource.class); - DataSource mockDataSource = (DataSource) ctrlDataSource.getMock(); - MockControl ctrlConnection = MockControl.createControl(Connection.class); - Connection mockConnection = (Connection) ctrlConnection.getMock(); - MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - - BatchUpdateTestHelper.prepareBatchUpdateMocks(sqlToUse, ids, null, rowsAffected, ctrlDataSource, mockDataSource, ctrlConnection, - mockConnection, ctrlPreparedStatement, mockPreparedStatement, ctrlDatabaseMetaData, - mockDatabaseMetaData); - - BatchUpdateTestHelper.replayBatchUpdateMocks(ctrlDataSource, ctrlConnection, ctrlPreparedStatement, ctrlDatabaseMetaData); + given(preparedStatement.executeBatch()).willReturn(rowsAffected); + given(connection.getMetaData()).willReturn(databaseMetaData); - JdbcTemplate template = new JdbcTemplate(mockDataSource, false); - NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(template); - - int[] actualRowsAffected = namedParameterJdbcTemplate.batchUpdate(sql, ids); + JdbcTemplate template = new JdbcTemplate(dataSource, false); + namedParameterTemplate = new NamedParameterJdbcTemplate(template); + int[] actualRowsAffected = namedParameterTemplate.batchUpdate("UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = :id", ids); assertTrue("executed 2 updates", actualRowsAffected.length == 2); assertEquals(rowsAffected[0], actualRowsAffected[0]); assertEquals(rowsAffected[1], actualRowsAffected[1]); - - BatchUpdateTestHelper.verifyBatchUpdateMocks(ctrlPreparedStatement, ctrlDatabaseMetaData); - + verify(connection).prepareStatement("UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"); + verify(preparedStatement).setObject(1, 100); + verify(preparedStatement).setObject(1, 200); + verify(preparedStatement, times(2)).addBatch(); + verify(preparedStatement, atLeastOnce()).close(); + verify(connection, atLeastOnce()).close(); } + @Test public void testBatchUpdateWithSqlParameterSourcePlusTypeInfo() throws Exception { - final String sqlToUse = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; - final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = :id"; final SqlParameterSource[] ids = new SqlParameterSource[2]; ids[0] = new MapSqlParameterSource().addValue("id", 100, Types.NUMERIC); ids[1] = new MapSqlParameterSource().addValue("id", 200, Types.NUMERIC); - final int[] sqlTypes = new int[] {Types.NUMERIC}; final int[] rowsAffected = new int[] { 1, 2 }; - MockControl ctrlDataSource = MockControl.createControl(DataSource.class); - DataSource mockDataSource = (DataSource) ctrlDataSource.getMock(); - MockControl ctrlConnection = MockControl.createControl(Connection.class); - Connection mockConnection = (Connection) ctrlConnection.getMock(); - MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - - BatchUpdateTestHelper.prepareBatchUpdateMocks(sqlToUse, ids, sqlTypes, rowsAffected, ctrlDataSource, mockDataSource, ctrlConnection, - mockConnection, ctrlPreparedStatement, mockPreparedStatement, ctrlDatabaseMetaData, - mockDatabaseMetaData); + given(preparedStatement.executeBatch()).willReturn(rowsAffected); + given(connection.getMetaData()).willReturn(databaseMetaData); - BatchUpdateTestHelper.replayBatchUpdateMocks(ctrlDataSource, ctrlConnection, ctrlPreparedStatement, ctrlDatabaseMetaData); - - JdbcTemplate template = new JdbcTemplate(mockDataSource, false); - NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(template); - - int[] actualRowsAffected = namedParameterJdbcTemplate.batchUpdate(sql, ids); + JdbcTemplate template = new JdbcTemplate(dataSource, false); + namedParameterTemplate = new NamedParameterJdbcTemplate(template); + int[] actualRowsAffected = namedParameterTemplate.batchUpdate("UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = :id", ids); assertTrue("executed 2 updates", actualRowsAffected.length == 2); assertEquals(rowsAffected[0], actualRowsAffected[0]); assertEquals(rowsAffected[1], actualRowsAffected[1]); - - BatchUpdateTestHelper.verifyBatchUpdateMocks(ctrlPreparedStatement, ctrlDatabaseMetaData); - + verify(connection).prepareStatement("UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"); + verify(preparedStatement).setObject(1, 100, Types.NUMERIC); + verify(preparedStatement).setObject(1, 200, Types.NUMERIC); + verify(preparedStatement, times(2)).addBatch(); + verify(preparedStatement, atLeastOnce()).close(); + verify(connection, atLeastOnce()).close(); } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java index 5abcb764ed0..a2d43fdbba1 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java @@ -16,6 +16,14 @@ package org.springframework.jdbc.core.namedparam; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + +import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.ResultSetMetaData; @@ -27,576 +35,261 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.easymock.MockControl; +import javax.sql.DataSource; -import org.springframework.jdbc.AbstractJdbcTests; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import org.springframework.jdbc.core.RowMapper; /** * @author Thomas Risberg + * @author Phillip Webb */ -public class NamedParameterQueryTests extends AbstractJdbcTests { - - private MockControl ctrlPreparedStatement; - private PreparedStatement mockPreparedStatement; - private MockControl ctrlResultSet; - private ResultSet mockResultSet; - private MockControl ctrlResultSetMetaData; - private ResultSetMetaData mockResultSetMetaData; - - @Override - protected void setUp() throws Exception { - super.setUp(); - ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - ctrlResultSet = MockControl.createControl(ResultSet.class); - mockResultSet = (ResultSet) ctrlResultSet.getMock(); - ctrlResultSetMetaData = MockControl.createControl(ResultSetMetaData.class); - mockResultSetMetaData = (ResultSetMetaData) ctrlResultSetMetaData.getMock(); - } +public class NamedParameterQueryTests { + + private DataSource dataSource; + + private Connection connection; + + private PreparedStatement preparedStatement; + + private ResultSet resultSet; + + private ResultSetMetaData resultSetMetaData; + + private NamedParameterJdbcTemplate template; - @Override - protected void replay() { - super.replay(); - ctrlPreparedStatement.replay(); - ctrlResultSet.replay(); - ctrlResultSetMetaData.replay(); + @Before + public void setUp() throws Exception { + connection = mock(Connection.class); + dataSource = mock(DataSource.class); + preparedStatement = mock(PreparedStatement.class); + resultSet = mock(ResultSet.class); + resultSetMetaData = mock(ResultSetMetaData.class); + template = new NamedParameterJdbcTemplate(dataSource); + given(dataSource.getConnection()).willReturn(connection); + given(resultSetMetaData.getColumnCount()).willReturn(1); + given(resultSetMetaData.getColumnLabel(1)).willReturn("age"); + given(connection.prepareStatement(anyString())).willReturn(preparedStatement); + given(preparedStatement.executeQuery()).willReturn(resultSet); } - @Override - protected void tearDown() throws Exception { - super.tearDown(); - if (false && shouldVerify()) { - ctrlPreparedStatement.verify(); - ctrlResultSet.verify(); - ctrlResultSetMetaData.verify(); - } + @After + public void verifyClose() throws Exception { + verify(preparedStatement).close(); + verify(resultSet).close(); + verify(connection).close(); } + @Test public void testQueryForListWithParamMap() throws Exception { - String sql = "SELECT AGE FROM CUSTMR WHERE ID < :id"; - String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID < ?"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1, 2); - mockResultSetMetaData.getColumnLabel(1); - ctrlResultSetMetaData.setReturnValue("age", 2); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData, 2); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getObject(1); - ctrlResultSet.setReturnValue(new Integer(11)); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getObject(1); - ctrlResultSet.setReturnValue(new Integer(12)); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(3)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sqlToUse); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource); + given(resultSet.getMetaData()).willReturn(resultSetMetaData); + given(resultSet.next()).willReturn(true, true, false); + given(resultSet.getObject(1)).willReturn(11, 12); MapSqlParameterSource parms = new MapSqlParameterSource(); - parms.addValue("id", new Integer(3)); + parms.addValue("id", 3); + List> li = template.queryForList( + "SELECT AGE FROM CUSTMR WHERE ID < :id", parms); - List li = template.queryForList(sql, parms); assertEquals("All rows returned", 2, li.size()); - assertEquals("First row is Integer", 11, ((Integer)((Map)li.get(0)).get("age")).intValue()); - assertEquals("Second row is Integer", 12, ((Integer)((Map)li.get(1)).get("age")).intValue()); + assertEquals("First row is Integer", 11, + ((Integer) ((Map) li.get(0)).get("age")).intValue()); + assertEquals("Second row is Integer", 12, + ((Integer) ((Map) li.get(1)).get("age")).intValue()); + + verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID < ?"); + verify(preparedStatement).setObject(1, 3); } + @Test public void testQueryForListWithParamMapAndEmptyResult() throws Exception { - String sql = "SELECT AGE FROM CUSTMR WHERE ID < :id"; - String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID < ?"; - - ctrlResultSet = MockControl.createControl(ResultSet.class); - mockResultSet = (ResultSet) ctrlResultSet.getMock(); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(3)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sqlToUse); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource); + given(resultSet.next()).willReturn(false); MapSqlParameterSource parms = new MapSqlParameterSource(); - parms.addValue("id", new Integer(3)); + parms.addValue("id", 3); + List> li = template.queryForList( + "SELECT AGE FROM CUSTMR WHERE ID < :id", parms); - List li = template.queryForList(sql, parms); assertEquals("All rows returned", 0, li.size()); + verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID < ?"); + verify(preparedStatement).setObject(1, 3); } + @Test public void testQueryForListWithParamMapAndSingleRowAndColumn() throws Exception { - String sql = "SELECT AGE FROM CUSTMR WHERE ID < :id"; - String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID < ?"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - mockResultSetMetaData.getColumnLabel(1); - ctrlResultSetMetaData.setReturnValue("age", 1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getObject(1); - ctrlResultSet.setReturnValue(new Integer(11)); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(3)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sqlToUse); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource); + given(resultSet.getMetaData()).willReturn(resultSetMetaData); + given(resultSet.next()).willReturn(true, false); + given(resultSet.getObject(1)).willReturn(11); MapSqlParameterSource parms = new MapSqlParameterSource(); - parms.addValue("id", new Integer(3)); + parms.addValue("id", 3); + List> li = template.queryForList( + "SELECT AGE FROM CUSTMR WHERE ID < :id", parms); - List li = template.queryForList(sql, parms); assertEquals("All rows returned", 1, li.size()); - assertEquals("First row is Integer", 11, ((Integer)((Map)li.get(0)).get("age")).intValue()); + assertEquals("First row is Integer", 11, + ((Integer) ((Map) li.get(0)).get("age")).intValue()); + verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID < ?"); + verify(preparedStatement).setObject(1, 3); } - public void testQueryForListWithParamMapAndIntegerElementAndSingleRowAndColumn() throws Exception { - String sql = "SELECT AGE FROM CUSTMR WHERE ID < :id"; - String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID < ?"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt(1); - ctrlResultSet.setReturnValue(11); - mockResultSet.wasNull(); - ctrlResultSet.setReturnValue(false); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(3)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sqlToUse); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource); + @Test + public void testQueryForListWithParamMapAndIntegerElementAndSingleRowAndColumn() + throws Exception { + given(resultSet.getMetaData()).willReturn(resultSetMetaData); + given(resultSet.next()).willReturn(true, false); + given(resultSet.getInt(1)).willReturn(11); MapSqlParameterSource parms = new MapSqlParameterSource(); - parms.addValue("id", new Integer(3)); + parms.addValue("id", 3); + List li = template.queryForList("SELECT AGE FROM CUSTMR WHERE ID < :id", + parms, Integer.class); - List li = template.queryForList(sql, parms, Integer.class); assertEquals("All rows returned", 1, li.size()); - assertEquals("First row is Integer", 11, ((Integer) li.get(0)).intValue()); + assertEquals("First row is Integer", 11, li.get(0).intValue()); + verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID < ?"); + verify(preparedStatement).setObject(1, 3); } + @Test public void testQueryForMapWithParamMapAndSingleRowAndColumn() throws Exception { - String sql = "SELECT AGE FROM CUSTMR WHERE ID < :id"; - String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID < ?"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - mockResultSetMetaData.getColumnLabel(1); - ctrlResultSetMetaData.setReturnValue("age", 1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getObject(1); - ctrlResultSet.setReturnValue(new Integer(11)); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(3)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sqlToUse); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource); + given(resultSet.getMetaData()).willReturn(resultSetMetaData); + given(resultSet.next()).willReturn(true, false); + given(resultSet.getObject(1)).willReturn(11); MapSqlParameterSource parms = new MapSqlParameterSource(); - parms.addValue("id", new Integer(3)); + parms.addValue("id", 3); + Map map = template.queryForMap("SELECT AGE FROM CUSTMR WHERE ID < :id", parms); - Map map = template.queryForMap(sql, parms); assertEquals("Row is Integer", 11, ((Integer) map.get("age")).intValue()); + verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID < ?"); + verify(preparedStatement).setObject(1, 3); } + @Test public void testQueryForObjectWithParamMapAndRowMapper() throws Exception { - String sql = "SELECT AGE FROM CUSTMR WHERE ID = :id"; - String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID = ?"; - - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt(1); - ctrlResultSet.setReturnValue(22); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(3)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sqlToUse); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource); + given(resultSet.next()).willReturn(true, false); + given(resultSet.getInt(1)).willReturn(22); MapSqlParameterSource parms = new MapSqlParameterSource(); - parms.addValue("id", new Integer(3)); - - Object o = template.queryForObject(sql, parms, new RowMapper() { - @Override - public Object mapRow(ResultSet rs, int rowNum) throws SQLException { - return new Integer(rs.getInt(1)); - } - }); + parms.addValue("id", 3); + Object o = template.queryForObject("SELECT AGE FROM CUSTMR WHERE ID = :id", + parms, new RowMapper() { + @Override + public Object mapRow(ResultSet rs, int rowNum) throws SQLException { + return rs.getInt(1); + } + }); + assertTrue("Correct result type", o instanceof Integer); + verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID = ?"); + verify(preparedStatement).setObject(1, 3); } + @Test public void testQueryForObjectWithMapAndInteger() throws Exception { - String sql = "SELECT AGE FROM CUSTMR WHERE ID = :id"; - String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID = ?"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt(1); - ctrlResultSet.setReturnValue(22); - mockResultSet.wasNull(); - ctrlResultSet.setReturnValue(false); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(3)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sqlToUse); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource); - - Map parms = new HashMap(); - parms.put("id", new Integer(3)); + given(resultSet.getMetaData()).willReturn(resultSetMetaData); + given(resultSet.next()).willReturn(true, false); + given(resultSet.getInt(1)).willReturn(22); + + Map parms = new HashMap(); + parms.put("id", 3); + Object o = template.queryForObject("SELECT AGE FROM CUSTMR WHERE ID = :id", + parms, Integer.class); - Object o = template.queryForObject(sql, parms, Integer.class); assertTrue("Correct result type", o instanceof Integer); + verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID = ?"); + verify(preparedStatement).setObject(1, 3); } + @Test public void testQueryForObjectWithParamMapAndInteger() throws Exception { - String sql = "SELECT AGE FROM CUSTMR WHERE ID = :id"; - String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID = ?"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt(1); - ctrlResultSet.setReturnValue(22); - mockResultSet.wasNull(); - ctrlResultSet.setReturnValue(false); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(3)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sqlToUse); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource); + given(resultSet.getMetaData()).willReturn(resultSetMetaData); + given(resultSet.next()).willReturn(true, false); + given(resultSet.getInt(1)).willReturn(22); MapSqlParameterSource parms = new MapSqlParameterSource(); - parms.addValue("id", new Integer(3)); + parms.addValue("id", 3); + Object o = template.queryForObject("SELECT AGE FROM CUSTMR WHERE ID = :id", + parms, Integer.class); - Object o = template.queryForObject(sql, parms, Integer.class); assertTrue("Correct result type", o instanceof Integer); + verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID = ?"); + verify(preparedStatement).setObject(1, 3); } + @Test public void testQueryForObjectWithParamMapAndList() throws Exception { String sql = "SELECT AGE FROM CUSTMR WHERE ID IN (:ids)"; String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID IN (?, ?)"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt(1); - ctrlResultSet.setReturnValue(22); - mockResultSet.wasNull(); - ctrlResultSet.setReturnValue(false); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(3)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setObject(2, new Integer(4)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sqlToUse); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource); + given(resultSet.getMetaData()).willReturn(resultSetMetaData); + given(resultSet.next()).willReturn(true, false); + given(resultSet.getInt(1)).willReturn(22); MapSqlParameterSource parms = new MapSqlParameterSource(); - parms.addValue("ids", Arrays.asList(new Object[] {new Integer(3), new Integer(4)})); - + parms.addValue("ids", Arrays.asList(new Object[] { 3, 4 })); Object o = template.queryForObject(sql, parms, Integer.class); + assertTrue("Correct result type", o instanceof Integer); + verify(connection).prepareStatement(sqlToUse); + verify(preparedStatement).setObject(1, 3); } + @Test public void testQueryForObjectWithParamMapAndListOfExpressionLists() throws Exception { - String sql = "SELECT AGE FROM CUSTMR WHERE (ID, NAME) IN (:multiExpressionList)"; - String sqlToUse = "SELECT AGE FROM CUSTMR WHERE (ID, NAME) IN ((?, ?), (?, ?))"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt(1); - ctrlResultSet.setReturnValue(22); - mockResultSet.wasNull(); - ctrlResultSet.setReturnValue(false); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(3)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setString(2, "Rod"); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setObject(3, new Integer(4)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setString(4, "Juergen"); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sqlToUse); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource); + given(resultSet.getMetaData()).willReturn(resultSetMetaData); + given(resultSet.next()).willReturn(true, false); + given(resultSet.getInt(1)).willReturn(22); MapSqlParameterSource parms = new MapSqlParameterSource(); - List l1 = new ArrayList(); - l1.add(new Object[] {new Integer(3), "Rod"}); - l1.add(new Object[] {new Integer(4), "Juergen"}); + List l1 = new ArrayList(); + l1.add(new Object[] { 3, "Rod" }); + l1.add(new Object[] { 4, "Juergen" }); parms.addValue("multiExpressionList", l1); + Object o = template.queryForObject( + "SELECT AGE FROM CUSTMR WHERE (ID, NAME) IN (:multiExpressionList)", + parms, Integer.class); - Object o = template.queryForObject(sql, parms, Integer.class); assertTrue("Correct result type", o instanceof Integer); + verify(connection).prepareStatement( + "SELECT AGE FROM CUSTMR WHERE (ID, NAME) IN ((?, ?), (?, ?))"); + verify(preparedStatement).setObject(1, 3); } + @Test public void testQueryForIntWithParamMap() throws Exception { - String sql = "SELECT AGE FROM CUSTMR WHERE ID = :id"; - String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID = ?"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt(1); - ctrlResultSet.setReturnValue(22.0d); - mockResultSet.wasNull(); - ctrlResultSet.setReturnValue(false); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(3)); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sqlToUse); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource); + given(resultSet.getMetaData()).willReturn(resultSetMetaData); + given(resultSet.next()).willReturn(true, false); + given(resultSet.getInt(1)).willReturn(22); MapSqlParameterSource parms = new MapSqlParameterSource(); - parms.addValue("id", new Integer(3)); + parms.addValue("id", 3); + int i = template.queryForInt("SELECT AGE FROM CUSTMR WHERE ID = :id", parms); - int i = template.queryForInt(sql, parms); assertEquals("Return of an int", 22, i); + verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID = ?"); + verify(preparedStatement).setObject(1, 3); } + @Test public void testQueryForLongWithParamBean() throws Exception { - String sql = "SELECT AGE FROM CUSTMR WHERE ID = :id"; - String sqlToUse = "SELECT AGE FROM CUSTMR WHERE ID = ?"; - - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getLong(1); - ctrlResultSet.setReturnValue(87.0d); - mockResultSet.wasNull(); - ctrlResultSet.setReturnValue(false); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(3), Types.INTEGER); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(sqlToUse); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - NamedParameterJdbcTemplate template = new NamedParameterJdbcTemplate(mockDataSource); - BeanPropertySqlParameterSource parms = new BeanPropertySqlParameterSource(new ParameterBean(3)); - - long l = template.queryForLong(sql, parms); + given(resultSet.getMetaData()).willReturn(resultSetMetaData); + given(resultSet.next()).willReturn(true, false); + given(resultSet.getLong(1)).willReturn(87L); + + BeanPropertySqlParameterSource parms = new BeanPropertySqlParameterSource( + new ParameterBean(3)); + + long l = template.queryForLong("SELECT AGE FROM CUSTMR WHERE ID = :id", parms); + assertEquals("Return of a long", 87, l); + verify(connection).prepareStatement("SELECT AGE FROM CUSTMR WHERE ID = ?"); + verify(preparedStatement).setObject(1, 3, Types.INTEGER); } - - private static class ParameterBean { + static class ParameterBean { private int id; diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java index 3340c760d72..0b09e04dc3f 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/CallMetaDataContextTests.java @@ -1,14 +1,11 @@ package org.springframework.jdbc.core.simple; -import junit.framework.TestCase; -import org.easymock.MockControl; -import org.springframework.jdbc.core.metadata.CallMetaDataContext; -import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; -import org.springframework.jdbc.core.SqlParameter; -import org.springframework.jdbc.core.SqlOutParameter; -import org.springframework.jdbc.core.SqlInOutParameter; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; -import javax.sql.DataSource; import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.Types; @@ -16,74 +13,51 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import javax.sql.DataSource; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.springframework.jdbc.core.SqlInOutParameter; +import org.springframework.jdbc.core.SqlOutParameter; +import org.springframework.jdbc.core.SqlParameter; +import org.springframework.jdbc.core.metadata.CallMetaDataContext; +import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; + /** * Mock object based tests for CallMetaDataContext. * * @author Thomas Risberg */ -public class CallMetaDataContextTests extends TestCase { - private MockControl ctrlDataSource; - private DataSource mockDataSource; - private MockControl ctrlConnection; - private Connection mockConnection; - private MockControl ctrlDatabaseMetaData; - private DatabaseMetaData mockDatabaseMetaData; - - private CallMetaDataContext context = new CallMetaDataContext(); - - @Override - protected void setUp() throws Exception { - super.setUp(); - - ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - - ctrlConnection = MockControl.createControl(Connection.class); - mockConnection = (Connection) ctrlConnection.getMock(); - mockConnection.getMetaData(); - ctrlConnection.setDefaultReturnValue(mockDatabaseMetaData); - mockConnection.close(); - ctrlConnection.setDefaultVoidCallable(); +public class CallMetaDataContextTests { - ctrlDataSource = MockControl.createControl(DataSource.class); - mockDataSource = (DataSource) ctrlDataSource.getMock(); - mockDataSource.getConnection(); - ctrlDataSource.setDefaultReturnValue(mockConnection); + private DataSource dataSource; + private Connection connection; + private DatabaseMetaData databaseMetaData; - } + private CallMetaDataContext context = new CallMetaDataContext(); - @Override - protected void tearDown() throws Exception { - super.tearDown(); - ctrlDatabaseMetaData.verify(); - ctrlDataSource.verify(); + @Before + public void setUp() throws Exception { + connection = mock(Connection.class); + databaseMetaData = mock(DatabaseMetaData.class); + given(connection.getMetaData()).willReturn(databaseMetaData); + dataSource = mock(DataSource.class); + given(dataSource.getConnection()).willReturn(connection); } - protected void replay() { - ctrlDatabaseMetaData.replay(); - ctrlConnection.replay(); - ctrlDataSource.replay(); + @After + public void verifyClosed() throws Exception { + verify(connection).close(); } + @Test public void testMatchParameterValuesAndSqlInOutParameters() throws Exception { final String TABLE = "customers"; final String USER = "me"; - - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("MyDB"); - mockDatabaseMetaData.supportsCatalogsInProcedureCalls(); - ctrlDatabaseMetaData.setReturnValue(false); - mockDatabaseMetaData.supportsSchemasInProcedureCalls(); - ctrlDatabaseMetaData.setReturnValue(false); - - mockDatabaseMetaData.getUserName(); - ctrlDatabaseMetaData.setReturnValue(USER); - mockDatabaseMetaData.storesUpperCaseIdentifiers(); - ctrlDatabaseMetaData.setReturnValue(false); - mockDatabaseMetaData.storesLowerCaseIdentifiers(); - ctrlDatabaseMetaData.setReturnValue(true); - - replay(); + given(databaseMetaData.getDatabaseProductName()).willReturn("MyDB"); + given(databaseMetaData.getUserName()).willReturn(USER); + given(databaseMetaData.storesLowerCaseIdentifiers()).willReturn(true); List parameters = new ArrayList(); parameters.add(new SqlParameter("id", Types.NUMERIC)); @@ -96,7 +70,7 @@ public class CallMetaDataContextTests extends TestCase { parameterSource.addValue("customer_no", "12345XYZ"); context.setProcedureName(TABLE); - context.initializeMetaData(mockDataSource); + context.initializeMetaData(dataSource); context.processParameters(parameters); Map inParameters = context.matchInParameterValuesWithCallParameters(parameterSource); @@ -110,7 +84,6 @@ public class CallMetaDataContextTests extends TestCase { List callParameters = context.getCallParameters(); assertEquals("Wrong number of call parameters", 3, callParameters.size()); - } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java index 7ed70e88e1e..681376564d4 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java @@ -16,9 +16,13 @@ package org.springframework.jdbc.core.simple; -import java.sql.SQLException; +import static org.junit.Assert.assertEquals; + import java.util.List; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.jdbc.core.AbstractRowMapperTests; import org.springframework.jdbc.core.test.ConcretePerson; @@ -29,46 +33,43 @@ import org.springframework.jdbc.core.test.Person; */ public class ParameterizedBeanPropertyRowMapperTests extends AbstractRowMapperTests { - private SimpleJdbcTemplate simpleJdbcTemplate; + @Rule + public ExpectedException thrown = ExpectedException.none(); - @Override - protected void setUp() throws SQLException { - super.setUp(); - simpleJdbcTemplate = new SimpleJdbcTemplate(jdbcTemplate); + @Test + @SuppressWarnings({ "unchecked", "rawtypes" }) + public void testOverridingDifferentClassDefinedForMapping() { + ParameterizedBeanPropertyRowMapper mapper = ParameterizedBeanPropertyRowMapper.newInstance(Person.class); + thrown.expect(InvalidDataAccessApiUsageException.class); + mapper.setMappedClass(Long.class); } - public void testOverridingClassDefinedForMapping() { - ParameterizedBeanPropertyRowMapper mapper = - ParameterizedBeanPropertyRowMapper.newInstance(Person.class); - try { - ((ParameterizedBeanPropertyRowMapper) mapper).setMappedClass(Long.class); - fail("Setting new class should have thrown InvalidDataAccessApiUsageException"); - } - catch (InvalidDataAccessApiUsageException ex) { - // expected - } - try { - mapper.setMappedClass(Person.class); - } - catch (InvalidDataAccessApiUsageException ex) { - fail("Setting same class should not have thrown InvalidDataAccessApiUsageException"); - } + @Test + public void testOverridingSameClassDefinedForMapping() { + ParameterizedBeanPropertyRowMapper mapper = ParameterizedBeanPropertyRowMapper.newInstance(Person.class); + mapper.setMappedClass(Person.class); } - public void testStaticQueryWithRowMapper() throws SQLException { - List result = simpleJdbcTemplate.query("select name, age, birth_date, balance from people", + @Test + public void testStaticQueryWithRowMapper() throws Exception { + Mock mock = new Mock(); + List result = mock.getJdbcTemplate().query( + "select name, age, birth_date, balance from people", ParameterizedBeanPropertyRowMapper.newInstance(Person.class)); assertEquals(1, result.size()); - Person bean = result.get(0); - verifyPerson(bean); + verifyPerson(result.get(0)); + mock.verifyClosed(); } - public void testMappingWithInheritance() throws SQLException { - List result = simpleJdbcTemplate.query("select name, age, birth_date, balance from people", + @Test + public void testMappingWithInheritance() throws Exception { + Mock mock = new Mock(); + List result = mock.getJdbcTemplate().query( + "select name, age, birth_date, balance from people", ParameterizedBeanPropertyRowMapper.newInstance(ConcretePerson.class)); assertEquals(1, result.size()); - ConcretePerson bean = result.get(0); - verifyConcretePerson(bean); + verifyConcretePerson(result.get(0)); + mock.verifyClosed(); } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java index 1f664107a65..f027c15564c 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java @@ -16,469 +16,274 @@ package org.springframework.jdbc.core.simple; -import junit.framework.TestCase; -import org.easymock.MockControl; -import org.apache.commons.logging.LogFactory; +import static org.hamcrest.Matchers.sameInstance; +import static org.junit.Assert.assertEquals; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.springframework.build.test.hamcrest.Matchers.exceptionCause; + +import java.sql.CallableStatement; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Types; +import javax.sql.DataSource; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.jdbc.BadSqlGrammarException; import org.springframework.jdbc.core.SqlOutParameter; import org.springframework.jdbc.core.SqlParameter; -import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; -import org.springframework.jdbc.core.simple.SimpleJdbcCall; -import org.springframework.dao.InvalidDataAccessApiUsageException; - -import javax.sql.DataSource; -import java.sql.*; /** * Mock object based tests for SimpleJdbcCall. * * @author Thomas Risberg */ -public class SimpleJdbcCallTests extends TestCase { - - private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled(); - - private MockControl ctrlDataSource; - private DataSource mockDataSource; - private MockControl ctrlConnection; - private Connection mockConnection; - private MockControl ctrlDatabaseMetaData; - private DatabaseMetaData mockDatabaseMetaData; - private MockControl ctrlCallable; - private CallableStatement mockCallable; - - @Override - protected void setUp() throws Exception { - ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - - ctrlConnection = MockControl.createControl(Connection.class); - mockConnection = (Connection) ctrlConnection.getMock(); - mockConnection.getMetaData(); - ctrlConnection.setDefaultReturnValue(mockDatabaseMetaData); - mockConnection.close(); - ctrlConnection.setDefaultVoidCallable(); - - ctrlDataSource = MockControl.createControl(DataSource.class); - mockDataSource = (DataSource) ctrlDataSource.getMock(); - mockDataSource.getConnection(); - ctrlDataSource.setDefaultReturnValue(mockConnection); - - ctrlCallable = MockControl.createControl(CallableStatement.class); - mockCallable = (CallableStatement) ctrlCallable.getMock(); - } - - @Override - protected void tearDown() throws Exception { - ctrlDatabaseMetaData.verify(); - ctrlDataSource.verify(); - ctrlCallable.verify(); - } - - protected void replay() { - ctrlDatabaseMetaData.replay(); - ctrlConnection.replay(); - ctrlDataSource.replay(); - ctrlCallable.replay(); +public class SimpleJdbcCallTests { + + @Rule + public ExpectedException thrown = ExpectedException.none(); + + private Connection connection; + private DatabaseMetaData databaseMetaData; + private DataSource dataSource; + private CallableStatement callableStatement; + + @Before + public void setUp() throws Exception { + connection = mock(Connection.class); + databaseMetaData = mock(DatabaseMetaData.class); + dataSource = mock(DataSource.class); + callableStatement = mock(CallableStatement.class); + given(connection.getMetaData()).willReturn(databaseMetaData); + given(dataSource.getConnection()).willReturn(connection); } + @Test public void testNoSuchStoredProcedure() throws Exception { final String NO_SUCH_PROC = "x"; - - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("MyDB"); - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("MyDB"); - mockDatabaseMetaData.getUserName(); - ctrlDatabaseMetaData.setReturnValue("me"); - mockDatabaseMetaData.supportsCatalogsInProcedureCalls(); - ctrlDatabaseMetaData.setReturnValue(false); - mockDatabaseMetaData.supportsSchemasInProcedureCalls(); - ctrlDatabaseMetaData.setReturnValue(false); - mockDatabaseMetaData.storesUpperCaseIdentifiers(); - ctrlDatabaseMetaData.setReturnValue(false); - mockDatabaseMetaData.storesLowerCaseIdentifiers(); - ctrlDatabaseMetaData.setReturnValue(true); - - SQLException sex = - new SQLException( - "Syntax error or access violation exception", - "42000"); - mockCallable.execute(); - ctrlCallable.setThrowable(sex); - mockCallable.close(); - ctrlCallable.setVoidCallable(); - - mockConnection.prepareCall( - "{call " + NO_SUCH_PROC + "()}"); - ctrlConnection.setReturnValue(mockCallable); - - replay(); - - SimpleJdbcCall sproc = new SimpleJdbcCall(mockDataSource).withProcedureName(NO_SUCH_PROC); + SQLException sqlException = new SQLException("Syntax error or access violation exception", "42000"); + given(databaseMetaData.getDatabaseProductName()).willReturn("MyDB"); + given(databaseMetaData.getDatabaseProductName()).willReturn("MyDB"); + given(databaseMetaData.getUserName()).willReturn("me"); + given(databaseMetaData.storesLowerCaseIdentifiers()).willReturn(true); + given(callableStatement.execute()).willThrow(sqlException); + given(connection.prepareCall("{call " + NO_SUCH_PROC + "()}")).willReturn(callableStatement); + SimpleJdbcCall sproc = new SimpleJdbcCall(dataSource).withProcedureName(NO_SUCH_PROC); + thrown.expect(BadSqlGrammarException.class); + thrown.expect(exceptionCause(sameInstance(sqlException))); try { sproc.execute(); - fail("Shouldn't succeed in running stored procedure which doesn't exist"); - } catch (BadSqlGrammarException ex) { - // OK + } + finally { + verify(callableStatement).close(); + verify(connection, atLeastOnce()).close(); } } + @Test public void testUnnamedParameterHandling() throws Exception { final String MY_PROC = "my_proc"; - - replay(); - - SimpleJdbcCall sproc = new SimpleJdbcCall(mockDataSource).withProcedureName(MY_PROC); - try { - sproc.addDeclaredParameter(new SqlParameter(1)); - fail("Shouldn't succeed in adding unnamed parameter"); - } catch (InvalidDataAccessApiUsageException ex) { - // OK - } + SimpleJdbcCall sproc = new SimpleJdbcCall(dataSource).withProcedureName(MY_PROC); + // Shouldn't succeed in adding unnamed parameter + thrown.expect(InvalidDataAccessApiUsageException.class); + sproc.addDeclaredParameter(new SqlParameter(1)); } + @Test public void testAddInvoiceProcWithoutMetaDataUsingMapParamSource() throws Exception { - final int amount = 1103; - final int custid = 3; - initializeAddInvoiceWithoutMetaData(false); - - replay(); - - SimpleJdbcCall adder = new SimpleJdbcCall(mockDataSource).withProcedureName("add_invoice"); - adder.declareParameters(new SqlParameter("amount", Types.INTEGER), + SimpleJdbcCall adder = new SimpleJdbcCall(dataSource).withProcedureName("add_invoice"); + adder.declareParameters( + new SqlParameter("amount", Types.INTEGER), new SqlParameter("custid", Types.INTEGER), - new SqlOutParameter("newid", Types.INTEGER)); - Number newId = adder.executeObject(Number.class, new MapSqlParameterSource() - .addValue("amount", amount) - .addValue("custid", custid)); + new SqlOutParameter("newid", + Types.INTEGER)); + Number newId = adder.executeObject(Number.class, new MapSqlParameterSource(). + addValue("amount", 1103). + addValue("custid", 3)); assertEquals(4, newId.intValue()); + verifyAddInvoiceWithoutMetaData(false); + verify(connection, atLeastOnce()).close(); } + @Test public void testAddInvoiceProcWithoutMetaDataUsingArrayParams() throws Exception { - final int amount = 1103; - final int custid = 3; - initializeAddInvoiceWithoutMetaData(false); - - replay(); - - SimpleJdbcCall adder = new SimpleJdbcCall(mockDataSource).withProcedureName("add_invoice"); - adder.declareParameters(new SqlParameter("amount", Types.INTEGER), + SimpleJdbcCall adder = new SimpleJdbcCall(dataSource).withProcedureName("add_invoice"); + adder.declareParameters( + new SqlParameter("amount", Types.INTEGER), new SqlParameter("custid", Types.INTEGER), - new SqlOutParameter("newid", Types.INTEGER)); - Number newId = adder.executeObject(Number.class, amount, custid); + new SqlOutParameter("newid", + Types.INTEGER)); + Number newId = adder.executeObject(Number.class, 1103, 3); assertEquals(4, newId.intValue()); + verifyAddInvoiceWithoutMetaData(false); + verify(connection, atLeastOnce()).close(); } + @Test public void testAddInvoiceProcWithMetaDataUsingMapParamSource() throws Exception { - final int amount = 1103; - final int custid = 3; - - MockControl ctrlResultSet = initializeAddInvoiceWithMetaData(false); - - ctrlResultSet.replay(); - replay(); - - SimpleJdbcCall adder = new SimpleJdbcCall(mockDataSource).withProcedureName("add_invoice"); + initializeAddInvoiceWithMetaData(false); + SimpleJdbcCall adder = new SimpleJdbcCall(dataSource).withProcedureName("add_invoice"); Number newId = adder.executeObject(Number.class, new MapSqlParameterSource() - .addValue("amount", amount) - .addValue("custid", custid)); + .addValue("amount", 1103) + .addValue("custid", 3)); assertEquals(4, newId.intValue()); - - ctrlResultSet.verify(); + verifyAddInvoiceWithMetaData(false); + verify(connection, atLeastOnce()).close(); } + @Test public void testAddInvoiceProcWithMetaDataUsingArrayParams() throws Exception { - final int amount = 1103; - final int custid = 3; - - MockControl ctrlResultSet = initializeAddInvoiceWithMetaData(false); - - ctrlResultSet.replay(); - replay(); - - SimpleJdbcCall adder = new SimpleJdbcCall(mockDataSource).withProcedureName("add_invoice"); - Number newId = adder.executeObject(Number.class, amount, custid); + initializeAddInvoiceWithMetaData(false); + SimpleJdbcCall adder = new SimpleJdbcCall(dataSource).withProcedureName("add_invoice"); + Number newId = adder.executeObject(Number.class, 1103, 3); assertEquals(4, newId.intValue()); - - ctrlResultSet.verify(); + verifyAddInvoiceWithMetaData(false); + verify(connection, atLeastOnce()).close(); } + @Test public void testAddInvoiceFuncWithoutMetaDataUsingMapParamSource() throws Exception { - final int amount = 1103; - final int custid = 3; - initializeAddInvoiceWithoutMetaData(true); - - replay(); - - SimpleJdbcCall adder = new SimpleJdbcCall(mockDataSource).withFunctionName("add_invoice"); - adder.declareParameters(new SqlOutParameter("return", Types.INTEGER), + SimpleJdbcCall adder = new SimpleJdbcCall(dataSource).withFunctionName("add_invoice"); + adder.declareParameters( + new SqlOutParameter("return", Types.INTEGER), new SqlParameter("amount", Types.INTEGER), new SqlParameter("custid", Types.INTEGER)); Number newId = adder.executeFunction(Number.class, new MapSqlParameterSource() - .addValue("amount", amount) - .addValue("custid", custid)); + .addValue("amount", 1103) + .addValue("custid", 3)); assertEquals(4, newId.intValue()); + verifyAddInvoiceWithoutMetaData(true); + verify(connection, atLeastOnce()).close(); } + @Test public void testAddInvoiceFuncWithoutMetaDataUsingArrayParams() throws Exception { - final int amount = 1103; - final int custid = 3; - initializeAddInvoiceWithoutMetaData(true); - - replay(); - - SimpleJdbcCall adder = new SimpleJdbcCall(mockDataSource).withFunctionName("add_invoice"); - adder.declareParameters(new SqlOutParameter("return", Types.INTEGER), + SimpleJdbcCall adder = new SimpleJdbcCall(dataSource).withFunctionName("add_invoice"); + adder.declareParameters( + new SqlOutParameter("return", Types.INTEGER), new SqlParameter("amount", Types.INTEGER), new SqlParameter("custid", Types.INTEGER)); - Number newId = adder.executeFunction(Number.class, amount, custid); + Number newId = adder.executeFunction(Number.class, 1103, 3); assertEquals(4, newId.intValue()); + verifyAddInvoiceWithoutMetaData(true); + verify(connection, atLeastOnce()).close(); } + @Test public void testAddInvoiceFuncWithMetaDataUsingMapParamSource() throws Exception { - final int amount = 1103; - final int custid = 3; - - MockControl ctrlResultSet = initializeAddInvoiceWithMetaData(true); - - ctrlResultSet.replay(); - replay(); - - SimpleJdbcCall adder = new SimpleJdbcCall(mockDataSource).withFunctionName("add_invoice"); + initializeAddInvoiceWithMetaData(true); + SimpleJdbcCall adder = new SimpleJdbcCall(dataSource).withFunctionName("add_invoice"); Number newId = adder.executeFunction(Number.class, new MapSqlParameterSource() - .addValue("amount", amount) - .addValue("custid", custid)); + .addValue("amount", 1103) + .addValue("custid", 3)); assertEquals(4, newId.intValue()); + verifyAddInvoiceWithMetaData(true); + verify(connection, atLeastOnce()).close(); - ctrlResultSet.verify(); } - public void testAddInvoiceFuncWithMetaDataUsingArrayParams() throws Exception { - final int amount = 1103; - final int custid = 3; - - MockControl ctrlResultSet = initializeAddInvoiceWithMetaData(true); - - ctrlResultSet.replay(); - replay(); - - SimpleJdbcCall adder = new SimpleJdbcCall(mockDataSource).withFunctionName("add_invoice"); - Number newId = adder.executeFunction(Number.class, amount, custid); + @Test public void testAddInvoiceFuncWithMetaDataUsingArrayParams() throws Exception { + initializeAddInvoiceWithMetaData(true); + SimpleJdbcCall adder = new SimpleJdbcCall(dataSource).withFunctionName("add_invoice"); + Number newId = adder.executeFunction(Number.class, 1103, 3); assertEquals(4, newId.intValue()); + verifyAddInvoiceWithMetaData(true); + verify(connection, atLeastOnce()).close(); - ctrlResultSet.verify(); } - private void initializeAddInvoiceWithoutMetaData(boolean isFunction) throws SQLException { - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("MyDB"); - mockDatabaseMetaData.getUserName(); - ctrlDatabaseMetaData.setReturnValue("me"); - mockDatabaseMetaData.supportsCatalogsInProcedureCalls(); - ctrlDatabaseMetaData.setReturnValue(false); - mockDatabaseMetaData.supportsSchemasInProcedureCalls(); - ctrlDatabaseMetaData.setReturnValue(false); - mockDatabaseMetaData.storesUpperCaseIdentifiers(); - ctrlDatabaseMetaData.setReturnValue(false); - mockDatabaseMetaData.storesLowerCaseIdentifiers(); - ctrlDatabaseMetaData.setReturnValue(true); - - if (isFunction) { - mockCallable.registerOutParameter(1, 4); - ctrlCallable.setVoidCallable(); - mockCallable.setObject(2, 1103, 4); - ctrlCallable.setVoidCallable(); - mockCallable.setObject(3, 3, 4); - ctrlCallable.setVoidCallable(); - } - else { - mockCallable.setObject(1, 1103, 4); - ctrlCallable.setVoidCallable(); - mockCallable.setObject(2, 3, 4); - ctrlCallable.setVoidCallable(); - mockCallable.registerOutParameter(3, 4); - ctrlCallable.setVoidCallable(); - } - mockCallable.execute(); - ctrlCallable.setReturnValue(false); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); + private void initializeAddInvoiceWithoutMetaData(boolean isFunction) + throws SQLException { + given(databaseMetaData.getDatabaseProductName()).willReturn("MyDB"); + given(databaseMetaData.getUserName()).willReturn("me"); + given(databaseMetaData.storesLowerCaseIdentifiers()).willReturn(true); + given(callableStatement.execute()).willReturn(false); + given(callableStatement.getUpdateCount()).willReturn(-1); if (isFunction) { - mockCallable.getObject(1); + given(callableStatement.getObject(1)).willReturn(4L); + given(connection.prepareCall("{? = call add_invoice(?, ?)}") + ).willReturn(callableStatement); } else { - mockCallable.getObject(3); + given(callableStatement.getObject(3)).willReturn(4L); + given(connection.prepareCall("{call add_invoice(?, ?, ?)}") + ).willReturn(callableStatement); } - ctrlCallable.setReturnValue(new Long(4)); - if (debugEnabled) { - mockCallable.getWarnings(); - ctrlCallable.setReturnValue(null); - } - mockCallable.close(); - ctrlCallable.setVoidCallable(); + } + private void verifyAddInvoiceWithoutMetaData(boolean isFunction) throws SQLException { if (isFunction) { - mockConnection.prepareCall( - "{? = call add_invoice(?, ?)}"); - ctrlConnection.setReturnValue(mockCallable); + verify(callableStatement).registerOutParameter(1, 4); + verify(callableStatement).setObject(2, 1103, 4); + verify(callableStatement).setObject(3, 3, 4); } else { - mockConnection.prepareCall( - "{call add_invoice(?, ?, ?)}"); - ctrlConnection.setReturnValue(mockCallable); + verify(callableStatement).setObject(1, 1103, 4); + verify(callableStatement).setObject(2, 3, 4); + verify(callableStatement).registerOutParameter(3, 4); } + verify(callableStatement).close(); } - private MockControl initializeAddInvoiceWithMetaData(boolean isFunction) throws SQLException { - MockControl ctrlResultSet = MockControl.createControl(ResultSet.class); - ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock(); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getString("PROCEDURE_CAT"); - ctrlResultSet.setReturnValue(null); - mockResultSet.getString("PROCEDURE_SCHEM"); - ctrlResultSet.setReturnValue(null); - mockResultSet.getString("PROCEDURE_NAME"); - ctrlResultSet.setReturnValue("add_invoice"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - if (isFunction) { - mockResultSet.getString("COLUMN_NAME"); - ctrlResultSet.setReturnValue(null); - mockResultSet.getInt("COLUMN_TYPE"); - ctrlResultSet.setReturnValue(5); - } - else { - mockResultSet.getString("COLUMN_NAME"); - ctrlResultSet.setReturnValue("amount"); - mockResultSet.getInt("COLUMN_TYPE"); - ctrlResultSet.setReturnValue(1); - } - mockResultSet.getInt("DATA_TYPE"); - ctrlResultSet.setReturnValue(4); - mockResultSet.getString("TYPE_NAME"); - ctrlResultSet.setReturnValue(null); - mockResultSet.getBoolean("NULLABLE"); - ctrlResultSet.setReturnValue(false); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - if (isFunction) { - mockResultSet.getString("COLUMN_NAME"); - ctrlResultSet.setReturnValue("amount"); - mockResultSet.getInt("COLUMN_TYPE"); - ctrlResultSet.setReturnValue(1); - } - else { - mockResultSet.getString("COLUMN_NAME"); - ctrlResultSet.setReturnValue("custid"); - mockResultSet.getInt("COLUMN_TYPE"); - ctrlResultSet.setReturnValue(1); - } - mockResultSet.getInt("DATA_TYPE"); - ctrlResultSet.setReturnValue(4); - mockResultSet.getString("TYPE_NAME"); - ctrlResultSet.setReturnValue(null); - mockResultSet.getBoolean("NULLABLE"); - ctrlResultSet.setReturnValue(false); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - if (isFunction) { - mockResultSet.getString("COLUMN_NAME"); - ctrlResultSet.setReturnValue("custid"); - mockResultSet.getInt("COLUMN_TYPE"); - ctrlResultSet.setReturnValue(1); - } - else { - mockResultSet.getString("COLUMN_NAME"); - ctrlResultSet.setReturnValue("newid"); - mockResultSet.getInt("COLUMN_TYPE"); - ctrlResultSet.setReturnValue(4); - } - mockResultSet.getInt("DATA_TYPE"); - ctrlResultSet.setReturnValue(4); - mockResultSet.getString("TYPE_NAME"); - ctrlResultSet.setReturnValue(null); - mockResultSet.getBoolean("NULLABLE"); - ctrlResultSet.setReturnValue(false); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); + private void initializeAddInvoiceWithMetaData(boolean isFunction) throws SQLException { + ResultSet proceduresResultSet = mock(ResultSet.class); + ResultSet procedureColumnsResultSet = mock(ResultSet.class); + given(databaseMetaData.getDatabaseProductName()).willReturn("Oracle"); + given(databaseMetaData.getUserName()).willReturn("ME"); + given(databaseMetaData.storesUpperCaseIdentifiers()).willReturn(true); + given(databaseMetaData.getProcedures("", "ME", "ADD_INVOICE")).willReturn(proceduresResultSet); + given(databaseMetaData.getProcedureColumns("", "ME", "ADD_INVOICE", null)).willReturn(procedureColumnsResultSet); - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("Oracle"); - mockDatabaseMetaData.getUserName(); - ctrlDatabaseMetaData.setReturnValue("ME"); - mockDatabaseMetaData.supportsCatalogsInProcedureCalls(); - ctrlDatabaseMetaData.setReturnValue(false); - mockDatabaseMetaData.supportsSchemasInProcedureCalls(); - ctrlDatabaseMetaData.setReturnValue(false); - mockDatabaseMetaData.storesUpperCaseIdentifiers(); - ctrlDatabaseMetaData.setReturnValue(true); - mockDatabaseMetaData.storesLowerCaseIdentifiers(); - ctrlDatabaseMetaData.setReturnValue(false); - mockDatabaseMetaData.getProcedures("", "ME", "ADD_INVOICE"); - ctrlDatabaseMetaData.setReturnValue(mockResultSet); - mockDatabaseMetaData.getProcedureColumns("", "ME", "ADD_INVOICE", null); - ctrlDatabaseMetaData.setReturnValue(mockResultSet); + given(proceduresResultSet.next()).willReturn(true, false); + given(proceduresResultSet.getString("PROCEDURE_NAME")).willReturn("add_invoice"); + given(procedureColumnsResultSet.next()).willReturn(true, true, true, false); + given(procedureColumnsResultSet.getInt("DATA_TYPE")).willReturn(4); if (isFunction) { - mockCallable.registerOutParameter(1, 4); - ctrlCallable.setVoidCallable(); - mockCallable.setObject(2, 1103, 4); - ctrlCallable.setVoidCallable(); - mockCallable.setObject(3, 3, 4); - ctrlCallable.setVoidCallable(); - } - else { - mockCallable.setObject(1, 1103, 4); - ctrlCallable.setVoidCallable(); - mockCallable.setObject(2, 3, 4); - ctrlCallable.setVoidCallable(); - mockCallable.registerOutParameter(3, 4); - ctrlCallable.setVoidCallable(); - } - mockCallable.execute(); - ctrlCallable.setReturnValue(false); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - if (isFunction) { - mockCallable.getObject(1); - ctrlCallable.setReturnValue(new Long(4)); + given(procedureColumnsResultSet.getString("COLUMN_NAME")).willReturn(null,"amount", "custid"); + given(procedureColumnsResultSet.getInt("COLUMN_TYPE")).willReturn(5, 1, 1); + given(connection.prepareCall("{? = call ADD_INVOICE(?, ?)}")).willReturn(callableStatement); + given(callableStatement.getObject(1)).willReturn(4L); } else { - mockCallable.getObject(3); - ctrlCallable.setReturnValue(new Long(4)); - } - if (debugEnabled) { - mockCallable.getWarnings(); - ctrlCallable.setReturnValue(null); + given(procedureColumnsResultSet.getString("COLUMN_NAME")).willReturn("amount", "custid", "newid"); + given(procedureColumnsResultSet.getInt("COLUMN_TYPE")).willReturn(1, 1, 4); + given(connection.prepareCall("{call ADD_INVOICE(?, ?, ?)}")).willReturn(callableStatement); + given(callableStatement.getObject(3)).willReturn(4L); } - mockCallable.close(); - ctrlCallable.setVoidCallable(); + given(callableStatement.getUpdateCount()).willReturn(-1); + } + private void verifyAddInvoiceWithMetaData(boolean isFunction) throws SQLException { + ResultSet proceduresResultSet = databaseMetaData.getProcedures("", "ME", "ADD_INVOICE"); + ResultSet procedureColumnsResultSet = databaseMetaData.getProcedureColumns("", "ME", "ADD_INVOICE", null); if (isFunction) { - mockConnection.prepareCall( - "{? = call ADD_INVOICE(?, ?)}"); - ctrlConnection.setReturnValue(mockCallable); + verify(callableStatement).registerOutParameter(1, 4); + verify(callableStatement).setObject(2, 1103, 4); + verify(callableStatement).setObject(3, 3, 4); } else { - mockConnection.prepareCall( - "{call ADD_INVOICE(?, ?, ?)}"); - ctrlConnection.setReturnValue(mockCallable); + verify(callableStatement).setObject(1, 1103, 4); + verify(callableStatement).setObject(2, 3, 4); + verify(callableStatement).registerOutParameter(3, 4); } - return ctrlResultSet; - } + verify(callableStatement).close(); + verify(proceduresResultSet).close(); + verify(procedureColumnsResultSet).close(); } +} diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java index 088e48f98a2..1c763595b61 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java @@ -16,105 +16,71 @@ package org.springframework.jdbc.core.simple; -import junit.framework.TestCase; -import org.easymock.MockControl; -import org.springframework.dao.InvalidDataAccessApiUsageException; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; -import javax.sql.DataSource; import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.ResultSet; import java.util.HashMap; +import javax.sql.DataSource; + +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.springframework.dao.InvalidDataAccessApiUsageException; + /** * Mock object based tests for SimpleJdbcInsert. * * @author Thomas Risberg */ -public class SimpleJdbcInsertTests extends TestCase { - - private MockControl ctrlDataSource; - private DataSource mockDataSource; - private MockControl ctrlConnection; - private Connection mockConnection; - private MockControl ctrlDatabaseMetaData; - private DatabaseMetaData mockDatabaseMetaData; - - @Override - protected void setUp() throws Exception { - super.setUp(); - - ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - - ctrlConnection = MockControl.createControl(Connection.class); - mockConnection = (Connection) ctrlConnection.getMock(); - mockConnection.getMetaData(); - ctrlConnection.setDefaultReturnValue(mockDatabaseMetaData); - mockConnection.close(); - ctrlConnection.setDefaultVoidCallable(); - - ctrlDataSource = MockControl.createControl(DataSource.class); - mockDataSource = (DataSource) ctrlDataSource.getMock(); - mockDataSource.getConnection(); - ctrlDataSource.setDefaultReturnValue(mockConnection); - - } - - @Override - protected void tearDown() throws Exception { - super.tearDown(); - ctrlDatabaseMetaData.verify(); - ctrlDataSource.verify(); +public class SimpleJdbcInsertTests { + + @Rule + public ExpectedException thrown = ExpectedException.none(); + + private Connection connection; + private DatabaseMetaData databaseMetaData; + private DataSource dataSource; + + @Before + public void setUp() throws Exception { + connection = mock(Connection.class); + databaseMetaData = mock(DatabaseMetaData.class); + dataSource = mock(DataSource.class); + given(connection.getMetaData()).willReturn(databaseMetaData); + given(dataSource.getConnection()).willReturn(connection); } - protected void replay() { - ctrlDatabaseMetaData.replay(); - ctrlConnection.replay(); - ctrlDataSource.replay(); + @After + public void verifyClosed() throws Exception { + verify(connection).close(); } + @Test public void testNoSuchTable() throws Exception { - final String NO_SUCH_TABLE = "x"; - final String USER = "me"; - - MockControl ctrlResultSet = MockControl.createControl(ResultSet.class); - ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock(); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("MyDB"); - mockDatabaseMetaData.supportsGetGeneratedKeys(); - ctrlDatabaseMetaData.setReturnValue(false); - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("MyDB"); - mockDatabaseMetaData.getDatabaseProductVersion(); - ctrlDatabaseMetaData.setReturnValue("1.0"); - mockDatabaseMetaData.getUserName(); - ctrlDatabaseMetaData.setReturnValue(USER); - mockDatabaseMetaData.storesUpperCaseIdentifiers(); - ctrlDatabaseMetaData.setReturnValue(false); - mockDatabaseMetaData.storesLowerCaseIdentifiers(); - ctrlDatabaseMetaData.setReturnValue(true); - mockDatabaseMetaData.getTables(null, null, NO_SUCH_TABLE, null); - ctrlDatabaseMetaData.setReturnValue(mockResultSet); - - ctrlResultSet.replay(); - replay(); - - SimpleJdbcInsert insert = new SimpleJdbcInsert(mockDataSource).withTableName(NO_SUCH_TABLE); + ResultSet resultSet = mock(ResultSet.class); + given(resultSet.next()).willReturn(false); + given(databaseMetaData.getDatabaseProductName()).willReturn("MyDB"); + given(databaseMetaData.getDatabaseProductName()).willReturn("MyDB"); + given(databaseMetaData.getDatabaseProductVersion()).willReturn("1.0"); + given(databaseMetaData.getUserName()).willReturn("me"); + given(databaseMetaData.storesLowerCaseIdentifiers()).willReturn(true); + given(databaseMetaData.getTables(null, null, "x", null)).willReturn(resultSet); + + SimpleJdbcInsert insert = new SimpleJdbcInsert(dataSource).withTableName("x"); + // Shouldn't succeed in inserting into table which doesn't exist + thrown.expect(InvalidDataAccessApiUsageException.class); try { - insert.execute(new HashMap()); - fail("Shouldn't succeed in inserting into table which doesn't exist"); - } catch (InvalidDataAccessApiUsageException ex) { - // OK + insert.execute(new HashMap()); + } + finally { + verify(resultSet).close(); } - } - - public void testInsert() throws Exception { - replay(); } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java index 8bfe278c63b..74a4a17c741 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java @@ -16,27 +16,32 @@ package org.springframework.jdbc.core.simple; -import java.lang.reflect.Method; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.sql.SQLException; import java.sql.Types; import java.util.ArrayList; -import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import javax.sql.DataSource; -import junit.framework.TestCase; -import org.apache.commons.logging.LogFactory; -import org.easymock.MockControl; -import org.easymock.internal.ArrayMatcher; +import javax.sql.DataSource; -import org.springframework.jdbc.core.BatchUpdateTestHelper; +import org.junit.Before; +import org.junit.Test; import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; @@ -49,567 +54,321 @@ import org.springframework.jdbc.core.namedparam.SqlParameterSource; * @author Juergen Hoeller * @author Thomas Risberg */ -public class SimpleJdbcTemplateTests extends TestCase { +public class SimpleJdbcTemplateTests { - private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled(); - - - public void testQueryForIntWithoutArgs() { - String sql = "SELECT COUNT(0) FROM BAR"; - int expectedResult = 666; + private static final String SQL = "sql"; - MockControl mc = MockControl.createControl(JdbcOperations.class); - JdbcOperations jo = (JdbcOperations) mc.getMock(); - jo.queryForInt(sql); - mc.setReturnValue(expectedResult); - mc.replay(); + private static final Object[] ARGS_ARRAY = { 24.7, "foo", new Object() }; + private static final Map ARGS_MAP; + private static final MapSqlParameterSource ARGS_SOURCE; - SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo); - - assertSame(jo, jth.getJdbcOperations()); + static { + ARGS_MAP = new HashMap(3); + ARGS_SOURCE = new MapSqlParameterSource(); + for (int i = 0; i < ARGS_ARRAY.length; i++) { + ARGS_MAP.put(String.valueOf(i), ARGS_ARRAY[i]); + ARGS_SOURCE.addValue(String.valueOf(i), ARGS_ARRAY[i]); + } + } - int result = jth.queryForInt(sql); - assertEquals(expectedResult, result); + private JdbcOperations operations; + private NamedParameterJdbcOperations namedParameterOperations; + private SimpleJdbcTemplate template; + private SimpleJdbcTemplate namedParameterTemplate; + + @Before + public void setup() { + this.operations = mock(JdbcOperations.class); + this.namedParameterOperations = mock(NamedParameterJdbcOperations.class); + this.template = new SimpleJdbcTemplate(operations); + this.namedParameterTemplate = new SimpleJdbcTemplate(namedParameterOperations); + } - mc.verify(); + @Test + public void testQueryForIntWithoutArgs() { + given(operations.queryForInt(SQL)).willReturn(666); + int result = template.queryForInt(SQL); + assertEquals(666, result); } + @Test public void testQueryForIntWithArgs() { - String sql = "SELECT COUNT(0) FROM BAR WHERE ID=? AND XY=?"; - int expectedResult = 666; - int arg1 = 24; - String arg2 = "foo"; - - MockControl mc = MockControl.createControl(JdbcOperations.class); - JdbcOperations jo = (JdbcOperations) mc.getMock(); - jo.queryForInt(sql, new Object[]{arg1, arg2}); - mc.setDefaultMatcher(new ArrayMatcher()); - mc.setReturnValue(expectedResult); - mc.replay(); - - SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo); - int result = jth.queryForInt(sql, arg1, arg2); - assertEquals(expectedResult, result); - mc.verify(); + given(operations.queryForInt(SQL, new Object[] { 24, "foo" })).willReturn(666); + int result = template.queryForInt(SQL, 24, "foo"); + assertEquals(666, result); } + @Test public void testQueryForIntWithMap() { - String sql = "SELECT COUNT(0) FROM BAR WHERE ID=:id AND XY=:xy"; - int expectedResult = 666; - int arg1 = 24; - String arg2 = "foo"; - - MockControl mc = MockControl.createControl(NamedParameterJdbcOperations.class); - NamedParameterJdbcOperations npjo = (NamedParameterJdbcOperations) mc.getMock(); Map args = new HashMap(2); - args.put("id", arg1); - args.put("xy", arg2); - npjo.queryForInt(sql, args); - mc.setDefaultMatcher(new ArrayMatcher()); - mc.setReturnValue(expectedResult); - mc.replay(); - - SimpleJdbcTemplate jth = new SimpleJdbcTemplate(npjo); - int result = jth.queryForInt(sql, args); - assertEquals(expectedResult, result); - mc.verify(); + args.put("id", 24); + args.put("xy", "foo"); + given(namedParameterOperations.queryForInt(SQL, args)).willReturn(666); + int result = namedParameterTemplate.queryForInt(SQL, args); + assertEquals(666, result); } + @Test public void testQueryForIntWitSqlParameterSource() { - String sql = "SELECT COUNT(0) FROM BAR WHERE ID=:id AND XY=:xy"; - int expectedResult = 666; - int arg1 = 24; - String arg2 = "foo"; - - MockControl mc = MockControl.createControl(NamedParameterJdbcOperations.class); - NamedParameterJdbcOperations npjo = (NamedParameterJdbcOperations) mc.getMock(); - SqlParameterSource args = new MapSqlParameterSource().addValue("id", arg1).addValue("xy", arg2); - npjo.queryForInt(sql, args); - mc.setDefaultMatcher(new ArrayMatcher()); - mc.setReturnValue(expectedResult); - mc.replay(); - - SimpleJdbcTemplate jth = new SimpleJdbcTemplate(npjo); - int result = jth.queryForInt(sql, args); - assertEquals(expectedResult, result); - mc.verify(); + SqlParameterSource args = new MapSqlParameterSource().addValue("id", 24).addValue("xy", "foo"); + given(namedParameterOperations.queryForInt(SQL, args)).willReturn(666); + int result = namedParameterTemplate.queryForInt(SQL, args); + assertEquals(666, result); } + @Test public void testQueryForLongWithoutArgs() { - String sql = "SELECT COUNT(0) FROM BAR"; - long expectedResult = 666; - - MockControl mc = MockControl.createControl(JdbcOperations.class); - JdbcOperations jo = (JdbcOperations) mc.getMock(); - jo.queryForLong(sql); - mc.setReturnValue(expectedResult); - mc.replay(); - - SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo); - long result = jth.queryForLong(sql); - assertEquals(expectedResult, result); - - mc.verify(); + given(operations.queryForLong(SQL)).willReturn((long) 666); + long result = template.queryForLong(SQL); + assertEquals(666, result); } + @Test public void testQueryForLongWithArgs() { - String sql = "SELECT COUNT(0) FROM BAR WHERE ID=? AND XY=?"; long expectedResult = 666; - double arg1 = 24.7; - String arg2 = "foo"; - Object arg3 = new Object(); - - MockControl mc = MockControl.createControl(JdbcOperations.class); - JdbcOperations jo = (JdbcOperations) mc.getMock(); - jo.queryForLong(sql, new Object[]{arg1, arg2, arg3}); - mc.setDefaultMatcher(new ArrayMatcher()); - mc.setReturnValue(expectedResult); - mc.replay(); - - SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo); - long result = jth.queryForLong(sql, arg1, arg2, arg3); + given(operations.queryForLong(SQL, ARGS_ARRAY)).willReturn(expectedResult); + long result = template.queryForLong(SQL, ARGS_ARRAY); assertEquals(expectedResult, result); - mc.verify(); } + @Test public void testQueryForObjectWithoutArgs() throws Exception { - String sql = "SELECT SYSDATE FROM DUAL"; Date expectedResult = new Date(); - - MockControl mc = MockControl.createControl(JdbcOperations.class); - JdbcOperations jo = (JdbcOperations) mc.getMock(); - jo.queryForObject(sql, Date.class); - mc.setReturnValue(expectedResult); - mc.replay(); - - SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo); - Date result = jth.queryForObject(sql, Date.class); - assertEquals(expectedResult, result); - mc.verify(); + given(operations.queryForObject(SQL, Date.class)).willReturn(expectedResult); + Date result = template.queryForObject(SQL, Date.class); + assertSame(expectedResult, result); } + @Test public void testQueryForObjectWithArgs() throws Exception { - String sql = "SELECT SOMEDATE FROM BAR WHERE ID=? AND XY=?"; Date expectedResult = new Date(); - double arg1 = 24.7; - String arg2 = "foo"; - Object arg3 = new Object(); - - MockControl mc = MockControl.createControl(JdbcOperations.class); - JdbcOperations jo = (JdbcOperations) mc.getMock(); - jo.queryForObject(sql, new Object[]{arg1, arg2, arg3}, Date.class); - mc.setDefaultMatcher(new ArrayMatcher()); - mc.setReturnValue(expectedResult); - mc.replay(); - - SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo); - Date result = jth.queryForObject(sql, Date.class, arg1, arg2, arg3); - assertEquals(expectedResult, result); - mc.verify(); + given(operations.queryForObject(SQL, ARGS_ARRAY, Date.class) + ).willReturn(expectedResult); + Date result = template.queryForObject(SQL, Date.class,ARGS_ARRAY); + assertSame(expectedResult, result); } + @Test public void testQueryForObjectWithArgArray() throws Exception { - String sql = "SELECT SOMEDATE FROM BAR WHERE ID=? AND XY=?"; Date expectedResult = new Date(); - double arg1 = 24.7; - String arg2 = "foo"; - Object arg3 = new Object(); - - MockControl mc = MockControl.createControl(JdbcOperations.class); - JdbcOperations jo = (JdbcOperations) mc.getMock(); - jo.queryForObject(sql, new Object[]{arg1, arg2, arg3}, Date.class); - mc.setDefaultMatcher(new ArrayMatcher()); - mc.setReturnValue(expectedResult); - mc.replay(); - - SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo); - Object args = new Object[] {arg1, arg2, arg3}; - Date result = jth.queryForObject(sql, Date.class, args); - assertEquals(expectedResult, result); - mc.verify(); + given(operations.queryForObject(SQL, ARGS_ARRAY, Date.class) + ).willReturn(expectedResult); + Date result = template.queryForObject(SQL, Date.class, ARGS_ARRAY); + assertSame(expectedResult, result); } + @Test public void testQueryForObjectWithMap() throws Exception { - String sql = "SELECT SOMEDATE FROM BAR WHERE ID=? AND XY=?"; Date expectedResult = new Date(); - double arg1 = 24.7; - String arg2 = "foo"; - Object arg3 = new Object(); - - MockControl mc = MockControl.createControl(JdbcOperations.class); - JdbcOperations jo = (JdbcOperations) mc.getMock(); - jo.queryForObject(sql, new Object[]{arg1, arg2, arg3}, Date.class); - mc.setDefaultMatcher(new ArrayMatcher()); - mc.setReturnValue(expectedResult); - mc.replay(); - - SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo); - Date result = jth.queryForObject(sql, Date.class, arg1, arg2, arg3); - assertEquals(expectedResult, result); - mc.verify(); + given(operations.queryForObject(SQL, ARGS_ARRAY, Date.class) + ).willReturn(expectedResult); + Date result = template.queryForObject(SQL, Date.class, ARGS_ARRAY); + assertSame(expectedResult, result); } + @Test public void testQueryForObjectWithRowMapperAndWithoutArgs() throws Exception { - String sql = "SELECT SYSDATE FROM DUAL"; Date expectedResult = new Date(); - ParameterizedRowMapper rm = new ParameterizedRowMapper() { @Override public Date mapRow(ResultSet rs, int rowNum) { return new Date(); } }; - - MockControl mc = MockControl.createControl(JdbcOperations.class); - JdbcOperations jo = (JdbcOperations) mc.getMock(); - jo.queryForObject(sql, rm); - mc.setReturnValue(expectedResult); - mc.replay(); - - SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo); - Date result = jth.queryForObject(sql, rm); - assertEquals(expectedResult, result); - mc.verify(); + given(operations.queryForObject(SQL, rm)).willReturn(expectedResult); + Date result = template.queryForObject(SQL, rm); + assertSame(expectedResult, result); } + @Test public void testQueryForObjectWithRowMapperAndArgs() throws Exception { - String sql = "SELECT SOMEDATE FROM BAR WHERE ID=? AND XY=?"; Date expectedResult = new Date(); - double arg1 = 24.7; - String arg2 = "foo"; - Object arg3 = new Object(); - ParameterizedRowMapper rm = new ParameterizedRowMapper() { @Override public Date mapRow(ResultSet rs, int rowNum) { return new Date(); } }; - - MockControl mc = MockControl.createControl(JdbcOperations.class); - JdbcOperations jo = (JdbcOperations) mc.getMock(); - jo.queryForObject(sql, new Object[]{arg1, arg2, arg3}, rm); - mc.setDefaultMatcher(new ArrayMatcher()); - mc.setReturnValue(expectedResult); - mc.replay(); - - SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo); - Date result = jth.queryForObject(sql, rm, arg1, arg2, arg3); - assertEquals(expectedResult, result); - mc.verify(); + given(operations.queryForObject(SQL, ARGS_ARRAY, rm) + ).willReturn(expectedResult); + Date result = template.queryForObject(SQL, rm, ARGS_ARRAY); + assertSame(expectedResult, result); } + @Test public void testQueryForObjectWithRowMapperAndMap() throws Exception { String sql = "SELECT SOMEDATE FROM BAR WHERE ID=? AND XY=?"; Date expectedResult = new Date(); - double arg1 = 24.7; - String arg2 = "foo"; - Object arg3 = new Object(); - ParameterizedRowMapper rm = new ParameterizedRowMapper() { @Override public Date mapRow(ResultSet rs, int rowNum) { return new Date(); } }; - - MockControl mc = MockControl.createControl(JdbcOperations.class); - JdbcOperations jo = (JdbcOperations) mc.getMock(); - jo.queryForObject(sql, new Object[]{arg1, arg2, arg3}, rm); - mc.setDefaultMatcher(new ArrayMatcher()); - mc.setReturnValue(expectedResult); - mc.replay(); - - SimpleJdbcTemplate jth = new SimpleJdbcTemplate(jo); - Date result = jth.queryForObject(sql, rm, arg1, arg2, arg3); - assertEquals(expectedResult, result); - mc.verify(); + given(operations.queryForObject(sql, ARGS_ARRAY, rm) + ).willReturn(expectedResult); + Date result = template.queryForObject(sql, rm, ARGS_ARRAY); + assertSame(expectedResult, result); } + @Test public void testQueryForListWithoutArgs() throws Exception { - testDelegation("queryForList", new Object[]{"sql"}, new Object[]{}, Collections.singletonList(new Object())); + List> expectedResult = mockListMapResult(); + given(operations.queryForList(SQL)).willReturn(expectedResult); + List> result = template.queryForList(SQL); + assertSame(expectedResult, result); } + @Test public void testQueryForListWithArgs() throws Exception { - testDelegation("queryForList", new Object[]{"sql"}, new Object[]{1, 2, 3}, new LinkedList()); + List> expectedResult = mockListMapResult(); + given(operations.queryForList(SQL, 1, 2, 3)).willReturn(expectedResult); + List> result = template.queryForList(SQL, 1,2,3); + assertSame(expectedResult, result); } + @Test public void testQueryForListWithMap() throws Exception { - HashMap args = new HashMap(3); - args.put("1", 1); - args.put("2", 2); - args.put("3", 3); - testDelegation("queryForList", new Object[]{"sql"}, new Object[]{args}, new LinkedList()); + List> expectedResult = mockListMapResult(); + given(namedParameterOperations.queryForList(SQL, ARGS_MAP)).willReturn(expectedResult); + List> result = namedParameterTemplate.queryForList(SQL, ARGS_MAP); + assertSame(expectedResult, result); } + @Test public void testQueryForListWithSqlParameterSource() throws Exception { - MapSqlParameterSource args = new MapSqlParameterSource(); - args.addValue("1", 1); - args.addValue("2", 2); - args.addValue("3", 3); - testDelegation("queryForList", new Object[]{"sql"}, new Object[]{args}, new LinkedList()); + List> expectedResult = mockListMapResult(); + given(namedParameterOperations.queryForList(SQL, ARGS_SOURCE)).willReturn(expectedResult); + List> result = namedParameterTemplate.queryForList(SQL, ARGS_SOURCE); + assertSame(expectedResult, result); } + @Test public void testQueryForMapWithoutArgs() throws Exception { - testDelegation("queryForMap", new Object[]{"sql"}, new Object[]{}, new HashMap()); + Map expectedResult = new HashMap(); + given(operations.queryForMap(SQL)).willReturn(expectedResult); + Map result = template.queryForMap(SQL); + assertSame(expectedResult, result); } + @Test public void testQueryForMapWithArgs() throws Exception { - testDelegation("queryForMap", new Object[]{"sql"}, new Object[]{1, 2, 3}, new HashMap()); - // TODO test generic type + Map expectedResult = new HashMap(); + given(operations.queryForMap(SQL, 1, 2, 3)).willReturn(expectedResult); + Map result = template.queryForMap(SQL, 1,2,3); + assertSame(expectedResult, result); } + @Test public void testQueryForMapWithMap() throws Exception { - HashMap args = new HashMap(3); - args.put("1", 1); - args.put("2", 2); - args.put("3", 3); - testDelegation("queryForMap", new Object[]{"sql"}, new Object[]{args}, new HashMap()); + Map expectedResult = new HashMap(); + given(namedParameterOperations.queryForMap(SQL, ARGS_MAP)).willReturn(expectedResult); + Map result = namedParameterTemplate.queryForMap(SQL, ARGS_MAP); + assertSame(expectedResult, result); } + @Test public void testQueryForMapWithSqlParameterSource() throws Exception { - MapSqlParameterSource args = new MapSqlParameterSource(); - args.addValue("1", 1); - args.addValue("2", 2); - args.addValue("3", 3); - testDelegation("queryForMap", new Object[]{"sql"}, new Object[]{args}, new HashMap()); + Map expectedResult = new HashMap(); + given(namedParameterOperations.queryForMap(SQL, ARGS_SOURCE)).willReturn(expectedResult); + Map result = namedParameterTemplate.queryForMap(SQL, ARGS_SOURCE); + assertSame(expectedResult, result); } + @Test public void testUpdateWithoutArgs() throws Exception { - testDelegation("update", new Object[]{"sql"}, new Object[]{}, 666); + given(operations.update(SQL)).willReturn(666); + int result = template.update(SQL); + assertEquals(666, result); } + @Test public void testUpdateWithArgs() throws Exception { - testDelegation("update", new Object[]{"sql"}, new Object[]{1, 2, 3}, 666); + given(operations.update(SQL, 1, 2, 3)).willReturn(666); + int result = template.update(SQL, 1, 2, 3); + assertEquals(666, result); } + @Test public void testUpdateWithMap() throws Exception { - HashMap args = new HashMap(3); - args.put("1", 1); - args.put("2", 2); - args.put("3", 3); - testDelegation("update", new Object[]{"sql"}, new Object[]{args}, 666); + given(namedParameterOperations.update(SQL, ARGS_MAP)).willReturn(666); + int result = namedParameterTemplate.update(SQL, ARGS_MAP); + assertEquals(666, result); } + @Test public void testUpdateWithSqlParameterSource() throws Exception { - MapSqlParameterSource args = new MapSqlParameterSource(); - args.addValue("1", 1); - args.addValue("2", 2); - args.addValue("3", 3); - testDelegation("update", new Object[]{"sql"}, new Object[]{args}, 666); - } - - private Object testDelegation(String methodName, Object[] typedArgs, Object[] varargs, Object expectedResult) throws Exception { - Class[] unifiedTypes; - Object[] unifiedArgs; - Class[] unifiedTypes2; - Object[] unifiedArgs2; - boolean namedParameters = false; - - if (varargs != null && varargs.length > 0) { - // Allow for Map - if (varargs[0].getClass().equals(HashMap.class)) { - unifiedTypes = new Class[typedArgs.length + 1]; - unifiedArgs = new Object[typedArgs.length + 1]; - for (int i = 0; i < typedArgs.length; i++) { - unifiedTypes[i] = typedArgs[i].getClass(); - unifiedArgs[i] = typedArgs[i]; - } - unifiedTypes[unifiedTypes.length - 1] = Map.class; - unifiedArgs[unifiedArgs.length - 1] = varargs[0]; - unifiedTypes2 = unifiedTypes; - unifiedArgs2 = unifiedArgs; - namedParameters = true; - } - else if (varargs[0].getClass().equals(MapSqlParameterSource.class)) { - unifiedTypes = new Class[typedArgs.length + 1]; - unifiedArgs = new Object[typedArgs.length + 1]; - for (int i = 0; i < typedArgs.length; i++) { - unifiedTypes[i] = typedArgs[i].getClass(); - unifiedArgs[i] = typedArgs[i]; - } - unifiedTypes[unifiedTypes.length - 1] = SqlParameterSource.class; - unifiedArgs[unifiedArgs.length - 1] = varargs[0]; - unifiedTypes2 = unifiedTypes; - unifiedArgs2 = unifiedArgs; - namedParameters = true; - } - else { - // Allow for varargs.length - unifiedTypes = new Class[typedArgs.length + 1]; - unifiedArgs = new Object[typedArgs.length + 1]; - for (int i = 0; i < unifiedTypes.length - 1; i++) { - unifiedTypes[i] = typedArgs[i].getClass(); - unifiedArgs[i] = typedArgs[i]; - } - unifiedTypes[unifiedTypes.length - 1] = Object[].class; - unifiedArgs[unifiedTypes.length - 1] = varargs; - } - - unifiedTypes2 = unifiedTypes; - unifiedArgs2 = unifiedArgs; - } - else { - unifiedTypes = new Class[typedArgs.length]; - unifiedTypes2 = new Class[typedArgs.length + 1]; - unifiedArgs = new Object[typedArgs.length]; - unifiedArgs2 = new Object[typedArgs.length + 1]; - for (int i = 0; i < typedArgs.length; i++) { - unifiedTypes[i] = unifiedTypes2[i] = typedArgs[i].getClass(); - unifiedArgs[i] = unifiedArgs2[i] = typedArgs[i]; - } - unifiedTypes2[unifiedTypes2.length - 1] = Object[].class; - unifiedArgs2[unifiedArgs2.length - 1] = new Object[]{}; - } - - MockControl mc; - JdbcOperations jo = null; - NamedParameterJdbcOperations npjo = null; - Method joMethod = null; - SimpleJdbcTemplate jth = null; - - if (namedParameters) { - mc = MockControl.createControl(NamedParameterJdbcOperations.class); - npjo = (NamedParameterJdbcOperations) mc.getMock(); - joMethod = NamedParameterJdbcOperations.class.getMethod(methodName, unifiedTypes); - joMethod.invoke(npjo, unifiedArgs); - jth = new SimpleJdbcTemplate(npjo); - } - else { - mc = MockControl.createControl(JdbcOperations.class); - jo = (JdbcOperations) mc.getMock(); - joMethod = JdbcOperations.class.getMethod(methodName, unifiedTypes); - joMethod.invoke(jo, unifiedArgs); - jth = new SimpleJdbcTemplate(jo); - } - - mc.setDefaultMatcher(new ArrayMatcher()); - - if (joMethod.getReturnType().isPrimitive()) { - // TODO bit of a hack with autoboxing passing up Integer when the return - // type is an int - mc.setReturnValue(((Integer) expectedResult).intValue()); - } - else { - mc.setReturnValue(expectedResult); - } - mc.replay(); - - Method jthMethod = SimpleJdbcTemplate.class.getMethod(methodName, unifiedTypes2); - Object result = jthMethod.invoke(jth, unifiedArgs2); - - assertEquals(expectedResult, result); - - mc.verify(); - - return result; + given(namedParameterOperations.update(SQL, ARGS_SOURCE)).willReturn(666); + int result = namedParameterTemplate.update(SQL, ARGS_SOURCE); + assertEquals(666, result); } + @Test public void testBatchUpdateWithSqlParameterSource() throws Exception { - - final String sqlToUse = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; - final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = :id"; + PreparedStatement preparedStatement = setupBatchOperation(); final SqlParameterSource[] ids = new SqlParameterSource[2]; ids[0] = new MapSqlParameterSource("id", 100); ids[1] = new MapSqlParameterSource("id", 200); - final int[] rowsAffected = new int[] { 1, 2 }; - - MockControl ctrlDataSource = MockControl.createControl(DataSource.class); - DataSource mockDataSource = (DataSource) ctrlDataSource.getMock(); - MockControl ctrlConnection = MockControl.createControl(Connection.class); - Connection mockConnection = (Connection) ctrlConnection.getMock(); - MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - - BatchUpdateTestHelper.prepareBatchUpdateMocks(sqlToUse, ids, null, rowsAffected, ctrlDataSource, mockDataSource, ctrlConnection, - mockConnection, ctrlPreparedStatement, mockPreparedStatement, ctrlDatabaseMetaData, - mockDatabaseMetaData); - - BatchUpdateTestHelper.replayBatchUpdateMocks(ctrlDataSource, ctrlConnection, ctrlPreparedStatement, ctrlDatabaseMetaData); - - JdbcTemplate template = new JdbcTemplate(mockDataSource, false); - SimpleJdbcTemplate simpleJdbcTemplate = new SimpleJdbcTemplate(template); - - int[] actualRowsAffected = simpleJdbcTemplate.batchUpdate(sql, ids); - + int[] actualRowsAffected = template.batchUpdate("UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = :id", ids); assertTrue("executed 2 updates", actualRowsAffected.length == 2); - assertEquals(rowsAffected[0], actualRowsAffected[0]); - assertEquals(rowsAffected[1], actualRowsAffected[1]); - - BatchUpdateTestHelper.verifyBatchUpdateMocks(ctrlPreparedStatement, ctrlDatabaseMetaData); + assertEquals(1, actualRowsAffected[0]); + assertEquals(2, actualRowsAffected[1]); + verify(preparedStatement).setObject(1, 100); + verify(preparedStatement).setObject(1, 200); + verify(preparedStatement, times(2)).addBatch(); + verify(preparedStatement).close(); } + @Test public void testBatchUpdateWithListOfObjectArrays() throws Exception { - - final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; - final List ids = new ArrayList(); - ids.add(new Object[] {100}); - ids.add(new Object[] {200}); - final int[] rowsAffected = new int[] { 1, 2 }; - - MockControl ctrlDataSource = MockControl.createControl(DataSource.class); - DataSource mockDataSource = (DataSource) ctrlDataSource.getMock(); - MockControl ctrlConnection = MockControl.createControl(Connection.class); - Connection mockConnection = (Connection) ctrlConnection.getMock(); - MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - - BatchUpdateTestHelper.prepareBatchUpdateMocks(sql, ids, null, rowsAffected, ctrlDataSource, mockDataSource, ctrlConnection, - mockConnection, ctrlPreparedStatement, mockPreparedStatement, ctrlDatabaseMetaData, - mockDatabaseMetaData); - - BatchUpdateTestHelper.replayBatchUpdateMocks(ctrlDataSource, ctrlConnection, ctrlPreparedStatement, ctrlDatabaseMetaData); - - JdbcTemplate template = new JdbcTemplate(mockDataSource, false); - SimpleJdbcTemplate simpleJdbcTemplate = new SimpleJdbcTemplate(template); - - int[] actualRowsAffected = simpleJdbcTemplate.batchUpdate(sql, ids); - + PreparedStatement preparedStatement = setupBatchOperation(); + List ids = new ArrayList(); + ids.add(new Object[] { 100 }); + ids.add(new Object[] { 200 }); + int[] actualRowsAffected = template.batchUpdate(SQL, ids); assertTrue("executed 2 updates", actualRowsAffected.length == 2); - assertEquals(rowsAffected[0], actualRowsAffected[0]); - assertEquals(rowsAffected[1], actualRowsAffected[1]); - - BatchUpdateTestHelper.verifyBatchUpdateMocks(ctrlPreparedStatement, ctrlDatabaseMetaData); + assertEquals(1, actualRowsAffected[0]); + assertEquals(2, actualRowsAffected[1]); + verify(preparedStatement).setObject(1, 100); + verify(preparedStatement).setObject(1, 200); + verify(preparedStatement, times(2)).addBatch(); + verify(preparedStatement).close(); } + @Test public void testBatchUpdateWithListOfObjectArraysPlusTypeInfo() throws Exception { - - final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?"; - final List ids = new ArrayList(); - ids.add(new Object[] {100}); - ids.add(new Object[] {200}); - final int[] sqlTypes = new int[] {Types.NUMERIC}; - final int[] rowsAffected = new int[] { 1, 2 }; - - MockControl ctrlDataSource = MockControl.createControl(DataSource.class); - DataSource mockDataSource = (DataSource) ctrlDataSource.getMock(); - MockControl ctrlConnection = MockControl.createControl(Connection.class); - Connection mockConnection = (Connection) ctrlConnection.getMock(); - MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - - BatchUpdateTestHelper.prepareBatchUpdateMocks(sql, ids, sqlTypes, rowsAffected, ctrlDataSource, mockDataSource, ctrlConnection, - mockConnection, ctrlPreparedStatement, mockPreparedStatement, ctrlDatabaseMetaData, - mockDatabaseMetaData); - - BatchUpdateTestHelper.replayBatchUpdateMocks(ctrlDataSource, ctrlConnection, ctrlPreparedStatement, ctrlDatabaseMetaData); - - JdbcTemplate template = new JdbcTemplate(mockDataSource, false); - SimpleJdbcTemplate simpleJdbcTemplate = new SimpleJdbcTemplate(template); - - int[] actualRowsAffected = simpleJdbcTemplate.batchUpdate(sql, ids, sqlTypes); - + int[] sqlTypes = new int[] { Types.NUMERIC }; + PreparedStatement preparedStatement = setupBatchOperation(); + List ids = new ArrayList(); + ids.add(new Object[] { 100 }); + ids.add(new Object[] { 200 }); + int[] actualRowsAffected = template.batchUpdate(SQL, ids, sqlTypes); assertTrue("executed 2 updates", actualRowsAffected.length == 2); - assertEquals(rowsAffected[0], actualRowsAffected[0]); - assertEquals(rowsAffected[1], actualRowsAffected[1]); + assertEquals(1, actualRowsAffected[0]); + assertEquals(2, actualRowsAffected[1]); + verify(preparedStatement).setObject(1, 100, Types.NUMERIC); + verify(preparedStatement).setObject(1, 200, Types.NUMERIC); + verify(preparedStatement, times(2)).addBatch(); + verify(preparedStatement).close(); + } - BatchUpdateTestHelper.verifyBatchUpdateMocks(ctrlPreparedStatement, ctrlDatabaseMetaData); + private PreparedStatement setupBatchOperation() throws SQLException { + DataSource dataSource = mock(DataSource.class); + Connection connection = mock(Connection.class); + PreparedStatement preparedStatement = mock(PreparedStatement.class); + DatabaseMetaData databaseMetaData = mock(DatabaseMetaData.class); + given(dataSource.getConnection()).willReturn(connection); + given(preparedStatement.getConnection()).willReturn(connection); + given(preparedStatement.executeBatch()).willReturn(new int[] { 1, 2 }); + given(databaseMetaData.getDatabaseProductName()).willReturn("MySQL"); + given(databaseMetaData.supportsBatchUpdates()).willReturn(true); + given(connection.prepareStatement(anyString())).willReturn(preparedStatement); + given(connection.getMetaData()).willReturn(databaseMetaData); + template = new SimpleJdbcTemplate(new JdbcTemplate(dataSource, false)); + return preparedStatement; } + private List> mockListMapResult() { + return new LinkedList>(); + } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java index f9eb8828733..a6d22145b91 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java @@ -1,151 +1,81 @@ package org.springframework.jdbc.core.simple; -import junit.framework.TestCase; -import org.springframework.jdbc.core.metadata.TableMetaDataContext; -import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; -import org.springframework.jdbc.core.SqlParameterValue; -import org.easymock.MockControl; +import static org.junit.Assert.*; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; -import javax.sql.DataSource; -import java.util.Date; -import java.util.List; -import java.util.ArrayList; -import java.sql.Types; -import java.sql.DatabaseMetaData; import java.sql.Connection; +import java.sql.DatabaseMetaData; import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Types; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import javax.sql.DataSource; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.jdbc.core.SqlParameterValue; +import org.springframework.jdbc.core.metadata.TableMetaDataContext; +import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; /** * Mock object based tests for TableMetaDataContext. * * @author Thomas Risberg */ -public class TableMetaDataContextTests extends TestCase { - private MockControl ctrlDataSource; - private DataSource mockDataSource; - private MockControl ctrlConnection; - private Connection mockConnection; - private MockControl ctrlDatabaseMetaData; - private DatabaseMetaData mockDatabaseMetaData; - - private TableMetaDataContext context = new TableMetaDataContext(); - - @Override - protected void setUp() throws Exception { - super.setUp(); - - ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); +public class TableMetaDataContextTests { - ctrlConnection = MockControl.createControl(Connection.class); - mockConnection = (Connection) ctrlConnection.getMock(); - mockConnection.getMetaData(); - ctrlConnection.setDefaultReturnValue(mockDatabaseMetaData); - mockConnection.close(); - ctrlConnection.setDefaultVoidCallable(); + private Connection connection; + private DataSource dataSource; + private DatabaseMetaData databaseMetaData; - ctrlDataSource = MockControl.createControl(DataSource.class); - mockDataSource = (DataSource) ctrlDataSource.getMock(); - mockDataSource.getConnection(); - ctrlDataSource.setDefaultReturnValue(mockConnection); - - } + private TableMetaDataContext context = new TableMetaDataContext(); - @Override - protected void tearDown() throws Exception { - super.tearDown(); - ctrlDatabaseMetaData.verify(); - ctrlDataSource.verify(); + @Before + public void setUp() throws Exception { + connection = mock(Connection.class); + dataSource = mock(DataSource.class); + databaseMetaData = mock(DatabaseMetaData.class); + given(connection.getMetaData()).willReturn(databaseMetaData); + given(dataSource.getConnection()).willReturn(connection); } - protected void replay() { - ctrlDatabaseMetaData.replay(); - ctrlConnection.replay(); - ctrlDataSource.replay(); + public void verifyClosed() throws Exception { + verify(connection).close(); } + @Test public void testMatchInParametersAndSqlTypeInfoWrapping() throws Exception { final String TABLE = "customers"; final String USER = "me"; - MockControl ctrlMetaDataResultSet = MockControl.createControl(ResultSet.class); - ResultSet mockMetaDataResultSet = (ResultSet) ctrlMetaDataResultSet.getMock(); - mockMetaDataResultSet.next(); - ctrlMetaDataResultSet.setReturnValue(true); - mockMetaDataResultSet.getString("TABLE_CAT"); - ctrlMetaDataResultSet.setReturnValue(null); - mockMetaDataResultSet.getString("TABLE_SCHEM"); - ctrlMetaDataResultSet.setReturnValue(USER); - mockMetaDataResultSet.getString("TABLE_NAME"); - ctrlMetaDataResultSet.setReturnValue(TABLE); - mockMetaDataResultSet.getString("TABLE_TYPE"); - ctrlMetaDataResultSet.setReturnValue("TABLE"); - mockMetaDataResultSet.next(); - ctrlMetaDataResultSet.setReturnValue(false); - mockMetaDataResultSet.close(); - ctrlMetaDataResultSet.setVoidCallable(); - - MockControl ctrlColumnsResultSet = MockControl.createControl(ResultSet.class); - ResultSet mockColumnsResultSet = (ResultSet) ctrlColumnsResultSet.getMock(); - mockColumnsResultSet.next(); - ctrlColumnsResultSet.setReturnValue(true); - mockColumnsResultSet.getString("COLUMN_NAME"); - ctrlColumnsResultSet.setReturnValue("id"); - mockColumnsResultSet.getInt("DATA_TYPE"); - ctrlColumnsResultSet.setReturnValue(Types.INTEGER); - mockColumnsResultSet.getBoolean("NULLABLE"); - ctrlColumnsResultSet.setReturnValue(false); - mockColumnsResultSet.next(); - ctrlColumnsResultSet.setReturnValue(true); - mockColumnsResultSet.getString("COLUMN_NAME"); - ctrlColumnsResultSet.setReturnValue("name"); - mockColumnsResultSet.getInt("DATA_TYPE"); - ctrlColumnsResultSet.setReturnValue(Types.VARCHAR); - mockColumnsResultSet.getBoolean("NULLABLE"); - ctrlColumnsResultSet.setReturnValue(true); - mockColumnsResultSet.next(); - ctrlColumnsResultSet.setReturnValue(true); - mockColumnsResultSet.getString("COLUMN_NAME"); - ctrlColumnsResultSet.setReturnValue("customersince"); - mockColumnsResultSet.getInt("DATA_TYPE"); - ctrlColumnsResultSet.setReturnValue(Types.DATE); - mockColumnsResultSet.getBoolean("NULLABLE"); - ctrlColumnsResultSet.setReturnValue(true); - mockColumnsResultSet.next(); - ctrlColumnsResultSet.setReturnValue(true); - mockColumnsResultSet.getString("COLUMN_NAME"); - ctrlColumnsResultSet.setReturnValue("version"); - mockColumnsResultSet.getInt("DATA_TYPE"); - ctrlColumnsResultSet.setReturnValue(Types.NUMERIC); - mockColumnsResultSet.getBoolean("NULLABLE"); - ctrlColumnsResultSet.setReturnValue(false); - mockColumnsResultSet.next(); - ctrlColumnsResultSet.setReturnValue(false); - mockColumnsResultSet.close(); - ctrlColumnsResultSet.setVoidCallable(); - - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("MyDB"); - mockDatabaseMetaData.supportsGetGeneratedKeys(); - ctrlDatabaseMetaData.setReturnValue(false); - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("MyDB"); - mockDatabaseMetaData.getDatabaseProductVersion(); - ctrlDatabaseMetaData.setReturnValue("1.0"); - mockDatabaseMetaData.getUserName(); - ctrlDatabaseMetaData.setReturnValue(USER); - mockDatabaseMetaData.storesUpperCaseIdentifiers(); - ctrlDatabaseMetaData.setReturnValue(false); - mockDatabaseMetaData.storesLowerCaseIdentifiers(); - ctrlDatabaseMetaData.setReturnValue(true); - mockDatabaseMetaData.getTables(null, null, TABLE, null); - ctrlDatabaseMetaData.setReturnValue(mockMetaDataResultSet); - mockDatabaseMetaData.getColumns(null, USER, TABLE, null); - ctrlDatabaseMetaData.setReturnValue(mockColumnsResultSet); - - ctrlMetaDataResultSet.replay(); - ctrlColumnsResultSet.replay(); - replay(); + ResultSet metaDataResultSet = mock(ResultSet.class); + given(metaDataResultSet.next()).willReturn(true, false); + given(metaDataResultSet.getString("TABLE_SCHEM")).willReturn(USER); + given(metaDataResultSet.getString("TABLE_NAME")).willReturn(TABLE); + given(metaDataResultSet.getString("TABLE_TYPE")).willReturn("TABLE"); + + ResultSet columnsResultSet = mock(ResultSet.class); + given(columnsResultSet.next()).willReturn( + true, true, true, true, false); + given(columnsResultSet.getString("COLUMN_NAME")).willReturn( + "id", "name", "customersince", "version"); + given(columnsResultSet.getInt("DATA_TYPE")).willReturn( + Types.INTEGER, Types.VARCHAR, Types.DATE, Types.NUMERIC); + given(columnsResultSet.getBoolean("NULLABLE")).willReturn( + false, true, true, false); + + given(databaseMetaData.getDatabaseProductName()).willReturn("MyDB"); + given(databaseMetaData.getDatabaseProductName()).willReturn("1.0"); + given(databaseMetaData.getUserName()).willReturn(USER); + given(databaseMetaData.storesLowerCaseIdentifiers()).willReturn(true); + given(databaseMetaData.getTables(null, null, TABLE, null)).willReturn(metaDataResultSet); + given(databaseMetaData.getColumns(null, USER, TABLE, null)).willReturn(columnsResultSet); MapSqlParameterSource map = new MapSqlParameterSource(); map.addValue("id", 1); @@ -156,88 +86,59 @@ public class TableMetaDataContextTests extends TestCase { map.registerSqlType("version", Types.NUMERIC); context.setTableName(TABLE); - context.processMetaData(mockDataSource, new ArrayList(), new String[] {}); + context.processMetaData(dataSource, new ArrayList(), new String[] {}); List values = context.matchInParameterValuesWithInsertColumns(map); assertEquals("wrong number of parameters: ", 4, values.size()); assertTrue("id not wrapped with type info", values.get(0) instanceof Number); assertTrue("name not wrapped with type info", values.get(1) instanceof String); - assertTrue("date wrapped with type info", values.get(2) instanceof SqlParameterValue); - assertTrue("version wrapped with type info", values.get(3) instanceof SqlParameterValue); + assertTrue("date wrapped with type info", + values.get(2) instanceof SqlParameterValue); + assertTrue("version wrapped with type info", + values.get(3) instanceof SqlParameterValue); + verify(metaDataResultSet, atLeastOnce()).next(); + verify(columnsResultSet, atLeastOnce()).next(); + verify(metaDataResultSet).close(); + verify(columnsResultSet).close(); } + @Test public void testTableWithSingleColumnGeneratedKey() throws Exception { final String TABLE = "customers"; final String USER = "me"; - MockControl ctrlMetaDataResultSet = MockControl.createControl(ResultSet.class); - ResultSet mockMetaDataResultSet = (ResultSet) ctrlMetaDataResultSet.getMock(); - mockMetaDataResultSet.next(); - ctrlMetaDataResultSet.setReturnValue(true); - mockMetaDataResultSet.getString("TABLE_CAT"); - ctrlMetaDataResultSet.setReturnValue(null); - mockMetaDataResultSet.getString("TABLE_SCHEM"); - ctrlMetaDataResultSet.setReturnValue(USER); - mockMetaDataResultSet.getString("TABLE_NAME"); - ctrlMetaDataResultSet.setReturnValue(TABLE); - mockMetaDataResultSet.getString("TABLE_TYPE"); - ctrlMetaDataResultSet.setReturnValue("TABLE"); - mockMetaDataResultSet.next(); - ctrlMetaDataResultSet.setReturnValue(false); - mockMetaDataResultSet.close(); - ctrlMetaDataResultSet.setVoidCallable(); - - MockControl ctrlColumnsResultSet = MockControl.createControl(ResultSet.class); - ResultSet mockColumnsResultSet = (ResultSet) ctrlColumnsResultSet.getMock(); - mockColumnsResultSet.next(); - ctrlColumnsResultSet.setReturnValue(true); - mockColumnsResultSet.getString("COLUMN_NAME"); - ctrlColumnsResultSet.setReturnValue("id"); - mockColumnsResultSet.getInt("DATA_TYPE"); - ctrlColumnsResultSet.setReturnValue(Types.INTEGER); - mockColumnsResultSet.getBoolean("NULLABLE"); - ctrlColumnsResultSet.setReturnValue(false); - mockColumnsResultSet.next(); - ctrlColumnsResultSet.setReturnValue(false); - mockColumnsResultSet.close(); - ctrlColumnsResultSet.setVoidCallable(); - - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("MyDB"); - mockDatabaseMetaData.supportsGetGeneratedKeys(); - ctrlDatabaseMetaData.setReturnValue(false); - mockDatabaseMetaData.getDatabaseProductName(); - ctrlDatabaseMetaData.setReturnValue("MyDB"); - mockDatabaseMetaData.getDatabaseProductVersion(); - ctrlDatabaseMetaData.setReturnValue("1.0"); - mockDatabaseMetaData.getUserName(); - ctrlDatabaseMetaData.setReturnValue(USER); - mockDatabaseMetaData.storesUpperCaseIdentifiers(); - ctrlDatabaseMetaData.setReturnValue(false); - mockDatabaseMetaData.storesLowerCaseIdentifiers(); - ctrlDatabaseMetaData.setReturnValue(true); - mockDatabaseMetaData.getTables(null, null, TABLE, null); - ctrlDatabaseMetaData.setReturnValue(mockMetaDataResultSet); - mockDatabaseMetaData.getColumns(null, USER, TABLE, null); - ctrlDatabaseMetaData.setReturnValue(mockColumnsResultSet); - - ctrlMetaDataResultSet.replay(); - ctrlColumnsResultSet.replay(); - replay(); + ResultSet metaDataResultSet = mock(ResultSet.class); + given(metaDataResultSet.next()).willReturn(true, false); + given(metaDataResultSet.getString("TABLE_SCHEM")).willReturn(USER); + given(metaDataResultSet.getString("TABLE_NAME")).willReturn(TABLE); + given(metaDataResultSet.getString("TABLE_TYPE")).willReturn("TABLE"); + + ResultSet columnsResultSet = mock(ResultSet.class); + given(columnsResultSet.next()).willReturn(true, false); + given(columnsResultSet.getString("COLUMN_NAME")).willReturn("id"); + given(columnsResultSet.getInt("DATA_TYPE")).willReturn(Types.INTEGER); + given(columnsResultSet.getBoolean("NULLABLE")).willReturn(false); + + given(databaseMetaData.getDatabaseProductName()).willReturn("MyDB"); + given(databaseMetaData.getDatabaseProductName()).willReturn("1.0"); + given(databaseMetaData.getUserName()).willReturn(USER); + given(databaseMetaData.storesLowerCaseIdentifiers()).willReturn(true); + given(databaseMetaData.getTables(null, null, TABLE, null)).willReturn(metaDataResultSet); + given(databaseMetaData.getColumns(null, USER, TABLE, null)).willReturn(columnsResultSet); MapSqlParameterSource map = new MapSqlParameterSource(); - - String[] keyCols = new String[] {"id"}; - + String[] keyCols = new String[] { "id" }; context.setTableName(TABLE); - context.processMetaData(mockDataSource, new ArrayList(), keyCols); - + context.processMetaData(dataSource, new ArrayList(), keyCols); List values = context.matchInParameterValuesWithInsertColumns(map); - String insertString = context.createInsertString(keyCols); assertEquals("wrong number of parameters: ", 0, values.size()); assertEquals("empty insert not generated correctly", "INSERT INTO customers () VALUES()", insertString); + verify(metaDataResultSet, atLeastOnce()).next(); + verify(columnsResultSet, atLeastOnce()).next(); + verify(metaDataResultSet).close(); + verify(columnsResultSet).close(); } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java index 16f620942cb..c661c794211 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java @@ -16,72 +16,53 @@ package org.springframework.jdbc.core.support; +import static org.junit.Assert.assertEquals; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + +import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; -import org.easymock.MockControl; -import org.apache.commons.logging.LogFactory; +import javax.sql.DataSource; +import org.junit.Test; import org.springframework.beans.TestBean; import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.jdbc.AbstractJdbcTests; -import org.springframework.jdbc.core.JdbcTemplate; /** * @author Rod Johnson */ -public class JdbcBeanDefinitionReaderTests extends AbstractJdbcTests { - - private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled(); - +public class JdbcBeanDefinitionReaderTests { + @Test public void testValid() throws Exception { String sql = "SELECT NAME AS NAME, PROPERTY AS PROPERTY, VALUE AS VALUE FROM T"; - MockControl ctrlResultSet = MockControl.createControl(ResultSet.class); - ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock(); - ctrlResultSet.expectAndReturn(mockResultSet.next(), true, 2); - ctrlResultSet.expectAndReturn(mockResultSet.next(), false); - - // first row - ctrlResultSet.expectAndReturn(mockResultSet.getString(1), "one"); - ctrlResultSet.expectAndReturn(mockResultSet.getString(2), "(class)"); - ctrlResultSet.expectAndReturn(mockResultSet.getString(3), "org.springframework.beans.TestBean"); + Connection connection = mock(Connection.class); + DataSource dataSource = mock(DataSource.class); + given(dataSource.getConnection()).willReturn(connection); - // second row - ctrlResultSet.expectAndReturn(mockResultSet.getString(1), "one"); - ctrlResultSet.expectAndReturn(mockResultSet.getString(2), "age"); - ctrlResultSet.expectAndReturn(mockResultSet.getString(3), "53"); + ResultSet resultSet = mock(ResultSet.class); + given(resultSet.next()).willReturn(true, true, false); + given(resultSet.getString(1)).willReturn("one", "one"); + given(resultSet.getString(2)).willReturn("(class)", "age"); + given(resultSet.getString(3)).willReturn("org.springframework.beans.TestBean", "53"); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - MockControl ctrlStatement = MockControl.createControl(Statement.class); - Statement mockStatement = (Statement) ctrlStatement.getMock(); - ctrlStatement.expectAndReturn(mockStatement.executeQuery(sql), mockResultSet); - if (debugEnabled) { - ctrlStatement.expectAndReturn(mockStatement.getWarnings(), null); - } - mockStatement.close(); - ctrlStatement.setVoidCallable(); - - mockConnection.createStatement(); - ctrlConnection.setReturnValue(mockStatement); - - ctrlResultSet.replay(); - ctrlStatement.replay(); - replay(); + Statement statement = mock(Statement.class); + given(statement.executeQuery(sql)).willReturn(resultSet); + given(connection.createStatement()).willReturn(statement); DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); JdbcBeanDefinitionReader reader = new JdbcBeanDefinitionReader(bf); - reader.setDataSource(mockDataSource); + reader.setDataSource(dataSource); reader.loadBeanDefinitions(sql); assertEquals("Incorrect number of bean definitions", 1, bf.getBeanDefinitionCount()); TestBean tb = (TestBean) bf.getBean("one"); assertEquals("Age in TestBean was wrong.", 53, tb.getAge()); - ctrlResultSet.verify(); - ctrlStatement.verify(); + verify(resultSet).close(); + verify(statement).close(); } - } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java index 76034050ef3..daae639f03d 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java @@ -16,26 +16,27 @@ package org.springframework.jdbc.core.support; +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.mock; + import java.util.ArrayList; import java.util.List; import javax.sql.DataSource; -import junit.framework.TestCase; -import org.easymock.MockControl; - +import org.junit.Test; import org.springframework.jdbc.core.JdbcTemplate; /** * @author Juergen Hoeller * @since 30.07.2003 */ -public class JdbcDaoSupportTests extends TestCase { +public class JdbcDaoSupportTests { + @Test public void testJdbcDaoSupportWithDataSource() throws Exception { - MockControl dsControl = MockControl.createControl(DataSource.class); - DataSource ds = (DataSource) dsControl.getMock(); - final List test = new ArrayList(); + DataSource ds = mock(DataSource.class); + final List test = new ArrayList(); JdbcDaoSupport dao = new JdbcDaoSupport() { @Override protected void initDao() { @@ -49,9 +50,10 @@ public class JdbcDaoSupportTests extends TestCase { assertEquals("initDao called", test.size(), 1); } + @Test public void testJdbcDaoSupportWithJdbcTemplate() throws Exception { JdbcTemplate template = new JdbcTemplate(); - final List test = new ArrayList(); + final List test = new ArrayList(); JdbcDaoSupport dao = new JdbcDaoSupport() { @Override protected void initDao() { diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java index 02cafbb1989..f082720f841 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java @@ -16,14 +16,20 @@ package org.springframework.jdbc.core.support; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + import java.io.IOException; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import junit.framework.TestCase; -import org.easymock.MockControl; - +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; import org.springframework.dao.DataAccessException; import org.springframework.dao.IncorrectResultSizeDataAccessException; import org.springframework.jdbc.LobRetrievalFailureException; @@ -33,32 +39,19 @@ import org.springframework.jdbc.support.lob.LobHandler; /** * @author Alef Arendsen */ -public class LobSupportTests extends TestCase { - - public void testCreatingPreparedStatementCallback() throws SQLException { - // - return value should match - // - lob creator should be closed - // - set return value should be called - // - execute update should be called - - MockControl lobHandlerControl = MockControl.createControl(LobHandler.class); - LobHandler handler = (LobHandler)lobHandlerControl.getMock(); +public class LobSupportTests { - MockControl lobCreatorControl = MockControl.createControl(LobCreator.class); - LobCreator creator = (LobCreator)lobCreatorControl.getMock(); + @Rule + public ExpectedException thrown = ExpectedException.none(); - MockControl psControl = MockControl.createControl(PreparedStatement.class); - PreparedStatement ps = (PreparedStatement)psControl.getMock(); - - handler.getLobCreator(); - lobHandlerControl.setReturnValue(creator); - ps.executeUpdate(); - psControl.setReturnValue(3); - creator.close(); + @Test + public void testCreatingPreparedStatementCallback() throws SQLException { + LobHandler handler = mock(LobHandler.class); + LobCreator creator = mock(LobCreator.class); + PreparedStatement ps = mock(PreparedStatement.class); - lobHandlerControl.replay(); - lobCreatorControl.replay(); - psControl.replay(); + given(handler.getLobCreator()).willReturn(creator); + given(ps.executeUpdate()).willReturn(3); class SetValuesCalled { boolean b = false; @@ -66,9 +59,8 @@ public class LobSupportTests extends TestCase { final SetValuesCalled svc = new SetValuesCalled(); - AbstractLobCreatingPreparedStatementCallback psc = - new AbstractLobCreatingPreparedStatementCallback(handler) { - + AbstractLobCreatingPreparedStatementCallback psc = new AbstractLobCreatingPreparedStatementCallback( + handler) { @Override protected void setValues(PreparedStatement ps, LobCreator lobCreator) throws SQLException, DataAccessException { @@ -77,85 +69,62 @@ public class LobSupportTests extends TestCase { }; assertEquals(new Integer(3), psc.doInPreparedStatement(ps)); - - lobHandlerControl.verify(); - lobCreatorControl.verify(); - psControl.verify(); assertTrue(svc.b); + verify(creator).close(); + verify(handler).getLobCreator(); + verify(ps).executeUpdate(); } + @Test public void testAbstractLobStreamingResultSetExtractorNoRows() throws SQLException { - MockControl rsetControl = MockControl.createControl(ResultSet.class); - ResultSet rset = (ResultSet)rsetControl.getMock(); - rset.next(); - rsetControl.setReturnValue(false); - rsetControl.replay(); - + ResultSet rset = mock(ResultSet.class); AbstractLobStreamingResultSetExtractor lobRse = getResultSetExtractor(false); + thrown.expect(IncorrectResultSizeDataAccessException.class); try { lobRse.extractData(rset); - fail("IncorrectResultSizeDataAccessException should have been thrown"); - } catch (IncorrectResultSizeDataAccessException e) { - // expected + } + finally { + verify(rset).next(); } } + @Test public void testAbstractLobStreamingResultSetExtractorOneRow() throws SQLException { - MockControl rsetControl = MockControl.createControl(ResultSet.class); - ResultSet rset = (ResultSet)rsetControl.getMock(); - rset.next(); - rsetControl.setReturnValue(true); - // see if it's called - rset.clearWarnings(); - rset.next(); - rsetControl.setReturnValue(false); - rsetControl.replay(); - + ResultSet rset = mock(ResultSet.class); + given(rset.next()).willReturn(true, false); AbstractLobStreamingResultSetExtractor lobRse = getResultSetExtractor(false); lobRse.extractData(rset); - rsetControl.verify(); + verify(rset).clearWarnings(); } - public void testAbstractLobStreamingResultSetExtractorMultipleRows() throws SQLException { - MockControl rsetControl = MockControl.createControl(ResultSet.class); - ResultSet rset = (ResultSet)rsetControl.getMock(); - rset.next(); - rsetControl.setReturnValue(true); - // see if it's called - rset.clearWarnings(); - rset.next(); - rsetControl.setReturnValue(true); - rsetControl.replay(); - + @Test + public void testAbstractLobStreamingResultSetExtractorMultipleRows() + throws SQLException { + ResultSet rset = mock(ResultSet.class); + given(rset.next()).willReturn(true, true, false); AbstractLobStreamingResultSetExtractor lobRse = getResultSetExtractor(false); + thrown.expect(IncorrectResultSizeDataAccessException.class); try { lobRse.extractData(rset); - fail("IncorrectResultSizeDataAccessException should have been thrown"); - } catch (IncorrectResultSizeDataAccessException e) { - // expected } - rsetControl.verify(); + finally { + verify(rset).clearWarnings(); + } } - public void testAbstractLobStreamingResultSetExtractorCorrectException() throws SQLException { - MockControl rsetControl = MockControl.createControl(ResultSet.class); - ResultSet rset = (ResultSet)rsetControl.getMock(); - rset.next(); - rsetControl.setReturnValue(true); - rsetControl.replay(); - + @Test + public void testAbstractLobStreamingResultSetExtractorCorrectException() + throws SQLException { + ResultSet rset = mock(ResultSet.class); + given(rset.next()).willReturn(true); AbstractLobStreamingResultSetExtractor lobRse = getResultSetExtractor(true); - try { - lobRse.extractData(rset); - fail("LobRetrievalFailureException should have been thrown"); - } catch (LobRetrievalFailureException e) { - // expected - } - rsetControl.verify(); + thrown.expect(LobRetrievalFailureException.class); + lobRse.extractData(rset); } private AbstractLobStreamingResultSetExtractor getResultSetExtractor(final boolean ex) { AbstractLobStreamingResultSetExtractor lobRse = new AbstractLobStreamingResultSetExtractor() { + @Override protected void streamData(ResultSet rs) throws SQLException, IOException { if (ex) { diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java index 65e5b3f9a83..513c702bfd5 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java @@ -15,18 +15,28 @@ */ package org.springframework.jdbc.core.support; +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; +import static org.mockito.BDDMockito.given; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + import java.io.ByteArrayInputStream; +import java.io.InputStream; import java.io.InputStreamReader; import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Types; -import java.util.Arrays; -import java.util.Date; - -import junit.framework.TestCase; -import org.easymock.ArgumentsMatcher; -import org.easymock.MockControl; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; +import org.mockito.MockitoAnnotations; import org.springframework.jdbc.support.lob.LobCreator; import org.springframework.jdbc.support.lob.LobHandler; @@ -46,179 +56,96 @@ import org.springframework.jdbc.support.lob.LobHandler; * * @author Alef Arendsen */ -public class SqlLobValueTests extends TestCase { +public class SqlLobValueTests { - private MockControl psControl; - private PreparedStatement ps; + @Rule + public ExpectedException thrown = ExpectedException.none(); - private MockControl lobHandlerControl; + private PreparedStatement preparedStatement; private LobHandler handler; - - private MockControl lobCreatorControl; private LobCreator creator; - @Override - public void setUp() { - // create preparedstatement - psControl = MockControl.createControl(PreparedStatement.class); - ps = (PreparedStatement) psControl.getMock(); - - // create handler controler - lobHandlerControl = MockControl.createControl(LobHandler.class); - handler = (LobHandler) lobHandlerControl.getMock(); - - // create creator control - lobCreatorControl = MockControl.createControl(LobCreator.class); - creator = (LobCreator) lobCreatorControl.getMock(); + @Captor + private ArgumentCaptor inputStreamCaptor; - // set initial state - handler.getLobCreator(); - lobHandlerControl.setReturnValue(creator); - } - - private void replay() { - psControl.replay(); - lobHandlerControl.replay(); - lobCreatorControl.replay(); + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + preparedStatement = mock(PreparedStatement.class); + handler = mock(LobHandler.class); + creator = mock(LobCreator.class); + given(handler.getLobCreator()).willReturn(creator); } + @Test public void test1() throws SQLException { byte[] testBytes = "Bla".getBytes(); - creator.setBlobAsBytes(ps, 1, testBytes); - replay(); SqlLobValue lob = new SqlLobValue(testBytes, handler); - lob.setTypeValue(ps, 1, Types.BLOB, "test"); - lobHandlerControl.verify(); - lobCreatorControl.verify(); + lob.setTypeValue(preparedStatement, 1, Types.BLOB, "test"); + verify(creator).setBlobAsBytes(preparedStatement, 1, testBytes); } + @Test public void test2() throws SQLException { String testString = "Bla"; - - creator.setBlobAsBytes(ps, 1, testString.getBytes()); - // set a matcher to match the byte array! - lobCreatorControl.setMatcher(new ArgumentsMatcher() { - @Override - public boolean matches(Object[] arg0, Object[] arg1) { - byte[] one = (byte[]) arg0[2]; - byte[] two = (byte[]) arg1[2]; - return Arrays.equals(one, two); - } - @Override - public String toString(Object[] arg0) { - return "bla"; - } - }); - - replay(); - SqlLobValue lob = new SqlLobValue(testString, handler); - lob.setTypeValue(ps, 1, Types.BLOB, "test"); - lobHandlerControl.verify(); - lobCreatorControl.verify(); - + lob.setTypeValue(preparedStatement, 1, Types.BLOB, "test"); + verify(creator).setBlobAsBytes(preparedStatement, 1, testString.getBytes()); } - public void test3() - throws SQLException { - - Date testContent = new Date(); - - SqlLobValue lob = - new SqlLobValue(new InputStreamReader(new ByteArrayInputStream("Bla".getBytes())), 12); - try { - lob.setTypeValue(ps, 1, Types.BLOB, "test"); - fail("IllegalArgumentException should have been thrown"); - } - catch (IllegalArgumentException e) { - // expected - } + @Test + public void test3() throws SQLException { + SqlLobValue lob = new SqlLobValue(new InputStreamReader(new ByteArrayInputStream("Bla".getBytes())), 12); + thrown.expect(IllegalArgumentException.class); + lob.setTypeValue(preparedStatement, 1, Types.BLOB, "test"); } + @Test public void test4() throws SQLException { String testContent = "Bla"; - creator.setClobAsString(ps, 1, testContent); - - replay(); - SqlLobValue lob = new SqlLobValue(testContent, handler); - lob.setTypeValue(ps, 1, Types.CLOB, "test"); - lobHandlerControl.verify(); - lobCreatorControl.verify(); + lob.setTypeValue(preparedStatement, 1, Types.CLOB, "test"); + verify(creator).setClobAsString(preparedStatement, 1, testContent); } - public void test5() throws SQLException { + @Test + public void test5() throws Exception { byte[] testContent = "Bla".getBytes(); - ByteArrayInputStream bais = new ByteArrayInputStream(testContent); - creator.setClobAsAsciiStream(ps, 1, bais, 3); - lobCreatorControl.setMatcher(new ArgumentsMatcher() { - @Override - public boolean matches(Object[] arg0, Object[] arg1) { - // for now, match always - return true; - } - @Override - public String toString(Object[] arg0) { - return null; - } - }); - - replay(); - SqlLobValue lob = new SqlLobValue(new ByteArrayInputStream(testContent), 3, handler); - lob.setTypeValue(ps, 1, Types.CLOB, "test"); - lobHandlerControl.verify(); - lobCreatorControl.verify(); + lob.setTypeValue(preparedStatement, 1, Types.CLOB, "test"); + verify(creator).setClobAsAsciiStream(eq(preparedStatement), eq(1), inputStreamCaptor.capture(), eq(3)); + byte[] bytes = new byte[3]; + inputStreamCaptor.getValue().read(bytes ); + assertThat(bytes, equalTo(testContent)); } - public void test6()throws SQLException { + @Test + public void test6() throws SQLException { byte[] testContent = "Bla".getBytes(); ByteArrayInputStream bais = new ByteArrayInputStream(testContent); InputStreamReader reader = new InputStreamReader(bais); - creator.setClobAsCharacterStream(ps, 1, reader, 3); - lobCreatorControl.setMatcher(new ArgumentsMatcher() { - @Override - public boolean matches(Object[] arg0, Object[] arg1) { - // for now, match always - return true; - } - @Override - public String toString(Object[] arg0) { - return null; - } - }); - - replay(); - SqlLobValue lob = new SqlLobValue(reader, 3, handler); - lob.setTypeValue(ps, 1, Types.CLOB, "test"); - lobHandlerControl.verify(); - lobCreatorControl.verify(); - + lob.setTypeValue(preparedStatement, 1, Types.CLOB, "test"); + verify(creator).setClobAsCharacterStream(eq(preparedStatement), eq(1), eq(reader), eq(3)); } + @Test public void test7() throws SQLException { - Date testContent = new Date(); - SqlLobValue lob = new SqlLobValue("bla".getBytes()); - try { - lob.setTypeValue(ps, 1, Types.CLOB, "test"); - fail("IllegalArgumentException should have been thrown"); - } - catch (IllegalArgumentException e) { - // expected - } + thrown.expect(IllegalArgumentException.class); + lob.setTypeValue(preparedStatement, 1, Types.CLOB, "test"); } + @Test public void testOtherConstructors() throws SQLException { // a bit BS, but we need to test them, as long as they don't throw exceptions SqlLobValue lob = new SqlLobValue("bla"); - lob.setTypeValue(ps, 1, Types.CLOB, "test"); + lob.setTypeValue(preparedStatement, 1, Types.CLOB, "test"); try { lob = new SqlLobValue("bla".getBytes()); - lob.setTypeValue(ps, 1, Types.CLOB, "test"); + lob.setTypeValue(preparedStatement, 1, Types.CLOB, "test"); fail("IllegalArgumentException should have been thrown"); } catch (IllegalArgumentException e) { @@ -226,27 +153,27 @@ public class SqlLobValueTests extends TestCase { } lob = new SqlLobValue(new ByteArrayInputStream("bla".getBytes()), 3); - lob.setTypeValue(ps, 1, Types.CLOB, "test"); + lob.setTypeValue(preparedStatement, 1, Types.CLOB, "test"); - lob = new SqlLobValue(new InputStreamReader( - new ByteArrayInputStream("bla".getBytes())), 3); - lob.setTypeValue(ps, 1, Types.CLOB, "test"); + lob = new SqlLobValue(new InputStreamReader(new ByteArrayInputStream( + "bla".getBytes())), 3); + lob.setTypeValue(preparedStatement, 1, Types.CLOB, "test"); // same for BLOB lob = new SqlLobValue("bla"); - lob.setTypeValue(ps, 1, Types.BLOB, "test"); + lob.setTypeValue(preparedStatement, 1, Types.BLOB, "test"); lob = new SqlLobValue("bla".getBytes()); - lob.setTypeValue(ps, 1, Types.BLOB, "test"); + lob.setTypeValue(preparedStatement, 1, Types.BLOB, "test"); lob = new SqlLobValue(new ByteArrayInputStream("bla".getBytes()), 3); - lob.setTypeValue(ps, 1, Types.BLOB, "test"); + lob.setTypeValue(preparedStatement, 1, Types.BLOB, "test"); - lob = new SqlLobValue(new InputStreamReader( - new ByteArrayInputStream("bla".getBytes())), 3); + lob = new SqlLobValue(new InputStreamReader(new ByteArrayInputStream( + "bla".getBytes())), 3); try { - lob.setTypeValue(ps, 1, Types.BLOB, "test"); + lob.setTypeValue(preparedStatement, 1, Types.BLOB, "test"); fail("IllegalArgumentException should have been thrown"); } catch (IllegalArgumentException e) { @@ -254,28 +181,20 @@ public class SqlLobValueTests extends TestCase { } } - public void testCorrectCleanup() throws SQLException { - creator.setClobAsString(ps, 1, "Bla"); - creator.close(); - - replay(); + @Test + public void testCorrectCleanup() throws SQLException { SqlLobValue lob = new SqlLobValue("Bla", handler); - lob.setTypeValue(ps, 1, Types.CLOB, "test"); + lob.setTypeValue(preparedStatement, 1, Types.CLOB, "test"); lob.cleanup(); - - lobCreatorControl.verify(); + verify(creator).setClobAsString(preparedStatement, 1, "Bla"); + verify(creator).close(); } + @Test public void testOtherSqlType() throws SQLException { - replay(); SqlLobValue lob = new SqlLobValue("Bla", handler); - try { - lob.setTypeValue(ps, 1, Types.SMALLINT, "test"); - fail("IllegalArgumentException should have been thrown"); - } - catch (IllegalArgumentException e) { - // expected - } + thrown.expect(IllegalArgumentException.class); + lob.setTypeValue(preparedStatement, 1, Types.SMALLINT, "test"); } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java index 4fe8a5b43fd..88e6ec73a30 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java @@ -16,6 +16,19 @@ package org.springframework.jdbc.datasource; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.willThrow; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + import java.sql.Connection; import java.sql.SQLException; import java.util.HashMap; @@ -23,15 +36,16 @@ import java.util.List; import java.util.Map; import javax.sql.DataSource; +import javax.transaction.RollbackException; import javax.transaction.Status; import javax.transaction.SystemException; import javax.transaction.Transaction; import javax.transaction.TransactionManager; import javax.transaction.UserTransaction; -import junit.framework.TestCase; -import org.easymock.MockControl; - +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import org.springframework.beans.factory.support.StaticListableBeanFactory; import org.springframework.jdbc.datasource.lookup.BeanFactoryDataSourceLookup; import org.springframework.jdbc.datasource.lookup.IsolationLevelDataSourceRouter; @@ -49,66 +63,73 @@ import org.springframework.transaction.support.TransactionTemplate; * @author Juergen Hoeller * @since 17.10.2005 */ -public class DataSourceJtaTransactionTests extends TestCase { +public class DataSourceJtaTransactionTests { + + private Connection connection; + private DataSource dataSource; + private UserTransaction userTransaction; + private TransactionManager transactionManager; + private Transaction transaction; + + @Before + public void setup() throws Exception { + connection =mock(Connection.class); + dataSource = mock(DataSource.class); + userTransaction = mock(UserTransaction.class); + transactionManager = mock(TransactionManager.class); + transaction = mock(Transaction.class); + given(dataSource.getConnection()).willReturn(connection); + } + + @After + public void verifyTransactionSynchronizationManagerState() { + assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); + assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); + assertNull(TransactionSynchronizationManager.getCurrentTransactionName()); + assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); + assertNull(TransactionSynchronizationManager.getCurrentTransactionIsolationLevel()); + assertFalse(TransactionSynchronizationManager.isActualTransactionActive()); + } + @Test public void testJtaTransactionCommit() throws Exception { doTestJtaTransaction(false); } + @Test public void testJtaTransactionRollback() throws Exception { doTestJtaTransaction(true); } private void doTestJtaTransaction(final boolean rollback) throws Exception { - MockControl utControl = MockControl.createControl(UserTransaction.class); - UserTransaction ut = (UserTransaction) utControl.getMock(); - ut.getStatus(); - utControl.setReturnValue(Status.STATUS_NO_TRANSACTION, 1); - ut.getStatus(); - utControl.setReturnValue(Status.STATUS_ACTIVE, 1); - ut.begin(); - utControl.setVoidCallable(1); if (rollback) { - ut.rollback(); + given(userTransaction.getStatus()).willReturn( + Status.STATUS_NO_TRANSACTION,Status.STATUS_ACTIVE); } else { - ut.getStatus(); - utControl.setReturnValue(Status.STATUS_ACTIVE, 1); - ut.commit(); + given(userTransaction.getStatus()).willReturn( + Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE); } - utControl.setVoidCallable(1); - utControl.replay(); - - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - con.close(); - conControl.setVoidCallable(1); - conControl.replay(); - dsControl.replay(); - - JtaTransactionManager ptm = new JtaTransactionManager(ut); + + JtaTransactionManager ptm = new JtaTransactionManager(userTransaction); TransactionTemplate tt = new TransactionTemplate(ptm); - assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); + assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dataSource)); assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); tt.execute(new TransactionCallbackWithoutResult() { @Override protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { - assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); + assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dataSource)); assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive()); assertTrue("Is new transaction", status.isNewTransaction()); - Connection c = DataSourceUtils.getConnection(ds); - assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); - DataSourceUtils.releaseConnection(c, ds); + Connection c = DataSourceUtils.getConnection(dataSource); + assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dataSource)); + DataSourceUtils.releaseConnection(c, dataSource); - c = DataSourceUtils.getConnection(ds); - assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); - DataSourceUtils.releaseConnection(c, ds); + c = DataSourceUtils.getConnection(dataSource); + assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dataSource)); + DataSourceUtils.releaseConnection(c, dataSource); if (rollback) { status.setRollbackOnly(); @@ -116,49 +137,61 @@ public class DataSourceJtaTransactionTests extends TestCase { } }); - assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); + assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dataSource)); assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); - dsControl.verify(); - conControl.verify(); - utControl.verify(); + verify(userTransaction).begin(); + if (rollback) { + verify(userTransaction).rollback(); + } + verify(connection).close(); } + @Test public void testJtaTransactionCommitWithPropagationRequiresNew() throws Exception { doTestJtaTransactionWithPropagationRequiresNew(false, false, false, false); } + @Test public void testJtaTransactionCommitWithPropagationRequiresNewWithAccessAfterResume() throws Exception { doTestJtaTransactionWithPropagationRequiresNew(false, false, true, false); } + @Test public void testJtaTransactionCommitWithPropagationRequiresNewWithOpenOuterConnection() throws Exception { doTestJtaTransactionWithPropagationRequiresNew(false, true, false, false); } + @Test public void testJtaTransactionCommitWithPropagationRequiresNewWithOpenOuterConnectionAccessed() throws Exception { doTestJtaTransactionWithPropagationRequiresNew(false, true, true, false); } + @Test public void testJtaTransactionCommitWithPropagationRequiresNewWithTransactionAwareDataSource() throws Exception { doTestJtaTransactionWithPropagationRequiresNew(false, false, true, true); } + @Test public void testJtaTransactionRollbackWithPropagationRequiresNew() throws Exception { doTestJtaTransactionWithPropagationRequiresNew(true, false, false, false); } + @Test public void testJtaTransactionRollbackWithPropagationRequiresNewWithAccessAfterResume() throws Exception { doTestJtaTransactionWithPropagationRequiresNew(true, false, true, false); } + @Test public void testJtaTransactionRollbackWithPropagationRequiresNewWithOpenOuterConnection() throws Exception { doTestJtaTransactionWithPropagationRequiresNew(true, true, false, false); } + @Test public void testJtaTransactionRollbackWithPropagationRequiresNewWithOpenOuterConnectionAccessed() throws Exception { doTestJtaTransactionWithPropagationRequiresNew(true, true, true, false); } + @Test public void testJtaTransactionRollbackWithPropagationRequiresNewWithTransactionAwareDataSource() throws Exception { doTestJtaTransactionWithPropagationRequiresNew(true, false, true, true); } @@ -167,57 +200,22 @@ public class DataSourceJtaTransactionTests extends TestCase { final boolean rollback, final boolean openOuterConnection, final boolean accessAfterResume, final boolean useTransactionAwareDataSource) throws Exception { - MockControl utControl = MockControl.createControl(UserTransaction.class); - UserTransaction ut = (UserTransaction) utControl.getMock(); - MockControl tmControl = MockControl.createControl(TransactionManager.class); - TransactionManager tm = (TransactionManager) tmControl.getMock(); - MockControl txControl = MockControl.createControl(Transaction.class); - Transaction tx = (Transaction) txControl.getMock(); - ut.getStatus(); - utControl.setReturnValue(Status.STATUS_NO_TRANSACTION, 1); - ut.begin(); - utControl.setVoidCallable(1); - ut.getStatus(); - utControl.setReturnValue(Status.STATUS_ACTIVE, 16); - tm.suspend(); - tmControl.setReturnValue(tx, 5); - ut.begin(); - utControl.setVoidCallable(5); - ut.commit(); - utControl.setVoidCallable(5); - tm.resume(tx); - tmControl.setVoidCallable(5); + given(transactionManager.suspend()).willReturn(transaction); if (rollback) { - ut.rollback(); + given(userTransaction.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, + Status.STATUS_ACTIVE); } else { - ut.getStatus(); - utControl.setReturnValue(Status.STATUS_ACTIVE, 1); - ut.commit(); + given(userTransaction.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, + Status.STATUS_ACTIVE, Status.STATUS_ACTIVE); } - utControl.setVoidCallable(1); - utControl.replay(); - tmControl.replay(); - - final MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - final MockControl conControl = MockControl.createControl(Connection.class); - final Connection con = (Connection) conControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - con.isReadOnly(); - conControl.setReturnValue(true, 1); - if (!openOuterConnection) { - con.close(); - conControl.setVoidCallable(1); - } - conControl.replay(); - dsControl.replay(); + + given(connection.isReadOnly()).willReturn(true); final DataSource dsToUse = useTransactionAwareDataSource ? - new TransactionAwareDataSourceProxy(ds) : ds; + new TransactionAwareDataSourceProxy(dataSource) : dataSource; - JtaTransactionManager ptm = new JtaTransactionManager(ut, tm); + JtaTransactionManager ptm = new JtaTransactionManager(userTransaction, transactionManager); final TransactionTemplate tt = new TransactionTemplate(ptm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse)); @@ -255,19 +253,6 @@ public class DataSourceJtaTransactionTests extends TestCase { assertTrue("Is new transaction", status.isNewTransaction()); try { - dsControl.verify(); - conControl.verify(); - dsControl.reset(); - conControl.reset(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - con.isReadOnly(); - conControl.setReturnValue(true, 1); - con.close(); - conControl.setVoidCallable(1); - dsControl.replay(); - conControl.replay(); - Connection c = DataSourceUtils.getConnection(dsToUse); c.isReadOnly(); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse)); @@ -290,21 +275,6 @@ public class DataSourceJtaTransactionTests extends TestCase { if (accessAfterResume) { try { - if (!openOuterConnection) { - dsControl.verify(); - dsControl.reset(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - dsControl.replay(); - } - conControl.verify(); - conControl.reset(); - con.isReadOnly(); - conControl.setReturnValue(true, 1); - con.close(); - conControl.setVoidCallable(1); - conControl.replay(); - if (!openOuterConnection) { c = DataSourceUtils.getConnection(dsToUse); } @@ -322,15 +292,6 @@ public class DataSourceJtaTransactionTests extends TestCase { else { if (openOuterConnection) { - try { - conControl.verify(); - conControl.reset(); - con.close(); - conControl.setVoidCallable(1); - conControl.replay(); - } - catch (SQLException ex) { - } DataSourceUtils.releaseConnection(c, dsToUse); } } @@ -339,24 +300,38 @@ public class DataSourceJtaTransactionTests extends TestCase { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse)); assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); - dsControl.verify(); - conControl.verify(); - utControl.verify(); - tmControl.verify(); + verify(userTransaction, times(6)).begin(); + verify(transactionManager, times(5)).resume(transaction); + if(rollback) { + verify(userTransaction, times(5)).commit(); + verify(userTransaction).rollback(); + } else { + verify(userTransaction, times(6)).commit(); + } + if(accessAfterResume && !openOuterConnection) { + verify(connection, times(7)).close(); + } + else { + verify(connection, times(6)).close(); + } } + @Test public void testJtaTransactionCommitWithPropagationRequiredWithinSupports() throws Exception { doTestJtaTransactionCommitWithNewTransactionWithinEmptyTransaction(false, false); } + @Test public void testJtaTransactionCommitWithPropagationRequiredWithinNotSupported() throws Exception { doTestJtaTransactionCommitWithNewTransactionWithinEmptyTransaction(false, true); } + @Test public void testJtaTransactionCommitWithPropagationRequiresNewWithinSupports() throws Exception { doTestJtaTransactionCommitWithNewTransactionWithinEmptyTransaction(true, false); } + @Test public void testJtaTransactionCommitWithPropagationRequiresNewWithinNotSupported() throws Exception { doTestJtaTransactionCommitWithNewTransactionWithinEmptyTransaction(true, true); } @@ -364,57 +339,28 @@ public class DataSourceJtaTransactionTests extends TestCase { private void doTestJtaTransactionCommitWithNewTransactionWithinEmptyTransaction( final boolean requiresNew, boolean notSupported) throws Exception { - MockControl utControl = MockControl.createControl(UserTransaction.class); - UserTransaction ut = (UserTransaction) utControl.getMock(); - MockControl tmControl = MockControl.createControl(TransactionManager.class); - TransactionManager tm = (TransactionManager) tmControl.getMock(); - MockControl txControl = MockControl.createControl(Transaction.class); - Transaction tx = (Transaction) txControl.getMock(); if (notSupported) { - ut.getStatus(); - utControl.setReturnValue(Status.STATUS_ACTIVE, 1); - tm.suspend(); - tmControl.setReturnValue(tx, 1); + given(userTransaction.getStatus()).willReturn( + Status.STATUS_ACTIVE, + Status.STATUS_NO_TRANSACTION, + Status.STATUS_ACTIVE, + Status.STATUS_ACTIVE); + given(transactionManager.suspend()).willReturn(transaction); } else { - ut.getStatus(); - utControl.setReturnValue(Status.STATUS_NO_TRANSACTION, 1); + given(userTransaction.getStatus()).willReturn( + Status.STATUS_NO_TRANSACTION, + Status.STATUS_NO_TRANSACTION, + Status.STATUS_ACTIVE, + Status.STATUS_ACTIVE); } - ut.getStatus(); - utControl.setReturnValue(Status.STATUS_NO_TRANSACTION, 1); - ut.begin(); - utControl.setVoidCallable(1); - ut.getStatus(); - utControl.setReturnValue(Status.STATUS_ACTIVE, 2); - ut.commit(); - utControl.setVoidCallable(1); - if (notSupported) { - tm.resume(tx); - tmControl.setVoidCallable(1); - } - utControl.replay(); - tmControl.replay(); - txControl.replay(); - - final MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - final MockControl con1Control = MockControl.createControl(Connection.class); - final Connection con1 = (Connection) con1Control.getMock(); - final MockControl con2Control = MockControl.createControl(Connection.class); - final Connection con2 = (Connection) con2Control.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con1, 1); - ds.getConnection(); - dsControl.setReturnValue(con2, 1); - con2.close(); - con2Control.setVoidCallable(1); - con1.close(); - con1Control.setVoidCallable(1); - dsControl.replay(); - con1Control.replay(); - con2Control.replay(); - - final JtaTransactionManager ptm = new JtaTransactionManager(ut, tm); + + final DataSource dataSource = mock(DataSource.class); + final Connection connection1 = mock(Connection.class); + final Connection connection2 = mock(Connection.class); + given(dataSource.getConnection()).willReturn(connection1, connection2); + + final JtaTransactionManager ptm = new JtaTransactionManager(userTransaction, transactionManager); TransactionTemplate tt = new TransactionTemplate(ptm); tt.setPropagationBehavior(notSupported ? TransactionDefinition.PROPAGATION_NOT_SUPPORTED : TransactionDefinition.PROPAGATION_SUPPORTS); @@ -426,8 +372,8 @@ public class DataSourceJtaTransactionTests extends TestCase { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertFalse(TransactionSynchronizationManager.isActualTransactionActive()); - assertSame(con1, DataSourceUtils.getConnection(ds)); - assertSame(con1, DataSourceUtils.getConnection(ds)); + assertSame(connection1, DataSourceUtils.getConnection(dataSource)); + assertSame(connection1, DataSourceUtils.getConnection(dataSource)); TransactionTemplate tt2 = new TransactionTemplate(ptm); tt2.setPropagationBehavior(requiresNew ? @@ -438,55 +384,63 @@ public class DataSourceJtaTransactionTests extends TestCase { assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertTrue(TransactionSynchronizationManager.isActualTransactionActive()); - assertSame(con2, DataSourceUtils.getConnection(ds)); - assertSame(con2, DataSourceUtils.getConnection(ds)); + assertSame(connection2, DataSourceUtils.getConnection(dataSource)); + assertSame(connection2, DataSourceUtils.getConnection(dataSource)); } }); assertTrue(TransactionSynchronizationManager.isSynchronizationActive()); assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); assertFalse(TransactionSynchronizationManager.isActualTransactionActive()); - assertSame(con1, DataSourceUtils.getConnection(ds)); + assertSame(connection1, DataSourceUtils.getConnection(dataSource)); } }); assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); - - utControl.verify(); - tmControl.verify(); - txControl.verify(); - dsControl.verify(); - con1Control.verify(); - con2Control.verify(); + verify(userTransaction).begin(); + verify(userTransaction).commit(); + if (notSupported) { + verify(transactionManager).resume(transaction); + } + verify(connection2).close(); + verify(connection1).close(); } + @Test public void testJtaTransactionCommitWithPropagationRequiresNewAndSuspendException() throws Exception { doTestJtaTransactionWithPropagationRequiresNewAndBeginException(true, false, false); } + @Test public void testJtaTransactionCommitWithPropagationRequiresNewWithOpenOuterConnectionAndSuspendException() throws Exception { doTestJtaTransactionWithPropagationRequiresNewAndBeginException(true, true, false); } + @Test public void testJtaTransactionCommitWithPropagationRequiresNewWithTransactionAwareDataSourceAndSuspendException() throws Exception { doTestJtaTransactionWithPropagationRequiresNewAndBeginException(true, false, true); } + @Test public void testJtaTransactionCommitWithPropagationRequiresNewWithOpenOuterConnectionAndTransactionAwareDataSourceAndSuspendException() throws Exception { doTestJtaTransactionWithPropagationRequiresNewAndBeginException(true, true, true); } + @Test public void testJtaTransactionCommitWithPropagationRequiresNewAndBeginException() throws Exception { doTestJtaTransactionWithPropagationRequiresNewAndBeginException(false, false, false); } + @Test public void testJtaTransactionCommitWithPropagationRequiresNewWithOpenOuterConnectionAndBeginException() throws Exception { doTestJtaTransactionWithPropagationRequiresNewAndBeginException(false, true, false); } + @Test public void testJtaTransactionCommitWithPropagationRequiresNewWithOpenOuterConnectionAndTransactionAwareDataSourceAndBeginException() throws Exception { doTestJtaTransactionWithPropagationRequiresNewAndBeginException(false, true, true); } + @Test public void testJtaTransactionCommitWithPropagationRequiresNewWithTransactionAwareDataSourceAndBeginException() throws Exception { doTestJtaTransactionWithPropagationRequiresNewAndBeginException(false, false, true); } @@ -494,57 +448,27 @@ public class DataSourceJtaTransactionTests extends TestCase { private void doTestJtaTransactionWithPropagationRequiresNewAndBeginException(boolean suspendException, final boolean openOuterConnection, final boolean useTransactionAwareDataSource) throws Exception { - MockControl utControl = MockControl.createControl(UserTransaction.class); - UserTransaction ut = (UserTransaction) utControl.getMock(); - MockControl tmControl = MockControl.createControl(TransactionManager.class); - TransactionManager tm = (TransactionManager) tmControl.getMock(); - MockControl txControl = MockControl.createControl(Transaction.class); - Transaction tx = (Transaction) txControl.getMock(); - ut.getStatus(); - utControl.setReturnValue(Status.STATUS_NO_TRANSACTION, 1); - ut.begin(); - utControl.setVoidCallable(1); - ut.getStatus(); - utControl.setReturnValue(Status.STATUS_ACTIVE, 2); + given(userTransaction.getStatus()).willReturn( + Status.STATUS_NO_TRANSACTION, + Status.STATUS_ACTIVE, + Status.STATUS_ACTIVE); if (suspendException) { - tm.suspend(); - tmControl.setThrowable(new SystemException(), 1); + given(transactionManager.suspend()).willThrow(new SystemException()); } else { - tm.suspend(); - tmControl.setReturnValue(tx, 1); - ut.begin(); - utControl.setThrowable(new SystemException(), 1); - tm.resume(tx); - tmControl.setVoidCallable(1); - } - ut.rollback(); - utControl.setVoidCallable(1); - utControl.replay(); - tmControl.replay(); - - final MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - final MockControl conControl = MockControl.createControl(Connection.class); - final Connection con = (Connection) conControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - con.isReadOnly(); - conControl.setReturnValue(true, 1); - if (!openOuterConnection || useTransactionAwareDataSource) { - con.close(); - conControl.setVoidCallable(1); + given(transactionManager.suspend()).willReturn(transaction); + willThrow(new SystemException()).given(userTransaction).begin(); } - conControl.replay(); - dsControl.replay(); + + given(connection.isReadOnly()).willReturn(true); final DataSource dsToUse = useTransactionAwareDataSource ? - new TransactionAwareDataSourceProxy(ds) : ds; + new TransactionAwareDataSourceProxy(dataSource) : dataSource; if (dsToUse instanceof TransactionAwareDataSourceProxy) { ((TransactionAwareDataSourceProxy) dsToUse).setReobtainTransactionalConnections(true); } - JtaTransactionManager ptm = new JtaTransactionManager(ut, tm); + JtaTransactionManager ptm = new JtaTransactionManager(userTransaction, transactionManager); final TransactionTemplate tt = new TransactionTemplate(ptm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse)); @@ -581,50 +505,19 @@ public class DataSourceJtaTransactionTests extends TestCase { assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive()); assertTrue("Is new transaction", status.isNewTransaction()); - try { - dsControl.verify(); - conControl.verify(); - dsControl.reset(); - conControl.reset(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - con.close(); - conControl.setVoidCallable(1); - dsControl.replay(); - conControl.replay(); - - Connection c = DataSourceUtils.getConnection(dsToUse); - assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse)); - DataSourceUtils.releaseConnection(c, dsToUse); - - c = DataSourceUtils.getConnection(dsToUse); - assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse)); - DataSourceUtils.releaseConnection(c, dsToUse); - } - catch (SQLException ex) { - } + Connection c = DataSourceUtils.getConnection(dsToUse); + assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse)); + DataSourceUtils.releaseConnection(c, dsToUse); + + c = DataSourceUtils.getConnection(dsToUse); + assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse)); + DataSourceUtils.releaseConnection(c, dsToUse); } }); } finally { if (openOuterConnection) { try { - dsControl.verify(); - dsControl.reset(); - conControl.verify(); - conControl.reset(); - - if (useTransactionAwareDataSource) { - ds.getConnection(); - dsControl.setReturnValue(con, 1); - } - con.isReadOnly(); - conControl.setReturnValue(true, 1); - con.close(); - conControl.setVoidCallable(1); - dsControl.replay(); - conControl.replay(); - c.isReadOnly(); DataSourceUtils.releaseConnection(c, dsToUse); } @@ -643,26 +536,30 @@ public class DataSourceJtaTransactionTests extends TestCase { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse)); assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); - dsControl.verify(); - conControl.verify(); - utControl.verify(); - tmControl.verify(); - } - public void testJtaTransactionWithConnectionHolderStillBound() throws Exception { - MockControl utControl = MockControl.createControl(UserTransaction.class); - UserTransaction ut = (UserTransaction) utControl.getMock(); + verify(userTransaction).begin(); + if(suspendException) { + verify(userTransaction).rollback(); + } - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); + if (suspendException) { + verify(connection, atLeastOnce()).close(); + } + else { + verify(connection, never()).close(); + } + } + @Test + public void testJtaTransactionWithConnectionHolderStillBound() throws Exception { @SuppressWarnings("serial") - JtaTransactionManager ptm = new JtaTransactionManager(ut) { + JtaTransactionManager ptm = new JtaTransactionManager(userTransaction) { + @Override protected void doRegisterAfterCompletionWithJtaTransaction( - JtaTransactionObject txObject, final List synchronizations) { + JtaTransactionObject txObject, + final List synchronizations) + throws RollbackException, SystemException { Thread async = new Thread() { @Override public void run() { @@ -679,24 +576,11 @@ public class DataSourceJtaTransactionTests extends TestCase { } }; TransactionTemplate tt = new TransactionTemplate(ptm); - assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); + assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dataSource)); assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); + given(userTransaction.getStatus()).willReturn(Status.STATUS_ACTIVE); for (int i = 0; i < 3; i++) { - utControl.reset(); - ut.getStatus(); - utControl.setReturnValue(Status.STATUS_ACTIVE, 1); - utControl.replay(); - - dsControl.reset(); - conControl.reset(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - con.close(); - conControl.setVoidCallable(1); - dsControl.replay(); - conControl.replay(); - final boolean releaseCon = (i != 1); tt.execute(new TransactionCallbackWithoutResult() { @@ -705,76 +589,44 @@ public class DataSourceJtaTransactionTests extends TestCase { assertTrue("JTA synchronizations active", TransactionSynchronizationManager.isSynchronizationActive()); assertTrue("Is existing transaction", !status.isNewTransaction()); - Connection c = DataSourceUtils.getConnection(ds); - assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); - DataSourceUtils.releaseConnection(c, ds); + Connection c = DataSourceUtils.getConnection(dataSource); + assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dataSource)); + DataSourceUtils.releaseConnection(c, dataSource); - c = DataSourceUtils.getConnection(ds); - assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(ds)); + c = DataSourceUtils.getConnection(dataSource); + assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dataSource)); if (releaseCon) { - DataSourceUtils.releaseConnection(c, ds); + DataSourceUtils.releaseConnection(c, dataSource); } } }); if (!releaseCon) { - assertTrue("Still has connection holder", TransactionSynchronizationManager.hasResource(ds)); + assertTrue("Still has connection holder", TransactionSynchronizationManager.hasResource(dataSource)); } else { - assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); + assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dataSource)); } assertTrue("JTA synchronizations not active", !TransactionSynchronizationManager.isSynchronizationActive()); - - conControl.verify(); - dsControl.verify(); - utControl.verify(); } + verify(connection, times(3)).close(); } + @Test public void testJtaTransactionWithIsolationLevelDataSourceAdapter() throws Exception { - MockControl utControl = MockControl.createControl(UserTransaction.class); - UserTransaction ut = (UserTransaction) utControl.getMock(); - ut.getStatus(); - utControl.setReturnValue(Status.STATUS_NO_TRANSACTION, 1); - ut.getStatus(); - utControl.setReturnValue(Status.STATUS_ACTIVE, 2); - ut.begin(); - utControl.setVoidCallable(1); - ut.commit(); - ut.getStatus(); - utControl.setReturnValue(Status.STATUS_NO_TRANSACTION, 1); - ut.getStatus(); - utControl.setReturnValue(Status.STATUS_ACTIVE, 2); - ut.begin(); - utControl.setVoidCallable(1); - ut.commit(); - utControl.setVoidCallable(1); - utControl.replay(); - - MockControl ds1Control = MockControl.createControl(DataSource.class); - final DataSource ds1 = (DataSource) ds1Control.getMock(); - MockControl con1Control = MockControl.createControl(Connection.class); - final Connection con1 = (Connection) con1Control.getMock(); - ds1.getConnection(); - ds1Control.setReturnValue(con1, 1); - con1.close(); - con1Control.setVoidCallable(1); - ds1.getConnection(); - ds1Control.setReturnValue(con1, 1); - con1.setReadOnly(true); - con1Control.setVoidCallable(1); - con1.setTransactionIsolation(Connection.TRANSACTION_REPEATABLE_READ); - con1Control.setVoidCallable(1); - con1.close(); - con1Control.setVoidCallable(1); - con1Control.replay(); - ds1Control.replay(); + given(userTransaction.getStatus()).willReturn( + Status.STATUS_NO_TRANSACTION, + Status.STATUS_ACTIVE, + Status.STATUS_ACTIVE, + Status.STATUS_NO_TRANSACTION, + Status.STATUS_ACTIVE, + Status.STATUS_ACTIVE); final IsolationLevelDataSourceAdapter dsToUse = new IsolationLevelDataSourceAdapter(); - dsToUse.setTargetDataSource(ds1); + dsToUse.setTargetDataSource(dataSource); dsToUse.afterPropertiesSet(); - JtaTransactionManager ptm = new JtaTransactionManager(ut); + JtaTransactionManager ptm = new JtaTransactionManager(userTransaction); ptm.setAllowCustomIsolationLevels(true); TransactionTemplate tt = new TransactionTemplate(ptm); @@ -783,7 +635,7 @@ public class DataSourceJtaTransactionTests extends TestCase { protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { Connection c = DataSourceUtils.getConnection(dsToUse); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse)); - assertSame(con1, c); + assertSame(connection, c); DataSourceUtils.releaseConnection(c, dsToUse); } }); @@ -795,84 +647,57 @@ public class DataSourceJtaTransactionTests extends TestCase { protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { Connection c = DataSourceUtils.getConnection(dsToUse); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse)); - assertSame(con1, c); + assertSame(connection, c); DataSourceUtils.releaseConnection(c, dsToUse); } }); - ds1Control.verify(); - con1Control.verify(); - utControl.verify(); + verify(userTransaction, times(2)).begin(); + verify(userTransaction, times(2)).commit(); + verify(connection).setReadOnly(true); + verify(connection).setTransactionIsolation(Connection.TRANSACTION_REPEATABLE_READ); + verify(connection, times(2)).close(); } + @Test public void testJtaTransactionWithIsolationLevelDataSourceRouter() throws Exception { doTestJtaTransactionWithIsolationLevelDataSourceRouter(false); } + @Test public void testJtaTransactionWithIsolationLevelDataSourceRouterWithDataSourceLookup() throws Exception { doTestJtaTransactionWithIsolationLevelDataSourceRouter(true); } private void doTestJtaTransactionWithIsolationLevelDataSourceRouter(boolean dataSourceLookup) throws Exception { - MockControl utControl = MockControl.createControl(UserTransaction.class); - UserTransaction ut = (UserTransaction) utControl.getMock(); - ut.getStatus(); - utControl.setReturnValue(Status.STATUS_NO_TRANSACTION, 1); - ut.getStatus(); - utControl.setReturnValue(Status.STATUS_ACTIVE, 2); - ut.begin(); - utControl.setVoidCallable(1); - ut.commit(); - ut.getStatus(); - utControl.setReturnValue(Status.STATUS_NO_TRANSACTION, 1); - ut.getStatus(); - utControl.setReturnValue(Status.STATUS_ACTIVE, 2); - ut.begin(); - utControl.setVoidCallable(1); - ut.commit(); - utControl.setVoidCallable(1); - utControl.replay(); - - MockControl ds1Control = MockControl.createControl(DataSource.class); - final DataSource ds1 = (DataSource) ds1Control.getMock(); - MockControl con1Control = MockControl.createControl(Connection.class); - final Connection con1 = (Connection) con1Control.getMock(); - ds1.getConnection(); - ds1Control.setReturnValue(con1, 1); - con1.close(); - con1Control.setVoidCallable(1); - con1Control.replay(); - ds1Control.replay(); - - MockControl ds2Control = MockControl.createControl(DataSource.class); - final DataSource ds2 = (DataSource) ds2Control.getMock(); - MockControl con2Control = MockControl.createControl(Connection.class); - final Connection con2 = (Connection) con2Control.getMock(); - ds2.getConnection(); - ds2Control.setReturnValue(con2, 1); - con2.close(); - con2Control.setVoidCallable(1); - con2Control.replay(); - ds2Control.replay(); +given( userTransaction.getStatus()).willReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE, Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE, Status.STATUS_ACTIVE); + + final DataSource dataSource1 = mock(DataSource.class); + final Connection connection1 = mock(Connection.class); + given(dataSource1.getConnection()).willReturn(connection1); + + final DataSource dataSource2 = mock(DataSource.class); + final Connection connection2 = mock(Connection.class); + given(dataSource2.getConnection()).willReturn(connection2); final IsolationLevelDataSourceRouter dsToUse = new IsolationLevelDataSourceRouter(); - Map targetDataSources = new HashMap(); + Map targetDataSources = new HashMap(); if (dataSourceLookup) { targetDataSources.put("ISOLATION_REPEATABLE_READ", "ds2"); dsToUse.setDefaultTargetDataSource("ds1"); StaticListableBeanFactory beanFactory = new StaticListableBeanFactory(); - beanFactory.addBean("ds1", ds1); - beanFactory.addBean("ds2", ds2); + beanFactory.addBean("ds1", dataSource1); + beanFactory.addBean("ds2", dataSource2); dsToUse.setDataSourceLookup(new BeanFactoryDataSourceLookup(beanFactory)); } else { - targetDataSources.put("ISOLATION_REPEATABLE_READ", ds2); - dsToUse.setDefaultTargetDataSource(ds1); + targetDataSources.put("ISOLATION_REPEATABLE_READ", dataSource2); + dsToUse.setDefaultTargetDataSource(dataSource1); } dsToUse.setTargetDataSources(targetDataSources); dsToUse.afterPropertiesSet(); - JtaTransactionManager ptm = new JtaTransactionManager(ut); + JtaTransactionManager ptm = new JtaTransactionManager(userTransaction); ptm.setAllowCustomIsolationLevels(true); TransactionTemplate tt = new TransactionTemplate(ptm); @@ -881,7 +706,7 @@ public class DataSourceJtaTransactionTests extends TestCase { protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { Connection c = DataSourceUtils.getConnection(dsToUse); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse)); - assertSame(con1, c); + assertSame(connection1, c); DataSourceUtils.releaseConnection(c, dsToUse); } }); @@ -892,26 +717,14 @@ public class DataSourceJtaTransactionTests extends TestCase { protected void doInTransactionWithoutResult(TransactionStatus status) throws RuntimeException { Connection c = DataSourceUtils.getConnection(dsToUse); assertTrue("Has thread connection", TransactionSynchronizationManager.hasResource(dsToUse)); - assertSame(con2, c); + assertSame(connection2, c); DataSourceUtils.releaseConnection(c, dsToUse); } }); - ds1Control.verify(); - con1Control.verify(); - ds2Control.verify(); - con2Control.verify(); - utControl.verify(); - } - - @Override - protected void tearDown() { - assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); - assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); - assertNull(TransactionSynchronizationManager.getCurrentTransactionName()); - assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); - assertNull(TransactionSynchronizationManager.getCurrentTransactionIsolationLevel()); - assertFalse(TransactionSynchronizationManager.isActualTransactionActive()); + verify(userTransaction, times(2)).begin(); + verify(userTransaction, times(2)).commit(); + verify(connection1).close(); + verify(connection2).close(); } - } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java index 28eb6b3c04e..02f8f5332d5 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java @@ -16,16 +16,26 @@ package org.springframework.jdbc.datasource; +import static org.junit.Assert.*; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.willThrow; +import static org.mockito.Mockito.inOrder; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Savepoint; -import javax.sql.DataSource; -import junit.framework.TestCase; -import org.easymock.MockControl; +import javax.sql.DataSource; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.mockito.InOrder; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.jdbc.UncategorizedSQLException; import org.springframework.jdbc.support.nativejdbc.SimpleNativeJdbcExtractor; @@ -47,28 +57,54 @@ import org.springframework.transaction.support.TransactionTemplate; * @author Juergen Hoeller * @since 04.07.2003 */ -public class DataSourceTransactionManagerTests extends TestCase { +public class DataSourceTransactionManagerTests { + + private Connection con; + private DataSource ds; + private DataSourceTransactionManager tm; + + @Before + public void setUp() throws Exception { + con = mock(Connection.class); + ds = mock(DataSource.class); + tm = new DataSourceTransactionManager(ds); + given(ds.getConnection()).willReturn(con); + } + + @After + public void verifyTransactionSynchronizationManagerState() { + assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); + assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); + assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); + assertFalse(TransactionSynchronizationManager.isActualTransactionActive()); + } + @Test public void testTransactionCommitWithAutoCommitTrue() throws Exception { doTestTransactionCommitRestoringAutoCommit(true, false, false); } + @Test public void testTransactionCommitWithAutoCommitFalse() throws Exception { doTestTransactionCommitRestoringAutoCommit(false, false, false); } + @Test public void testTransactionCommitWithAutoCommitTrueAndLazyConnection() throws Exception { doTestTransactionCommitRestoringAutoCommit(true, true, false); } + @Test public void testTransactionCommitWithAutoCommitFalseAndLazyConnection() throws Exception { doTestTransactionCommitRestoringAutoCommit(false, true, false); } + @Test public void testTransactionCommitWithAutoCommitTrueAndLazyConnectionAndStatementCreated() throws Exception { doTestTransactionCommitRestoringAutoCommit(true, true, true); } + @Test public void testTransactionCommitWithAutoCommitFalseAndLazyConnectionAndStatementCreated() throws Exception { doTestTransactionCommitRestoringAutoCommit(false, true, true); } @@ -76,59 +112,17 @@ public class DataSourceTransactionManagerTests extends TestCase { private void doTestTransactionCommitRestoringAutoCommit( boolean autoCommit, boolean lazyConnection, final boolean createStatement) throws Exception { - - MockControl dsControl = MockControl.createControl(DataSource.class); - DataSource ds = (DataSource) dsControl.getMock(); - MockControl conControl = MockControl.createControl(Connection.class); - final Connection con = (Connection) conControl.getMock(); - if (lazyConnection) { - ds.getConnection(); - dsControl.setReturnValue(con, 1); - if (createStatement) { - con.getMetaData(); - conControl.setReturnValue(null, 1); - } - con.getAutoCommit(); - conControl.setReturnValue(autoCommit, 1); - con.getTransactionIsolation(); - conControl.setReturnValue(Connection.TRANSACTION_READ_COMMITTED, 1); - con.close(); - conControl.setVoidCallable(1); + given(con.getAutoCommit()).willReturn(autoCommit); + given(con.getTransactionIsolation()).willReturn(Connection.TRANSACTION_READ_COMMITTED); } if (!lazyConnection || createStatement) { - ds.getConnection(); - dsControl.setReturnValue(con, 1); - con.getAutoCommit(); - conControl.setReturnValue(autoCommit, 1); - if (autoCommit) { - // Must disable autocommit - con.setAutoCommit(false); - conControl.setVoidCallable(1); - } - if (createStatement) { - con.createStatement(); - conControl.setReturnValue(null, 1); - } - con.commit(); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - if (autoCommit) { - // must restore autoCommit - con.setAutoCommit(true); - conControl.setVoidCallable(1); - } - con.close(); - conControl.setVoidCallable(1); + given(con.getAutoCommit()).willReturn(autoCommit); } - conControl.replay(); - dsControl.replay(); - final DataSource dsToUse = (lazyConnection ? new LazyConnectionDataSourceProxy(ds) : ds); - PlatformTransactionManager tm = new DataSourceTransactionManager(dsToUse); + tm = new DataSourceTransactionManager(dsToUse); TransactionTemplate tt = new TransactionTemplate(tm); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse)); assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); @@ -157,85 +151,64 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse)); assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); - conControl.verify(); - dsControl.verify(); + if(autoCommit && (!lazyConnection || createStatement)) { + InOrder ordered = inOrder(con); + ordered.verify(con).setAutoCommit(false); + ordered.verify(con).commit(); + ordered.verify(con).setAutoCommit(true); + } + if (createStatement) { + verify(con, times(2)).close(); + } + else { + verify(con).close(); + } } + @Test public void testTransactionRollbackWithAutoCommitTrue() throws Exception { doTestTransactionRollbackRestoringAutoCommit(true, false, false); } + @Test public void testTransactionRollbackWithAutoCommitFalse() throws Exception { doTestTransactionRollbackRestoringAutoCommit(false, false, false); } + @Test public void testTransactionRollbackWithAutoCommitTrueAndLazyConnection() throws Exception { doTestTransactionRollbackRestoringAutoCommit(true, true, false); } + @Test public void testTransactionRollbackWithAutoCommitFalseAndLazyConnection() throws Exception { doTestTransactionRollbackRestoringAutoCommit(false, true, false); } + @Test public void testTransactionRollbackWithAutoCommitTrueAndLazyConnectionAndCreateStatement() throws Exception { doTestTransactionRollbackRestoringAutoCommit(true, true, true); } + @Test public void testTransactionRollbackWithAutoCommitFalseAndLazyConnectionAndCreateStatement() throws Exception { doTestTransactionRollbackRestoringAutoCommit(false, true, true); } private void doTestTransactionRollbackRestoringAutoCommit( boolean autoCommit, boolean lazyConnection, final boolean createStatement) throws Exception { - - MockControl dsControl = MockControl.createControl(DataSource.class); - DataSource ds = (DataSource) dsControl.getMock(); - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - if (lazyConnection) { - ds.getConnection(); - dsControl.setReturnValue(con, 1); - con.getAutoCommit(); - conControl.setReturnValue(autoCommit, 1); - con.getTransactionIsolation(); - conControl.setReturnValue(Connection.TRANSACTION_READ_COMMITTED, 1); - con.close(); - conControl.setVoidCallable(1); + given(con.getAutoCommit()).willReturn(autoCommit); + given(con.getTransactionIsolation()).willReturn( + Connection.TRANSACTION_READ_COMMITTED); } if (!lazyConnection || createStatement) { - ds.getConnection(); - dsControl.setReturnValue(con, 1); - con.getAutoCommit(); - conControl.setReturnValue(autoCommit, 1); - if (autoCommit) { - // Must disable autocommit - con.setAutoCommit(false); - conControl.setVoidCallable(1); - } - if (createStatement) { - con.createStatement(); - conControl.setReturnValue(null, 1); - } - con.rollback(); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - if (autoCommit) { - // Must restore autocommit - con.setAutoCommit(true); - conControl.setVoidCallable(1); - } - con.close(); - conControl.setVoidCallable(1); + given(con.getAutoCommit()).willReturn(autoCommit); } - conControl.replay(); - dsControl.replay(); - final DataSource dsToUse = (lazyConnection ? new LazyConnectionDataSourceProxy(ds) : ds); - PlatformTransactionManager tm = new DataSourceTransactionManager(dsToUse); + tm = new DataSourceTransactionManager(dsToUse); TransactionTemplate tt = new TransactionTemplate(tm); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(dsToUse)); assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); @@ -269,19 +242,23 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); - conControl.verify(); - dsControl.verify(); + + if(autoCommit && (!lazyConnection || createStatement)) { + InOrder ordered = inOrder(con); + ordered.verify(con).setAutoCommit(false); + ordered.verify(con).rollback(); + ordered.verify(con).setAutoCommit(true); + } + if (createStatement) { + verify(con, times(2)).close(); + } + else { + verify(con).close(); + } } + @Test public void testTransactionRollbackOnly() throws Exception { - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - conControl.replay(); - dsControl.replay(); - - DataSourceTransactionManager tm = new DataSourceTransactionManager(ds); tm.setTransactionSynchronization(DataSourceTransactionManager.SYNCHRONIZATION_NEVER); TransactionTemplate tt = new TransactionTemplate(tm); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); @@ -313,38 +290,20 @@ public class DataSourceTransactionManagerTests extends TestCase { } assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - conControl.verify(); - dsControl.verify(); } + @Test public void testParticipatingTransactionWithRollbackOnly() throws Exception { doTestParticipatingTransactionWithRollbackOnly(false); } + @Test public void testParticipatingTransactionWithRollbackOnlyAndFailEarly() throws Exception { doTestParticipatingTransactionWithRollbackOnly(true); } private void doTestParticipatingTransactionWithRollbackOnly(boolean failEarly) throws Exception { - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - con.getAutoCommit(); - conControl.setReturnValue(false, 1); - con.rollback(); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - con.close(); - conControl.setVoidCallable(1); - - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - conControl.replay(); - dsControl.replay(); - - DataSourceTransactionManager tm = new DataSourceTransactionManager(ds); + given(con.isReadOnly()).willReturn(false); if (failEarly) { tm.setFailEarlyOnGlobalRollbackOnly(true); } @@ -403,30 +362,12 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue(synch.beforeCompletionCalled); assertFalse(synch.afterCommitCalled); assertTrue(synch.afterCompletionCalled); - conControl.verify(); - dsControl.verify(); + verify(con).rollback(); + verify(con).close(); } + @Test public void testParticipatingTransactionWithIncompatibleIsolationLevel() throws Exception { - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - con.getAutoCommit(); - conControl.setReturnValue(false, 1); - con.rollback(); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - con.close(); - conControl.setVoidCallable(1); - - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - conControl.replay(); - dsControl.replay(); - - DataSourceTransactionManager tm = new DataSourceTransactionManager(ds); tm.setValidateExistingTransaction(true); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); @@ -458,32 +399,13 @@ public class DataSourceTransactionManagerTests extends TestCase { } assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - conControl.verify(); - dsControl.verify(); + verify(con).rollback(); + verify(con).close(); } + @Test public void testParticipatingTransactionWithIncompatibleReadOnly() throws Exception { - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - con.getAutoCommit(); - conControl.setReturnValue(false, 1); - con.rollback(); - conControl.setVoidCallable(1); - con.setReadOnly(true); - conControl.setThrowable(new SQLException("read-only not supported"), 1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - con.close(); - conControl.setVoidCallable(1); - - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - conControl.replay(); - dsControl.replay(); - - DataSourceTransactionManager tm = new DataSourceTransactionManager(ds); + willThrow(new SQLException("read-only not supported")).given(con).setReadOnly(true); tm.setValidateExistingTransaction(true); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); @@ -516,30 +438,12 @@ public class DataSourceTransactionManagerTests extends TestCase { } assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - conControl.verify(); - dsControl.verify(); + verify(con).rollback(); + verify(con).close(); } + @Test public void testParticipatingTransactionWithTransactionStartedFromSynch() throws Exception { - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - con.getAutoCommit(); - conControl.setReturnValue(false, 2); - con.commit(); - conControl.setVoidCallable(2); - con.isReadOnly(); - conControl.setReturnValue(false, 2); - con.close(); - conControl.setVoidCallable(2); - - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con, 2); - conControl.replay(); - dsControl.replay(); - - DataSourceTransactionManager tm = new DataSourceTransactionManager(ds); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); assertTrue("Synchronization not active", !TransactionSynchronizationManager.isSynchronizationActive()); @@ -571,30 +475,12 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue(synch.beforeCompletionCalled); assertTrue(synch.afterCommitCalled); assertTrue(synch.afterCompletionCalled); - conControl.verify(); - dsControl.verify(); + verify(con, times(2)).commit(); + verify(con, times(2)).close(); } + @Test public void testParticipatingTransactionWithRollbackOnlyAndInnerSynch() throws Exception { - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - con.getAutoCommit(); - conControl.setReturnValue(false, 1); - con.rollback(); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - con.close(); - conControl.setVoidCallable(1); - - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - conControl.replay(); - dsControl.replay(); - - DataSourceTransactionManager tm = new DataSourceTransactionManager(ds); tm.setTransactionSynchronization(DataSourceTransactionManager.SYNCHRONIZATION_NEVER); DataSourceTransactionManager tm2 = new DataSourceTransactionManager(ds); // tm has no synch enabled (used at outer level), tm2 has synch enabled (inner level) @@ -643,32 +529,12 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue(synch.beforeCompletionCalled); assertFalse(synch.afterCommitCalled); assertTrue(synch.afterCompletionCalled); - conControl.verify(); - dsControl.verify(); + verify(con).rollback(); + verify(con).close(); } + @Test public void testPropagationRequiresNewWithExistingTransaction() throws Exception { - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - con.getAutoCommit(); - conControl.setReturnValue(false, 2); - con.rollback(); - conControl.setVoidCallable(1); - con.commit(); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 2); - con.close(); - conControl.setVoidCallable(2); - - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con, 2); - conControl.replay(); - dsControl.replay(); - - PlatformTransactionManager tm = new DataSourceTransactionManager(ds); final TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); @@ -699,48 +565,17 @@ public class DataSourceTransactionManagerTests extends TestCase { }); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - conControl.verify(); - dsControl.verify(); + verify(con).rollback(); + verify(con).commit(); + verify(con, times(2)).close(); } + @Test public void testPropagationRequiresNewWithExistingTransactionAndUnrelatedDataSource() throws Exception { - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - con.getAutoCommit(); - conControl.setReturnValue(false, 1); - con.commit(); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - con.close(); - conControl.setVoidCallable(1); - - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - conControl.replay(); - dsControl.replay(); - - MockControl con2Control = MockControl.createControl(Connection.class); - Connection con2 = (Connection) con2Control.getMock(); - con2.getAutoCommit(); - con2Control.setReturnValue(false, 1); - con2.rollback(); - con2Control.setVoidCallable(1); - con2.isReadOnly(); - con2Control.setReturnValue(false, 1); - con2.close(); - con2Control.setVoidCallable(1); - - MockControl ds2Control = MockControl.createControl(DataSource.class); - final DataSource ds2 = (DataSource) ds2Control.getMock(); - ds2.getConnection(); - ds2Control.setReturnValue(con2, 1); - con2Control.replay(); - ds2Control.replay(); - - PlatformTransactionManager tm = new DataSourceTransactionManager(ds); + Connection con2 = mock(Connection.class); + final DataSource ds2 = mock(DataSource.class); + given(ds2.getConnection()).willReturn(con2); + final TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); @@ -778,39 +613,19 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds2)); - conControl.verify(); - dsControl.verify(); - con2Control.verify(); - ds2Control.verify(); + verify(con).commit(); + verify(con).close(); + verify(con2).rollback(); + verify(con2).close(); } + @Test public void testPropagationRequiresNewWithExistingTransactionAndUnrelatedFailingDataSource() throws Exception { - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - con.getAutoCommit(); - conControl.setReturnValue(false, 1); - con.rollback(); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - con.close(); - conControl.setVoidCallable(1); - - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - conControl.replay(); - dsControl.replay(); - - MockControl ds2Control = MockControl.createControl(DataSource.class); - final DataSource ds2 = (DataSource) ds2Control.getMock(); + final DataSource ds2 = mock(DataSource.class); SQLException failure = new SQLException(); - ds2.getConnection(); - ds2Control.setThrowable(failure); - ds2Control.replay(); + given(ds2.getConnection()).willThrow(failure); + - DataSourceTransactionManager tm = new DataSourceTransactionManager(ds); final TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); @@ -847,31 +662,12 @@ public class DataSourceTransactionManagerTests extends TestCase { assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds2)); - conControl.verify(); - dsControl.verify(); - ds2Control.verify(); + verify(con).rollback(); + verify(con).close(); } + @Test public void testPropagationNotSupportedWithExistingTransaction() throws Exception { - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - con.getAutoCommit(); - conControl.setReturnValue(false, 1); - con.commit(); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - con.close(); - conControl.setVoidCallable(1); - - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - conControl.replay(); - dsControl.replay(); - - PlatformTransactionManager tm = new DataSourceTransactionManager(ds); final TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); @@ -902,30 +698,12 @@ public class DataSourceTransactionManagerTests extends TestCase { }); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - conControl.verify(); - dsControl.verify(); + verify(con).commit(); + verify(con).close(); } + @Test public void testPropagationNeverWithExistingTransaction() throws Exception { - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - con.getAutoCommit(); - conControl.setReturnValue(false, 1); - con.rollback(); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - con.close(); - conControl.setVoidCallable(1); - - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - conControl.replay(); - dsControl.replay(); - - PlatformTransactionManager tm = new DataSourceTransactionManager(ds); final TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); @@ -952,31 +730,12 @@ public class DataSourceTransactionManagerTests extends TestCase { } assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - conControl.verify(); - dsControl.verify(); + verify(con).rollback(); + verify(con).close(); } + @Test public void testPropagationSupportsAndRequiresNew() throws Exception { - MockControl conControl = MockControl.createControl(Connection.class); - final Connection con = (Connection) conControl.getMock(); - con.getAutoCommit(); - conControl.setReturnValue(false, 1); - con.commit(); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - con.close(); - conControl.setVoidCallable(1); - - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - - dsControl.replay(); - conControl.replay(); - - final PlatformTransactionManager tm = new DataSourceTransactionManager(ds); TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); @@ -1002,39 +761,17 @@ public class DataSourceTransactionManagerTests extends TestCase { }); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - dsControl.verify(); - conControl.verify(); + verify(con).commit(); + verify(con).close(); } + @Test public void testPropagationSupportsAndRequiresNewWithEarlyAccess() throws Exception { - MockControl con1Control = MockControl.createControl(Connection.class); - final Connection con1 = (Connection) con1Control.getMock(); - con1.close(); - con1Control.setVoidCallable(1); - - MockControl con2Control = MockControl.createControl(Connection.class); - final Connection con2 = (Connection) con2Control.getMock(); - con2.getAutoCommit(); - con2Control.setReturnValue(false, 1); - con2.commit(); - con2Control.setVoidCallable(1); - con2.isReadOnly(); - con2Control.setReturnValue(false, 1); - con2.close(); - con2Control.setVoidCallable(1); - - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con1, 1); - ds.getConnection(); - dsControl.setReturnValue(con2, 1); - - dsControl.replay(); - con1Control.replay(); - con2Control.replay(); - - final PlatformTransactionManager tm = new DataSourceTransactionManager(ds); + final Connection con1 = mock(Connection.class); + final Connection con2 = mock(Connection.class); + given(ds.getConnection()).willReturn(con1, con2); + + final TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); @@ -1063,44 +800,16 @@ public class DataSourceTransactionManagerTests extends TestCase { }); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - dsControl.verify(); - con1Control.verify(); - con2Control.verify(); + verify(con1).close(); + verify(con2).commit(); + verify(con2).close(); } + @Test public void testTransactionWithIsolationAndReadOnly() throws Exception { - MockControl dsControl = MockControl.createControl(DataSource.class); - DataSource ds = (DataSource) dsControl.getMock(); - MockControl conControl = MockControl.createControl(Connection.class); - final Connection con = (Connection) conControl.getMock(); - - ds.getConnection(); - dsControl.setReturnValue(con, 1); - con.getTransactionIsolation(); - conControl.setReturnValue(Connection.TRANSACTION_READ_COMMITTED, 1); - con.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE); - conControl.setVoidCallable(1); - con.setReadOnly(true); - conControl.setVoidCallable(1); - con.getAutoCommit(); - conControl.setReturnValue(true, 1); - con.setAutoCommit(false); - conControl.setVoidCallable(1); - con.commit(); - conControl.setVoidCallable(1); - con.setAutoCommit(true); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - con.setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED); - conControl.setVoidCallable(1); - con.close(); - conControl.setVoidCallable(1); - - conControl.replay(); - dsControl.replay(); - - PlatformTransactionManager tm = new DataSourceTransactionManager(ds); + given(con.getTransactionIsolation()).willReturn(Connection.TRANSACTION_READ_COMMITTED); + given(con.getAutoCommit()).willReturn(true); + TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); tt.setIsolationLevel(TransactionDefinition.ISOLATION_SERIALIZABLE); @@ -1116,55 +825,30 @@ public class DataSourceTransactionManagerTests extends TestCase { }); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - conControl.verify(); - dsControl.verify(); + InOrder ordered = inOrder(con); + ordered.verify(con).setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE); + ordered.verify(con).setAutoCommit(false); + ordered.verify(con).commit(); + ordered.verify(con).setAutoCommit(true); + ordered.verify(con).setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED); + verify(con).close(); } + @Test public void testTransactionWithLongTimeout() throws Exception { doTestTransactionWithTimeout(10); } + @Test public void testTransactionWithShortTimeout() throws Exception { doTestTransactionWithTimeout(1); } private void doTestTransactionWithTimeout(int timeout) throws Exception { - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - MockControl conControl = MockControl.createControl(Connection.class); - final Connection con = (Connection) conControl.getMock(); - MockControl psControl = MockControl.createControl(PreparedStatement.class); - PreparedStatement ps = (PreparedStatement) psControl.getMock(); - - ds.getConnection(); - dsControl.setReturnValue(con, 1); - con.getAutoCommit(); - conControl.setReturnValue(true, 1); - con.setAutoCommit(false); - conControl.setVoidCallable(1); - con.prepareStatement("some SQL statement"); - conControl.setReturnValue(ps, 1); - if (timeout > 1) { - ps.setQueryTimeout(timeout - 1); - psControl.setVoidCallable(1); - con.commit(); - } - else { - con.rollback(); - } - conControl.setVoidCallable(1); - con.setAutoCommit(true); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - con.close(); - conControl.setVoidCallable(1); - - psControl.replay(); - conControl.replay(); - dsControl.replay(); - - PlatformTransactionManager tm = new DataSourceTransactionManager(ds); + PreparedStatement ps = mock(PreparedStatement.class); + given(con.getAutoCommit()).willReturn(true); + given(con.prepareStatement("some SQL statement")).willReturn(ps); + TransactionTemplate tt = new TransactionTemplate(tm); tt.setTimeout(timeout); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); @@ -1202,38 +886,24 @@ public class DataSourceTransactionManagerTests extends TestCase { } assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - conControl.verify(); - dsControl.verify(); - psControl.verify(); + if (timeout > 1) { + verify(ps).setQueryTimeout(timeout - 1); + verify(con).commit(); + } + else { + verify(con).rollback(); + } + InOrder ordered = inOrder(con); + ordered.verify(con).setAutoCommit(false); + ordered.verify(con).setAutoCommit(true); + verify(con).close(); + } + @Test public void testTransactionAwareDataSourceProxy() throws Exception { - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - MockControl conControl = MockControl.createControl(Connection.class); - final Connection con = (Connection) conControl.getMock(); - - ds.getConnection(); - dsControl.setReturnValue(con, 1); - con.getMetaData(); - conControl.setReturnValue(null, 1); - con.getAutoCommit(); - conControl.setReturnValue(true, 1); - con.setAutoCommit(false); - conControl.setVoidCallable(1); - con.commit(); - conControl.setVoidCallable(1); - con.setAutoCommit(true); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - con.close(); - conControl.setVoidCallable(1); - - conControl.replay(); - dsControl.replay(); - - PlatformTransactionManager tm = new DataSourceTransactionManager(ds); + given(con.getAutoCommit()).willReturn(true); + TransactionTemplate tt = new TransactionTemplate(tm); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); tt.execute(new TransactionCallbackWithoutResult() { @@ -1255,37 +925,17 @@ public class DataSourceTransactionManagerTests extends TestCase { }); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - conControl.verify(); - dsControl.verify(); + InOrder ordered = inOrder(con); + ordered.verify(con).setAutoCommit(false); + ordered.verify(con).commit(); + ordered.verify(con).setAutoCommit(true); + verify(con).close(); } + @Test public void testTransactionAwareDataSourceProxyWithSuspension() throws Exception { - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - MockControl conControl = MockControl.createControl(Connection.class); - final Connection con = (Connection) conControl.getMock(); - - ds.getConnection(); - dsControl.setReturnValue(con, 2); - con.getMetaData(); - conControl.setReturnValue(null, 2); - con.getAutoCommit(); - conControl.setReturnValue(true, 2); - con.setAutoCommit(false); - conControl.setVoidCallable(2); - con.commit(); - conControl.setVoidCallable(2); - con.setAutoCommit(true); - conControl.setVoidCallable(2); - con.isReadOnly(); - conControl.setReturnValue(false, 2); - con.close(); - conControl.setVoidCallable(2); - - conControl.replay(); - dsControl.replay(); - - PlatformTransactionManager tm = new DataSourceTransactionManager(ds); + given(con.getAutoCommit()).willReturn(true); + final TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionTemplate.PROPAGATION_REQUIRES_NEW); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); @@ -1335,37 +985,17 @@ public class DataSourceTransactionManagerTests extends TestCase { }); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - conControl.verify(); - dsControl.verify(); + InOrder ordered = inOrder(con); + ordered.verify(con).setAutoCommit(false); + ordered.verify(con).commit(); + ordered.verify(con).setAutoCommit(true); + verify(con, times(2)).close(); } + @Test public void testTransactionAwareDataSourceProxyWithSuspensionAndReobtaining() throws Exception { - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - MockControl conControl = MockControl.createControl(Connection.class); - final Connection con = (Connection) conControl.getMock(); - - ds.getConnection(); - dsControl.setReturnValue(con, 2); - con.getMetaData(); - conControl.setReturnValue(null, 2); - con.getAutoCommit(); - conControl.setReturnValue(true, 2); - con.setAutoCommit(false); - conControl.setVoidCallable(2); - con.commit(); - conControl.setVoidCallable(2); - con.setAutoCommit(true); - conControl.setVoidCallable(2); - con.isReadOnly(); - conControl.setReturnValue(false, 2); - con.close(); - conControl.setVoidCallable(2); - - conControl.replay(); - dsControl.replay(); - - PlatformTransactionManager tm = new DataSourceTransactionManager(ds); + given(con.getAutoCommit()).willReturn(true); + final TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionTemplate.PROPAGATION_REQUIRES_NEW); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); @@ -1416,28 +1046,20 @@ public class DataSourceTransactionManagerTests extends TestCase { }); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - conControl.verify(); - dsControl.verify(); + InOrder ordered = inOrder(con); + ordered.verify(con).setAutoCommit(false); + ordered.verify(con).commit(); + ordered.verify(con).setAutoCommit(true); + verify(con, times(2)).close(); } /** * Test behavior if the first operation on a connection (getAutoCommit) throws SQLException. */ + @Test public void testTransactionWithExceptionOnBegin() throws Exception { - MockControl conControl = MockControl.createControl(Connection.class); - final Connection con = (Connection) conControl.getMock(); - MockControl dsControl = MockControl.createControl(DataSource.class); - DataSource ds = (DataSource) dsControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - con.getAutoCommit(); - conControl.setThrowable(new SQLException("Cannot begin")); - con.close(); - conControl.setVoidCallable(); - conControl.replay(); - dsControl.replay(); - - PlatformTransactionManager tm = new DataSourceTransactionManager(ds); + willThrow(new SQLException("Cannot begin")).given(con).getAutoCommit(); + TransactionTemplate tt = new TransactionTemplate(tm); try { tt.execute(new TransactionCallbackWithoutResult() { @@ -1453,29 +1075,13 @@ public class DataSourceTransactionManagerTests extends TestCase { } assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - conControl.verify(); + verify(con).close(); } + @Test public void testTransactionWithExceptionOnCommit() throws Exception { - MockControl conControl = MockControl.createControl(Connection.class); - final Connection con = (Connection) conControl.getMock(); - MockControl dsControl = MockControl.createControl(DataSource.class); - DataSource ds = (DataSource) dsControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - con.getAutoCommit(); - // No need to restore it - conControl.setReturnValue(false, 1); - con.commit(); - conControl.setThrowable(new SQLException("Cannot commit"), 1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - con.close(); - conControl.setVoidCallable(1); - conControl.replay(); - dsControl.replay(); - - PlatformTransactionManager tm = new DataSourceTransactionManager(ds); + willThrow(new SQLException("Cannot commit")).given(con).commit(); + TransactionTemplate tt = new TransactionTemplate(tm); try { tt.execute(new TransactionCallbackWithoutResult() { @@ -1491,31 +1097,13 @@ public class DataSourceTransactionManagerTests extends TestCase { } assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - conControl.verify(); + verify(con).close(); } + @Test public void testTransactionWithExceptionOnCommitAndRollbackOnCommitFailure() throws Exception { - MockControl conControl = MockControl.createControl(Connection.class); - final Connection con = (Connection) conControl.getMock(); - MockControl dsControl = MockControl.createControl(DataSource.class); - DataSource ds = (DataSource) dsControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - con.getAutoCommit(); - // No need to change or restore - conControl.setReturnValue(false); - con.commit(); - conControl.setThrowable(new SQLException("Cannot commit"), 1); - con.rollback(); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - con.close(); - conControl.setVoidCallable(1); - conControl.replay(); - dsControl.replay(); - - DataSourceTransactionManager tm = new DataSourceTransactionManager(ds); + willThrow(new SQLException("Cannot commit")).given(con).commit(); + tm.setRollbackOnCommitFailure(true); TransactionTemplate tt = new TransactionTemplate(tm); try { @@ -1532,34 +1120,15 @@ public class DataSourceTransactionManagerTests extends TestCase { } assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - conControl.verify(); + verify(con).rollback(); + verify(con).close(); } + @Test public void testTransactionWithExceptionOnRollback() throws Exception { - MockControl conControl = MockControl.createControl(Connection.class); - final Connection con = (Connection) conControl.getMock(); - MockControl dsControl = MockControl.createControl(DataSource.class); - DataSource ds = (DataSource) dsControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - con.getAutoCommit(); - conControl.setReturnValue(true, 1); - // Must restore - con.setAutoCommit(false); - conControl.setVoidCallable(1); - - con.rollback(); - conControl.setThrowable(new SQLException("Cannot rollback"), 1); - con.setAutoCommit(true); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - con.close(); - conControl.setVoidCallable(1); - conControl.replay(); - dsControl.replay(); - - PlatformTransactionManager tm = new DataSourceTransactionManager(ds); + given(con.getAutoCommit()).willReturn(true); + willThrow(new SQLException("Cannot rollback")).given(con).rollback(); + TransactionTemplate tt = new TransactionTemplate(tm); try { tt.execute(new TransactionCallbackWithoutResult() { @@ -1575,15 +1144,15 @@ public class DataSourceTransactionManagerTests extends TestCase { } assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - conControl.verify(); + InOrder ordered = inOrder(con); + ordered.verify(con).setAutoCommit(false); + ordered.verify(con).rollback(); + ordered.verify(con).setAutoCommit(true); + verify(con).close(); } + @Test public void testTransactionWithPropagationSupports() throws Exception { - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - dsControl.replay(); - - PlatformTransactionManager tm = new DataSourceTransactionManager(ds); TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); @@ -1599,15 +1168,9 @@ public class DataSourceTransactionManagerTests extends TestCase { }); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - dsControl.verify(); } - public void testTransactionWithPropagationNotSupported() throws Exception { - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - dsControl.replay(); - - PlatformTransactionManager tm = new DataSourceTransactionManager(ds); + @Test public void testTransactionWithPropagationNotSupported() throws Exception { TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); @@ -1621,15 +1184,10 @@ public class DataSourceTransactionManagerTests extends TestCase { }); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - dsControl.verify(); } + @Test public void testTransactionWithPropagationNever() throws Exception { - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - dsControl.replay(); - - PlatformTransactionManager tm = new DataSourceTransactionManager(ds); TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NEVER); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); @@ -1643,54 +1201,28 @@ public class DataSourceTransactionManagerTests extends TestCase { }); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - dsControl.verify(); } + @Test public void testExistingTransactionWithPropagationNested() throws Exception { doTestExistingTransactionWithPropagationNested(1); } + @Test public void testExistingTransactionWithPropagationNestedTwice() throws Exception { doTestExistingTransactionWithPropagationNested(2); } private void doTestExistingTransactionWithPropagationNested(final int count) throws Exception { - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - MockControl mdControl = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData md = (DatabaseMetaData) mdControl.getMock(); - MockControl spControl = MockControl.createControl(Savepoint.class); - Savepoint sp = (Savepoint) spControl.getMock(); - - con.getAutoCommit(); - conControl.setReturnValue(false, 1); - md.supportsSavepoints(); - mdControl.setReturnValue(true, 1); - con.getMetaData(); - conControl.setReturnValue(md, 1); + DatabaseMetaData md = mock(DatabaseMetaData.class); + Savepoint sp = mock(Savepoint.class); + + given(md.supportsSavepoints()).willReturn(true); + given(con.getMetaData()).willReturn(md); for (int i = 1; i <= count; i++) { - con.setSavepoint(ConnectionHolder.SAVEPOINT_NAME_PREFIX + i); - conControl.setReturnValue(sp, 1); - con.releaseSavepoint(sp); - conControl.setVoidCallable(1); + given(con.setSavepoint(ConnectionHolder.SAVEPOINT_NAME_PREFIX + i)).willReturn(sp); } - con.commit(); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - con.close(); - conControl.setVoidCallable(1); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - - spControl.replay(); - mdControl.replay(); - conControl.replay(); - dsControl.replay(); - - PlatformTransactionManager tm = new DataSourceTransactionManager(ds); + final TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); @@ -1718,47 +1250,20 @@ public class DataSourceTransactionManagerTests extends TestCase { }); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - spControl.verify(); - mdControl.verify(); - conControl.verify(); - dsControl.verify(); + verify(con, times(count)).releaseSavepoint(sp); + verify(con).commit(); + verify(con).close(); } + @Test public void testExistingTransactionWithPropagationNestedAndRollback() throws Exception { - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - MockControl mdControl = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData md = (DatabaseMetaData) mdControl.getMock(); - MockControl spControl = MockControl.createControl(Savepoint.class); - Savepoint sp = (Savepoint) spControl.getMock(); - - ds.getConnection(); - dsControl.setReturnValue(con, 1); - con.getAutoCommit(); - conControl.setReturnValue(false, 1); - md.supportsSavepoints(); - mdControl.setReturnValue(true, 1); - con.getMetaData(); - conControl.setReturnValue(md, 1); - con.setSavepoint("SAVEPOINT_1"); - conControl.setReturnValue(sp, 1); - con.rollback(sp); - conControl.setVoidCallable(1); - con.commit(); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - con.close(); - conControl.setVoidCallable(1); - - spControl.replay(); - mdControl.replay(); - conControl.replay(); - dsControl.replay(); - - PlatformTransactionManager tm = new DataSourceTransactionManager(ds); + DatabaseMetaData md = mock(DatabaseMetaData.class); + Savepoint sp = mock(Savepoint.class); + + given(md.supportsSavepoints()).willReturn(true); + given(con.getMetaData()).willReturn(md); + given(con.setSavepoint("SAVEPOINT_1")).willReturn(sp); + final TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); @@ -1785,47 +1290,21 @@ public class DataSourceTransactionManagerTests extends TestCase { }); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - spControl.verify(); - mdControl.verify(); - conControl.verify(); - dsControl.verify(); + verify(con).rollback(sp); + verify(con).commit(); + verify(con).isReadOnly(); + verify(con).close(); } + @Test public void testExistingTransactionWithManualSavepoint() throws Exception { - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - MockControl mdControl = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData md = (DatabaseMetaData) mdControl.getMock(); - MockControl spControl = MockControl.createControl(Savepoint.class); - Savepoint sp = (Savepoint) spControl.getMock(); - - con.getAutoCommit(); - conControl.setReturnValue(false, 1); - md.supportsSavepoints(); - mdControl.setReturnValue(true, 1); - con.getMetaData(); - conControl.setReturnValue(md, 1); - con.setSavepoint("SAVEPOINT_1"); - conControl.setReturnValue(sp, 1); - con.releaseSavepoint(sp); - conControl.setVoidCallable(1); - con.commit(); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - con.close(); - conControl.setVoidCallable(1); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - - spControl.replay(); - mdControl.replay(); - conControl.replay(); - dsControl.replay(); - - PlatformTransactionManager tm = new DataSourceTransactionManager(ds); + DatabaseMetaData md = mock(DatabaseMetaData.class); + Savepoint sp = mock(Savepoint.class); + + given(md.supportsSavepoints()).willReturn(true); + given(con.getMetaData()).willReturn(md); + given(con.setSavepoint("SAVEPOINT_1")).willReturn(sp); + final TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); @@ -1842,47 +1321,21 @@ public class DataSourceTransactionManagerTests extends TestCase { }); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - spControl.verify(); - mdControl.verify(); - conControl.verify(); - dsControl.verify(); + verify(con).releaseSavepoint(sp); + verify(con).commit(); + verify(con).close(); + verify(ds).getConnection(); } + @Test public void testExistingTransactionWithManualSavepointAndRollback() throws Exception { - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - MockControl mdControl = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData md = (DatabaseMetaData) mdControl.getMock(); - MockControl spControl = MockControl.createControl(Savepoint.class); - Savepoint sp = (Savepoint) spControl.getMock(); - - ds.getConnection(); - dsControl.setReturnValue(con, 1); - con.getAutoCommit(); - conControl.setReturnValue(false, 1); - md.supportsSavepoints(); - mdControl.setReturnValue(true, 1); - con.getMetaData(); - conControl.setReturnValue(md, 1); - con.setSavepoint("SAVEPOINT_1"); - conControl.setReturnValue(sp, 1); - con.rollback(sp); - conControl.setVoidCallable(1); - con.commit(); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - con.close(); - conControl.setVoidCallable(1); - - spControl.replay(); - mdControl.replay(); - conControl.replay(); - dsControl.replay(); - - PlatformTransactionManager tm = new DataSourceTransactionManager(ds); + DatabaseMetaData md = mock(DatabaseMetaData.class); + Savepoint sp = mock(Savepoint.class); + + given(md.supportsSavepoints()).willReturn(true); + given(con.getMetaData()).willReturn(md); + given(con.setSavepoint("SAVEPOINT_1")).willReturn(sp); + final TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); @@ -1899,32 +1352,13 @@ public class DataSourceTransactionManagerTests extends TestCase { }); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - spControl.verify(); - mdControl.verify(); - conControl.verify(); - dsControl.verify(); + verify(con).rollback(sp); + verify(con).commit(); + verify(con).close(); } + @Test public void testTransactionWithPropagationNested() throws Exception { - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - con.getAutoCommit(); - conControl.setReturnValue(false, 1); - con.commit(); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - con.close(); - conControl.setVoidCallable(1); - - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - conControl.replay(); - dsControl.replay(); - - PlatformTransactionManager tm = new DataSourceTransactionManager(ds); final TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); @@ -1938,30 +1372,12 @@ public class DataSourceTransactionManagerTests extends TestCase { }); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - conControl.verify(); - dsControl.verify(); + verify(con).commit(); + verify(con).close(); } + @Test public void testTransactionWithPropagationNestedAndRollback() throws Exception { - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - con.getAutoCommit(); - conControl.setReturnValue(false, 1); - con.rollback(); - conControl.setVoidCallable(1); - con.isReadOnly(); - conControl.setReturnValue(false, 1); - con.close(); - conControl.setVoidCallable(1); - - MockControl dsControl = MockControl.createControl(DataSource.class); - final DataSource ds = (DataSource) dsControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con, 1); - conControl.replay(); - dsControl.replay(); - - PlatformTransactionManager tm = new DataSourceTransactionManager(ds); final TransactionTemplate tt = new TransactionTemplate(tm); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_NESTED); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); @@ -1976,19 +1392,10 @@ public class DataSourceTransactionManagerTests extends TestCase { }); assertTrue("Hasn't thread connection", !TransactionSynchronizationManager.hasResource(ds)); - conControl.verify(); - dsControl.verify(); - } - - @Override - protected void tearDown() { - assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty()); - assertFalse(TransactionSynchronizationManager.isSynchronizationActive()); - assertFalse(TransactionSynchronizationManager.isCurrentTransactionReadOnly()); - assertFalse(TransactionSynchronizationManager.isActualTransactionActive()); + verify(con).rollback(); + verify(con).close(); } - private static class TestTransactionSynchronization implements TransactionSynchronization { private DataSource dataSource; diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTest.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTest.java index 71283546f64..de22e56058e 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTest.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DelegatingDataSourceTest.java @@ -18,6 +18,9 @@ package org.springframework.jdbc.datasource; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import java.io.ByteArrayOutputStream; import java.io.PrintWriter; @@ -25,7 +28,6 @@ import java.sql.Connection; import javax.sql.DataSource; -import org.easymock.EasyMock; import org.junit.Before; import org.junit.Test; @@ -42,100 +44,78 @@ public class DelegatingDataSourceTest { @Before public void setup() { - this.delegate = EasyMock.createMock(DataSource.class); + this.delegate = mock(DataSource.class); this.dataSource = new DelegatingDataSource(delegate); } @Test public void shouldDelegateGetConnection() throws Exception { - Connection connection = EasyMock.createMock(Connection.class); - EasyMock.expect(delegate.getConnection()).andReturn(connection); - EasyMock.replay(delegate); + Connection connection = mock(Connection.class); + given(delegate.getConnection()).willReturn(connection); assertThat(dataSource.getConnection(), is(connection)); - EasyMock.verify(delegate); } @Test public void shouldDelegateGetConnectionWithUsernameAndPassword() throws Exception { - Connection connection = EasyMock.createMock(Connection.class); + Connection connection = mock(Connection.class); String username = "username"; String password = "password"; - EasyMock.expect(delegate.getConnection(username, password)).andReturn(connection); - EasyMock.replay(delegate); + given(delegate.getConnection(username, password)).willReturn(connection); assertThat(dataSource.getConnection(username, password), is(connection)); - EasyMock.verify(delegate); } @Test public void shouldDelegateGetLogWriter() throws Exception { PrintWriter writer = new PrintWriter(new ByteArrayOutputStream()); - EasyMock.expect(delegate.getLogWriter()).andReturn(writer); - EasyMock.replay(delegate); + given(delegate.getLogWriter()).willReturn(writer); assertThat(dataSource.getLogWriter(), is(writer)); - EasyMock.verify(delegate); } @Test public void shouldDelegateSetLogWriter() throws Exception { PrintWriter writer = new PrintWriter(new ByteArrayOutputStream()); - delegate.setLogWriter(writer); - EasyMock.expectLastCall(); - EasyMock.replay(delegate); dataSource.setLogWriter(writer); - EasyMock.verify(delegate); + verify(delegate).setLogWriter(writer); } @Test public void shouldDelegateGetLoginTimeout() throws Exception { int timeout = 123; - EasyMock.expect(delegate.getLoginTimeout()).andReturn(timeout); - EasyMock.replay(delegate); + given(delegate.getLoginTimeout()).willReturn(timeout); assertThat(dataSource.getLoginTimeout(), is(timeout)); - EasyMock.verify(delegate); } @Test public void shouldDelegateSetLoginTimeoutWithSeconds() throws Exception { int timeout = 123; - delegate.setLoginTimeout(timeout); - EasyMock.expectLastCall(); - EasyMock.replay(delegate); dataSource.setLoginTimeout(timeout); - EasyMock.verify(delegate); + verify(delegate).setLoginTimeout(timeout); } @Test public void shouldDelegateUnwrapWithoutImplementing() throws Exception { - ExampleWrapper wrapper = EasyMock.createMock(ExampleWrapper.class); - EasyMock.expect(delegate.unwrap(ExampleWrapper.class)).andReturn(wrapper); - EasyMock.replay(delegate); + ExampleWrapper wrapper = mock(ExampleWrapper.class); + given(delegate.unwrap(ExampleWrapper.class)).willReturn(wrapper); assertThat(dataSource.unwrap(ExampleWrapper.class), is(wrapper)); - EasyMock.verify(delegate); } @Test public void shouldDelegateUnwrapImplementing() throws Exception { dataSource = new DelegatingDataSourceWithWrapper(); - EasyMock.replay(delegate); assertThat(dataSource.unwrap(ExampleWrapper.class), is((ExampleWrapper) dataSource)); - EasyMock.verify(delegate); } @Test public void shouldDelegateIsWrapperForWithoutImplementing() throws Exception { - EasyMock.expect(delegate.isWrapperFor(ExampleWrapper.class)).andReturn(true); - EasyMock.replay(delegate); + given(delegate.isWrapperFor(ExampleWrapper.class)).willReturn(true); assertThat(dataSource.isWrapperFor(ExampleWrapper.class), is(true)); - EasyMock.verify(delegate); } @Test public void shouldDelegateIsWrapperForImplementing() throws Exception { dataSource = new DelegatingDataSourceWithWrapper(); - EasyMock.replay(delegate); assertThat(dataSource.isWrapperFor(ExampleWrapper.class), is(true)); - EasyMock.verify(delegate); } public static interface ExampleWrapper { diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java index 28b30408888..fd3d4a16547 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java @@ -16,34 +16,34 @@ package org.springframework.jdbc.datasource; +import static org.junit.Assert.*; +import static org.mockito.Mockito.mock; + import java.sql.Connection; import java.util.Properties; -import junit.framework.TestCase; -import org.easymock.MockControl; +import org.junit.Test; /** * @author Rod Johnson */ -public class DriverManagerDataSourceTests extends TestCase { +public class DriverManagerDataSourceTests { + + private Connection connection = mock(Connection.class); + @Test public void testStandardUsage() throws Exception { final String jdbcUrl = "url"; final String uname = "uname"; final String pwd = "pwd"; - MockControl ctrlConnection = - MockControl.createControl(Connection.class); - final Connection mockConnection = (Connection) ctrlConnection.getMock(); - ctrlConnection.replay(); - class TestDriverManagerDataSource extends DriverManagerDataSource { @Override protected Connection getConnectionFromDriverManager(String url, Properties props) { assertEquals(jdbcUrl, url); assertEquals(uname, props.getProperty("user")); assertEquals(pwd, props.getProperty("password")); - return mockConnection; + return connection; } } @@ -54,15 +54,14 @@ public class DriverManagerDataSourceTests extends TestCase { ds.setPassword(pwd); Connection actualCon = ds.getConnection(); - assertTrue(actualCon == mockConnection); + assertTrue(actualCon == connection); assertTrue(ds.getUrl().equals(jdbcUrl)); assertTrue(ds.getPassword().equals(pwd)); assertTrue(ds.getUsername().equals(uname)); - - ctrlConnection.verify(); } + @Test public void testUsageWithConnectionProperties() throws Exception { final String jdbcUrl = "url"; @@ -72,11 +71,6 @@ public class DriverManagerDataSourceTests extends TestCase { connProps.setProperty("user", "uname"); connProps.setProperty("password", "pwd"); - MockControl ctrlConnection = - MockControl.createControl(Connection.class); - final Connection mockConnection = (Connection) ctrlConnection.getMock(); - ctrlConnection.replay(); - class TestDriverManagerDataSource extends DriverManagerDataSource { @Override protected Connection getConnectionFromDriverManager(String url, Properties props) { @@ -85,7 +79,7 @@ public class DriverManagerDataSourceTests extends TestCase { assertEquals("pwd", props.getProperty("password")); assertEquals("myValue", props.getProperty("myProp")); assertEquals("yourValue", props.getProperty("yourProp")); - return mockConnection; + return connection; } } @@ -95,13 +89,12 @@ public class DriverManagerDataSourceTests extends TestCase { ds.setConnectionProperties(connProps); Connection actualCon = ds.getConnection(); - assertTrue(actualCon == mockConnection); + assertTrue(actualCon == connection); assertTrue(ds.getUrl().equals(jdbcUrl)); - - ctrlConnection.verify(); } + @Test public void testUsageWithConnectionPropertiesAndUserCredentials() throws Exception { final String jdbcUrl = "url"; final String uname = "uname"; @@ -113,11 +106,6 @@ public class DriverManagerDataSourceTests extends TestCase { connProps.setProperty("user", "uname2"); connProps.setProperty("password", "pwd2"); - MockControl ctrlConnection = - MockControl.createControl(Connection.class); - final Connection mockConnection = (Connection) ctrlConnection.getMock(); - ctrlConnection.replay(); - class TestDriverManagerDataSource extends DriverManagerDataSource { @Override protected Connection getConnectionFromDriverManager(String url, Properties props) { @@ -126,7 +114,7 @@ public class DriverManagerDataSourceTests extends TestCase { assertEquals(pwd, props.getProperty("password")); assertEquals("myValue", props.getProperty("myProp")); assertEquals("yourValue", props.getProperty("yourProp")); - return mockConnection; + return connection; } } @@ -138,15 +126,14 @@ public class DriverManagerDataSourceTests extends TestCase { ds.setConnectionProperties(connProps); Connection actualCon = ds.getConnection(); - assertTrue(actualCon == mockConnection); + assertTrue(actualCon == connection); assertTrue(ds.getUrl().equals(jdbcUrl)); assertTrue(ds.getPassword().equals(pwd)); assertTrue(ds.getUsername().equals(uname)); - - ctrlConnection.verify(); } + @Test public void testInvalidClassName() throws Exception { String bogusClassName = "foobar"; DriverManagerDataSource ds = new DriverManagerDataSource(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java index d020c2113cc..23223fc1d7f 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java @@ -16,68 +16,58 @@ package org.springframework.jdbc.datasource; +import static org.junit.Assert.assertEquals; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; + import java.sql.Connection; import java.sql.SQLException; import javax.sql.DataSource; -import junit.framework.TestCase; -import org.easymock.MockControl; +import org.junit.Test; /** * @author Juergen Hoeller * @since 28.05.2004 */ -public class UserCredentialsDataSourceAdapterTests extends TestCase { +public class UserCredentialsDataSourceAdapterTests { + @Test public void testStaticCredentials() throws SQLException { - MockControl dsControl = MockControl.createControl(DataSource.class); - DataSource ds = (DataSource) dsControl.getMock(); - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - ds.getConnection("user", "pw"); - dsControl.setReturnValue(con); - dsControl.replay(); - conControl.replay(); + DataSource dataSource = mock(DataSource.class); + Connection connection = mock(Connection.class); + given(dataSource.getConnection("user", "pw")).willReturn(connection); UserCredentialsDataSourceAdapter adapter = new UserCredentialsDataSourceAdapter(); - adapter.setTargetDataSource(ds); + adapter.setTargetDataSource(dataSource); adapter.setUsername("user"); adapter.setPassword("pw"); - assertEquals(con, adapter.getConnection()); + assertEquals(connection, adapter.getConnection()); } + @Test public void testNoCredentials() throws SQLException { - MockControl dsControl = MockControl.createControl(DataSource.class); - DataSource ds = (DataSource) dsControl.getMock(); - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - ds.getConnection(); - dsControl.setReturnValue(con); - dsControl.replay(); - conControl.replay(); - + DataSource dataSource = mock(DataSource.class); + Connection connection = mock(Connection.class); + given(dataSource.getConnection()).willReturn(connection); UserCredentialsDataSourceAdapter adapter = new UserCredentialsDataSourceAdapter(); - adapter.setTargetDataSource(ds); - assertEquals(con, adapter.getConnection()); + adapter.setTargetDataSource(dataSource); + assertEquals(connection, adapter.getConnection()); } + @Test public void testThreadBoundCredentials() throws SQLException { - MockControl dsControl = MockControl.createControl(DataSource.class); - DataSource ds = (DataSource) dsControl.getMock(); - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - ds.getConnection("user", "pw"); - dsControl.setReturnValue(con); - dsControl.replay(); - conControl.replay(); + DataSource dataSource = mock(DataSource.class); + Connection connection = mock(Connection.class); + given(dataSource.getConnection("user", "pw")).willReturn(connection); UserCredentialsDataSourceAdapter adapter = new UserCredentialsDataSourceAdapter(); - adapter.setTargetDataSource(ds); + adapter.setTargetDataSource(dataSource); adapter.setCredentialsForCurrentThread("user", "pw"); try { - assertEquals(con, adapter.getConnection()); + assertEquals(connection, adapter.getConnection()); } finally { adapter.removeCredentialsFromCurrentThread(); diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java index 4645558cd4e..2e5c67d0f2b 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java @@ -17,15 +17,14 @@ package org.springframework.jdbc.datasource.init; import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import java.sql.Connection; import java.sql.SQLException; -import org.easymock.EasyMock; - import org.junit.After; import org.junit.Test; - import org.springframework.core.io.ClassRelativeResourceLoader; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DataSourceUtils; @@ -257,15 +256,9 @@ public class DatabasePopulatorTests { public void usesBoundConnectionIfAvailable() throws SQLException { TransactionSynchronizationManager.initSynchronization(); Connection connection = DataSourceUtils.getConnection(db); - - DatabasePopulator populator = EasyMock.createMock(DatabasePopulator.class); - populator.populate(connection); - EasyMock.expectLastCall(); - EasyMock.replay(populator); - + DatabasePopulator populator = mock(DatabasePopulator.class); DatabasePopulatorUtils.execute(populator, db); - - EasyMock.verify(populator); + verify(populator).populate(connection); } /** diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java index 20f66ddf3d0..f178c5ef2ef 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java @@ -16,8 +16,11 @@ package org.springframework.jdbc.datasource.lookup; -import static org.easymock.EasyMock.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.fail; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; import javax.sql.DataSource; @@ -37,12 +40,10 @@ public class BeanFactoryDataSourceLookupTests { @Test public void testLookupSunnyDay() { - BeanFactory beanFactory = createMock(BeanFactory.class); + BeanFactory beanFactory = mock(BeanFactory.class); StubDataSource expectedDataSource = new StubDataSource(); - expect(beanFactory.getBean(DATASOURCE_BEAN_NAME, DataSource.class)).andReturn(expectedDataSource); - - replay(beanFactory); + given(beanFactory.getBean(DATASOURCE_BEAN_NAME, DataSource.class)).willReturn(expectedDataSource); BeanFactoryDataSourceLookup lookup = new BeanFactoryDataSourceLookup(); lookup.setBeanFactory(beanFactory); @@ -50,27 +51,21 @@ public class BeanFactoryDataSourceLookupTests { assertNotNull("A DataSourceLookup implementation must *never* return null from " + "getDataSource(): this one obviously (and incorrectly) is", dataSource); assertSame(expectedDataSource, dataSource); - - verify(beanFactory); } @Test public void testLookupWhereBeanFactoryYieldsNonDataSourceType() throws Exception { - final BeanFactory beanFactory = createMock(BeanFactory.class); + final BeanFactory beanFactory = mock(BeanFactory.class); - expect( - beanFactory.getBean(DATASOURCE_BEAN_NAME, DataSource.class) - ).andThrow(new BeanNotOfRequiredTypeException(DATASOURCE_BEAN_NAME, DataSource.class, String.class)); - - replay(beanFactory); + given(beanFactory.getBean(DATASOURCE_BEAN_NAME, DataSource.class)).willThrow( + new BeanNotOfRequiredTypeException(DATASOURCE_BEAN_NAME, + DataSource.class, String.class)); try { BeanFactoryDataSourceLookup lookup = new BeanFactoryDataSourceLookup(beanFactory); lookup.getDataSource(DATASOURCE_BEAN_NAME); fail("should have thrown DataSourceLookupFailureException"); } catch (DataSourceLookupFailureException ex) { /* expected */ } - - verify(beanFactory); } @Test(expected=IllegalStateException.class) diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java index b635c3a0cbe..9ff252a367e 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java @@ -16,30 +16,35 @@ package org.springframework.jdbc.object; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.PreparedStatement; import java.sql.Types; -import org.easymock.MockControl; -import org.apache.commons.logging.LogFactory; +import javax.sql.DataSource; -import org.springframework.jdbc.AbstractJdbcTests; +import org.junit.Test; import org.springframework.jdbc.core.SqlParameter; -import org.springframework.jdbc.core.JdbcTemplate; /** * @author Juergen Hoeller * @since 22.02.2005 */ -public class BatchSqlUpdateTests extends AbstractJdbcTests { - - private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled(); - +public class BatchSqlUpdateTests { + @Test public void testBatchUpdateWithExplicitFlush() throws Exception { doTestBatchUpdate(false); } + @Test public void testBatchUpdateWithFlushThroughBatchSize() throws Exception { doTestBatchUpdate(true); } @@ -49,42 +54,19 @@ public class BatchSqlUpdateTests extends AbstractJdbcTests { final int[] ids = new int[] { 100, 200 }; final int[] rowsAffected = new int[] { 1, 2 }; - MockControl ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - PreparedStatement mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - mockPreparedStatement.getConnection(); - ctrlPreparedStatement.setReturnValue(mockConnection); - mockPreparedStatement.setObject(1, new Integer(ids[0]), Types.INTEGER); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.addBatch(); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setObject(1, new Integer(ids[1]), Types.INTEGER); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.addBatch(); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeBatch(); - ctrlPreparedStatement.setReturnValue(rowsAffected); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - MockControl ctrlDatabaseMetaData = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData mockDatabaseMetaData = (DatabaseMetaData) ctrlDatabaseMetaData.getMock(); - mockDatabaseMetaData.supportsBatchUpdates(); - ctrlDatabaseMetaData.setReturnValue(true); - - mockConnection.prepareStatement(sql); - ctrlConnection.setReturnValue(mockPreparedStatement); - mockConnection.getMetaData(); - ctrlConnection.setReturnValue(mockDatabaseMetaData, 1); + Connection connection = mock(Connection.class); + DataSource dataSource = mock(DataSource.class); + given(dataSource.getConnection()).willReturn(connection); + PreparedStatement preparedStatement = mock(PreparedStatement.class); + given(preparedStatement.getConnection()).willReturn(connection); + given(preparedStatement.executeBatch()).willReturn(rowsAffected); - ctrlPreparedStatement.replay(); - ctrlDatabaseMetaData.replay(); - replay(); + DatabaseMetaData mockDatabaseMetaData = mock(DatabaseMetaData.class); + given(mockDatabaseMetaData.supportsBatchUpdates()).willReturn(true); + given(connection.prepareStatement(sql)).willReturn(preparedStatement); + given(connection.getMetaData()).willReturn(mockDatabaseMetaData); - BatchSqlUpdate update = new BatchSqlUpdate(mockDataSource, sql); + BatchSqlUpdate update = new BatchSqlUpdate(dataSource, sql); update.declareParameter(new SqlParameter(Types.INTEGER)); if (flushThroughBatchSize) { update.setBatchSize(2); @@ -122,8 +104,9 @@ public class BatchSqlUpdateTests extends AbstractJdbcTests { update.reset(); assertEquals(0, update.getRowsAffected().length); - ctrlPreparedStatement.verify(); - ctrlDatabaseMetaData.verify(); + verify(preparedStatement).setObject(1, new Integer(ids[0]), Types.INTEGER); + verify(preparedStatement).setObject(1, new Integer(ids[1]), Types.INTEGER); + verify(preparedStatement, times(2)).addBatch(); + verify(preparedStatement).close(); } - } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java index 5c00e0bf75a..85152b9a867 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java @@ -16,10 +16,13 @@ package org.springframework.jdbc.object; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.expectLastCall; +import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + +import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -28,119 +31,85 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.easymock.EasyMock; -import org.apache.commons.logging.LogFactory; -import org.junit.Test; -import org.junit.After; -import org.junit.Before; -import org.junit.runners.JUnit4; -import org.junit.runner.RunWith; +import javax.sql.DataSource; -import org.springframework.jdbc.AbstractJdbcTests; -import org.springframework.jdbc.Customer; -import org.springframework.jdbc.datasource.TestDataSourceWrapper; -import org.springframework.jdbc.core.JdbcTemplate; +import org.junit.Before; +import org.junit.Test; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.xml.XmlBeanFactory; import org.springframework.core.io.ClassPathResource; +import org.springframework.jdbc.Customer; +import org.springframework.jdbc.datasource.TestDataSourceWrapper; /** * @author Thomas Risberg */ -@RunWith(JUnit4.class) -public class GenericSqlQueryTests extends AbstractJdbcTests { +public class GenericSqlQueryTests { private static final String SELECT_ID_FORENAME_NAMED_PARAMETERS_PARSED = "select id, forename from custmr where id = ? and country = ?"; - private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled(); + private BeanFactory beanFactory; - private PreparedStatement mockPreparedStatement; - private ResultSet mockResultSet; + private Connection connection; - private BeanFactory bf; + private PreparedStatement preparedStatement; + private ResultSet resultSet; - @Override @Before public void setUp() throws Exception { - super.setUp(); - mockPreparedStatement = createMock(PreparedStatement.class); - mockResultSet = createMock(ResultSet.class); - this.bf = new XmlBeanFactory( + this.beanFactory = new XmlBeanFactory( new ClassPathResource("org/springframework/jdbc/object/GenericSqlQueryTests-context.xml")); - TestDataSourceWrapper testDataSource = (TestDataSourceWrapper) bf.getBean("dataSource"); - testDataSource.setTarget(mockDataSource); - } - - @Override - @After - public void tearDown() throws Exception { - super.tearDown(); - if (shouldVerify()) { - EasyMock.verify(mockPreparedStatement); - EasyMock.verify(mockResultSet); - } - } - - @Override - protected void replay() { - super.replay(); - EasyMock.replay(mockPreparedStatement); - EasyMock.replay(mockResultSet); + DataSource dataSource = mock(DataSource.class); + this.connection = mock(Connection.class); + this.preparedStatement = mock(PreparedStatement.class); + this.resultSet = mock(ResultSet.class); + given(dataSource.getConnection()).willReturn(connection); + TestDataSourceWrapper testDataSource = (TestDataSourceWrapper) beanFactory.getBean("dataSource"); + testDataSource.setTarget(dataSource); } @Test public void testPlaceHoldersCustomerQuery() throws SQLException { - SqlQuery query = (SqlQuery) bf.getBean("queryWithPlaceHolders"); - testCustomerQuery(query, false); + SqlQuery query = (SqlQuery) beanFactory.getBean("queryWithPlaceHolders"); + doTestCustomerQuery(query, false); } @Test public void testNamedParameterCustomerQuery() throws SQLException { - SqlQuery query = (SqlQuery) bf.getBean("queryWithNamedParameters"); - testCustomerQuery(query, true); + SqlQuery query = (SqlQuery) beanFactory.getBean("queryWithNamedParameters"); + doTestCustomerQuery(query, true); } - private void testCustomerQuery(SqlQuery query, boolean namedParameters) throws SQLException { - expect(mockResultSet.next()).andReturn(true); - expect(mockResultSet.getInt("id")).andReturn(1); - expect(mockResultSet.getString("forename")).andReturn("rod"); - expect(mockResultSet.next()).andReturn(false); - mockResultSet.close(); - expectLastCall(); - - mockPreparedStatement.setObject(1, new Integer(1), Types.INTEGER); - expectLastCall(); - mockPreparedStatement.setString(2, "UK"); - expectLastCall(); - expect(mockPreparedStatement.executeQuery()).andReturn(mockResultSet); - if (debugEnabled) { - expect(mockPreparedStatement.getWarnings()).andReturn(null); - } - mockPreparedStatement.close(); - expectLastCall(); - - mockConnection.prepareStatement(SELECT_ID_FORENAME_NAMED_PARAMETERS_PARSED); - ctrlConnection.setReturnValue(mockPreparedStatement); + private void doTestCustomerQuery(SqlQuery query, boolean namedParameters) throws SQLException { + given(resultSet.next()).willReturn(true); + given(resultSet.getInt("id")).willReturn(1); + given(resultSet.getString("forename")).willReturn("rod"); + given(resultSet.next()).willReturn(true, false); + given(preparedStatement.executeQuery()).willReturn(resultSet); + given(connection.prepareStatement(SELECT_ID_FORENAME_NAMED_PARAMETERS_PARSED)).willReturn(preparedStatement); - replay(); - - List l; + List queryResults; if (namedParameters) { Map params = new HashMap(2); params.put("id", new Integer(1)); params.put("country", "UK"); - l = query.executeByNamedParam(params); + queryResults = query.executeByNamedParam(params); } else { Object[] params = new Object[] {new Integer(1), "UK"}; - l = query.execute(params); + queryResults = query.execute(params); } - assertTrue("Customer was returned correctly", l.size() == 1); - Customer cust = (Customer) l.get(0); + assertTrue("Customer was returned correctly", queryResults.size() == 1); + Customer cust = (Customer) queryResults.get(0); assertTrue("Customer id was assigned correctly", cust.getId() == 1); assertTrue("Customer forename was assigned correctly", cust.getForename().equals("rod")); + + verify(resultSet).close(); + verify(preparedStatement).setObject(1, new Integer(1), Types.INTEGER); + verify(preparedStatement).setString(2, "UK"); + verify(preparedStatement).close(); } -} \ No newline at end of file +} diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java index 9c1ff6069e7..6b1760ac8b5 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java @@ -16,104 +16,63 @@ package org.springframework.jdbc.object; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.expectLastCall; +import static org.junit.Assert.assertEquals; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; import java.sql.CallableStatement; +import java.sql.Connection; import java.sql.Types; import java.util.HashMap; import java.util.Map; -import org.easymock.EasyMock; +import javax.sql.DataSource; + import org.apache.commons.logging.LogFactory; import org.junit.Test; -import org.junit.After; -import org.junit.Before; -import org.junit.runners.JUnit4; -import org.junit.runner.RunWith; - -import org.springframework.jdbc.AbstractJdbcTests; -import org.springframework.jdbc.datasource.TestDataSourceWrapper; -import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.xml.XmlBeanFactory; import org.springframework.core.io.ClassPathResource; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.datasource.TestDataSourceWrapper; /** * @author Thomas Risberg */ -@RunWith(JUnit4.class) -public class GenericStoredProcedureTests extends AbstractJdbcTests { +public class GenericStoredProcedureTests { private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled(); - private CallableStatement mockCallable; - - private BeanFactory bf; - - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - mockCallable = createMock(CallableStatement.class); - bf = new XmlBeanFactory( - new ClassPathResource("org/springframework/jdbc/object/GenericStoredProcedureTests-context.xml")); - TestDataSourceWrapper testDataSource = (TestDataSourceWrapper) bf.getBean("dataSource"); - testDataSource.setTarget(mockDataSource); - } - - @Override - @After - public void tearDown() throws Exception { - super.tearDown(); - if (shouldVerify()) { - EasyMock.verify(mockCallable); - } - } - - @Override - protected void replay() { - super.replay(); - EasyMock.replay(mockCallable); - } - @Test public void testAddInvoices() throws Exception { + BeanFactory bf = new XmlBeanFactory( + new ClassPathResource("org/springframework/jdbc/object/GenericStoredProcedureTests-context.xml")); + Connection connection = mock(Connection.class); + DataSource dataSource = mock(DataSource.class); + given(dataSource.getConnection()).willReturn(connection); + CallableStatement callableStatement = mock(CallableStatement.class); + TestDataSourceWrapper testDataSource = (TestDataSourceWrapper) bf.getBean("dataSource"); + testDataSource.setTarget(dataSource); - mockCallable.setObject(1, new Integer(1106), Types.INTEGER); - expectLastCall(); - mockCallable.setObject(2, new Integer(3), Types.INTEGER); - expectLastCall(); - mockCallable.registerOutParameter(3, Types.INTEGER); - expectLastCall(); - expect(mockCallable.execute()).andReturn(false); - expect(mockCallable.getUpdateCount()).andReturn(-1); - expect(mockCallable.getObject(3)).andReturn(new Integer(4)); - if (debugEnabled) { - expect(mockCallable.getWarnings()).andReturn(null); - } - mockCallable.close(); - expectLastCall(); - - mockConnection.prepareCall("{call " + "add_invoice" + "(?, ?, ?)}"); - ctrlConnection.setReturnValue(mockCallable); - - replay(); + given(callableStatement.execute()).willReturn(false); + given(callableStatement.getUpdateCount()).willReturn(-1); + given(callableStatement.getObject(3)).willReturn(new Integer(4)); - testAddInvoice(1106, 3); - } - - private void testAddInvoice(final int amount, final int custid) - throws Exception { + given(connection.prepareCall("{call " + "add_invoice" + "(?, ?, ?)}")).willReturn(callableStatement); StoredProcedure adder = (StoredProcedure) bf.getBean("genericProcedure"); Map in = new HashMap(2); - in.put("amount", amount); - in.put("custid", custid); + in.put("amount", 1106); + in.put("custid", 3); Map out = adder.execute(in); Integer id = (Integer) out.get("newid"); assertEquals(4, id.intValue()); + + verify(callableStatement).setObject(1, new Integer(1106), Types.INTEGER); + verify(callableStatement).setObject(2, new Integer(3), Types.INTEGER); + verify(callableStatement).registerOutParameter(3, Types.INTEGER); + verify(callableStatement).close(); } -} \ No newline at end of file +} diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java index 478328af8cc..535dca239ed 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java @@ -16,362 +16,191 @@ package org.springframework.jdbc.object; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.sql.Types; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import javax.sql.DataSource; -import org.easymock.MockControl; -import org.apache.commons.logging.LogFactory; - +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; import org.springframework.dao.IncorrectResultSizeDataAccessException; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.jdbc.AbstractJdbcTests; import org.springframework.jdbc.Customer; -import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.SqlParameter; -import junit.framework.Assert; - /** * @author Trevor Cook * @author Thomas Risberg * @author Juergen Hoeller */ -public class SqlQueryTests extends AbstractJdbcTests { +public class SqlQueryTests { - private static final String SELECT_ID = "select id from custmr"; + //FIXME inline? + private static final String SELECT_ID = + "select id from custmr"; private static final String SELECT_ID_WHERE = - "select id from custmr where forename = ? and id = ?"; - private static final String SELECT_FORENAME = "select forename from custmr"; + "select id from custmr where forename = ? and id = ?"; + private static final String SELECT_FORENAME = + "select forename from custmr"; private static final String SELECT_FORENAME_EMPTY = - "select forename from custmr WHERE 1 = 2"; + "select forename from custmr WHERE 1 = 2"; private static final String SELECT_ID_FORENAME_WHERE = - "select id, forename from prefix:custmr where forename = ?"; + "select id, forename from prefix:custmr where forename = ?"; private static final String SELECT_ID_FORENAME_NAMED_PARAMETERS = - "select id, forename from custmr where id = :id and country = :country"; + "select id, forename from custmr where id = :id and country = :country"; private static final String SELECT_ID_FORENAME_NAMED_PARAMETERS_PARSED = - "select id, forename from custmr where id = ? and country = ?"; + "select id, forename from custmr where id = ? and country = ?"; private static final String SELECT_ID_FORENAME_WHERE_ID_IN_LIST_1 = - "select id, forename from custmr where id in (?, ?)"; + "select id, forename from custmr where id in (?, ?)"; private static final String SELECT_ID_FORENAME_WHERE_ID_IN_LIST_2 = - "select id, forename from custmr where id in (:ids)"; + "select id, forename from custmr where id in (:ids)"; private static final String SELECT_ID_FORENAME_WHERE_ID_REUSED_1 = - "select id, forename from custmr where id = ? or id = ?)"; + "select id, forename from custmr where id = ? or id = ?)"; private static final String SELECT_ID_FORENAME_WHERE_ID_REUSED_2 = - "select id, forename from custmr where id = :id1 or id = :id1)"; + "select id, forename from custmr where id = :id1 or id = :id1)"; private static final String SELECT_ID_FORENAME_WHERE_ID = - "select id, forename from custmr where id <= ?"; + "select id, forename from custmr where id <= ?"; private static final String[] COLUMN_NAMES = new String[] {"id", "forename"}; private static final int[] COLUMN_TYPES = new int[] {Types.INTEGER, Types.VARCHAR}; - private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled(); - - private MockControl ctrlPreparedStatement; - private PreparedStatement mockPreparedStatement; - private MockControl ctrlResultSet; - private ResultSet mockResultSet; + @Rule + public ExpectedException thrown = ExpectedException.none(); + private Connection connection; + private DataSource dataSource; + private PreparedStatement preparedStatement; + private ResultSet resultSet; - @Override - protected void setUp() throws Exception { - super.setUp(); - ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); - ctrlResultSet = MockControl.createControl(ResultSet.class); - mockResultSet = (ResultSet) ctrlResultSet.getMock(); - } - @Override - protected void tearDown() throws Exception { - super.tearDown(); - if (shouldVerify()) { - ctrlPreparedStatement.verify(); - ctrlResultSet.verify(); - } + @Before + public void setUp() throws Exception { + this.connection = mock(Connection.class); + this.dataSource = mock(DataSource.class); + this.preparedStatement = mock(PreparedStatement.class); + this.resultSet = mock(ResultSet.class); + given(this.dataSource.getConnection()).willReturn(this.connection); + given(this.connection.prepareStatement(anyString())).willReturn(this.preparedStatement); + given(preparedStatement.executeQuery()).willReturn(resultSet); } - @Override - protected void replay() { - super.replay(); - ctrlPreparedStatement.replay(); - ctrlResultSet.replay(); - } - - + @Test public void testQueryWithoutParams() throws SQLException { - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt(1); - ctrlResultSet.setReturnValue(1); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(SELECT_ID); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); + given(resultSet.next()).willReturn(true, false); + given(resultSet.getInt(1)).willReturn(1); - SqlQuery query = new MappingSqlQueryWithParameters() { + SqlQuery query = new MappingSqlQueryWithParameters() { @Override - protected Object mapRow(ResultSet rs, int rownum, Object[] params, Map context) throws SQLException { + protected Integer mapRow(ResultSet rs, int rownum, Object[] params, Map context) throws SQLException { assertTrue("params were null", params == null); assertTrue("context was null", context == null); - return new Integer(rs.getInt(1)); + return rs.getInt(1); } }; - - query.setDataSource(mockDataSource); + query.setDataSource(dataSource); query.setSql(SELECT_ID); query.compile(); - List list = query.execute(); - assertTrue("Found customers", list.size() != 0); - for (Iterator itr = list.iterator(); itr.hasNext();) { - Integer id = (Integer) itr.next(); - assertTrue( - "Customer id was assigned correctly", - id.intValue() == 1); - } + List list = query.execute(); + + assertThat(list, is(equalTo(Arrays.asList(1)))); + verify(connection).prepareStatement(SELECT_ID); + verify(resultSet).close(); + verify(preparedStatement).close(); } + @Test public void testQueryWithoutEnoughParams() { - replay(); - - MappingSqlQuery query = new MappingSqlQuery() { + MappingSqlQuery query = new MappingSqlQuery() { @Override - protected Object mapRow(ResultSet rs, int rownum) throws SQLException { - return new Integer(rs.getInt(1)); + protected Integer mapRow(ResultSet rs, int rownum) throws SQLException { + return rs.getInt(1); } - }; - query.setDataSource(mockDataSource); + query.setDataSource(dataSource); query.setSql(SELECT_ID_WHERE); - query.declareParameter( - new SqlParameter(COLUMN_NAMES[0], COLUMN_TYPES[0])); - query.declareParameter( - new SqlParameter(COLUMN_NAMES[1], COLUMN_TYPES[1])); + query.declareParameter(new SqlParameter(COLUMN_NAMES[0], COLUMN_TYPES[0])); + query.declareParameter(new SqlParameter(COLUMN_NAMES[1], COLUMN_TYPES[1])); query.compile(); - try { - List list = query.execute(); - fail("Shouldn't succeed in running query without enough params"); - } - catch (InvalidDataAccessApiUsageException ex) { - // OK - } + thrown.expect(InvalidDataAccessApiUsageException.class); + query.execute(); } + @Test public void testQueryWithMissingMapParams() { - replay(); - - MappingSqlQuery query = new MappingSqlQuery() { + MappingSqlQuery query = new MappingSqlQuery() { @Override - protected Object mapRow(ResultSet rs, int rownum) throws SQLException { - return new Integer(rs.getInt(1)); + protected Integer mapRow(ResultSet rs, int rownum) throws SQLException { + return rs.getInt(1); } }; - query.setDataSource(mockDataSource); + query.setDataSource(dataSource); query.setSql(SELECT_ID_WHERE); - query.declareParameter( - new SqlParameter(COLUMN_NAMES[0], COLUMN_TYPES[0])); - query.declareParameter( - new SqlParameter(COLUMN_NAMES[1], COLUMN_TYPES[1])); + query.declareParameter(new SqlParameter(COLUMN_NAMES[0], COLUMN_TYPES[0])); + query.declareParameter(new SqlParameter(COLUMN_NAMES[1], COLUMN_TYPES[1])); query.compile(); - try { - Map params = new HashMap(); - params.put(COLUMN_NAMES[0], "Value"); - List list = query.executeByNamedParam(params); - fail("Shouldn't succeed in running query with missing params"); - } - catch (InvalidDataAccessApiUsageException ex) { - // OK - } + thrown.expect(InvalidDataAccessApiUsageException.class); + query.executeByNamedParam(Collections.singletonMap(COLUMN_NAMES[0], "value")); } + @Test public void testStringQueryWithResults() throws Exception { String[] dbResults = new String[] { "alpha", "beta", "charlie" }; - - MockControl[] ctrlCountResultSetMetaData = new MockControl[3]; - ResultSetMetaData[] mockCountResultSetMetaData = new ResultSetMetaData[3]; - MockControl[] ctrlCountResultSet = new MockControl[3]; - ResultSet[] mockCountResultSet = new ResultSet[3]; - MockControl[] ctrlCountPreparedStatement = new MockControl[3]; - PreparedStatement[] mockCountPreparedStatement = new PreparedStatement[3]; - - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getString(1); - ctrlResultSet.setReturnValue(dbResults[0]); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getString(1); - ctrlResultSet.setReturnValue(dbResults[1]); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getString(1); - ctrlResultSet.setReturnValue(dbResults[2]); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(SELECT_FORENAME); - ctrlConnection.setReturnValue(mockPreparedStatement); - - for (int i = 0; i < dbResults.length; i++) { - ctrlCountResultSetMetaData[i] = MockControl.createControl(ResultSetMetaData.class); - mockCountResultSetMetaData[i] = (ResultSetMetaData) ctrlCountResultSetMetaData[i].getMock(); - mockCountResultSetMetaData[i].getColumnCount(); - ctrlCountResultSetMetaData[i].setReturnValue(1); - - ctrlCountResultSet[i] = MockControl.createControl(ResultSet.class); - mockCountResultSet[i] = (ResultSet) ctrlCountResultSet[i].getMock(); - mockCountResultSet[i].getMetaData(); - ctrlCountResultSet[i].setReturnValue(mockCountResultSetMetaData[i]); - mockCountResultSet[i].next(); - ctrlCountResultSet[i].setReturnValue(true); - mockCountResultSet[i].getInt(1); - ctrlCountResultSet[i].setReturnValue(1); - mockCountResultSet[i].wasNull(); - ctrlCountResultSet[i].setReturnValue(false); - mockCountResultSet[i].next(); - ctrlCountResultSet[i].setReturnValue(false); - mockCountResultSet[i].close(); - ctrlCountResultSet[i].setVoidCallable(); - - ctrlCountPreparedStatement[i] = MockControl.createControl(PreparedStatement.class); - mockCountPreparedStatement[i] = (PreparedStatement) ctrlCountPreparedStatement[i].getMock(); - mockCountPreparedStatement[i].executeQuery(); - ctrlCountPreparedStatement[i].setReturnValue(mockCountResultSet[i]); - if (debugEnabled) { - mockCountPreparedStatement[i].getWarnings(); - ctrlCountPreparedStatement[i].setReturnValue(null); - } - mockCountPreparedStatement[i].close(); - ctrlCountPreparedStatement[i].setVoidCallable(); - - mockConnection.prepareStatement( - "SELECT COUNT(FORENAME) FROM CUSTMR WHERE FORENAME='" + dbResults[i] + "'"); - ctrlConnection.setReturnValue(mockCountPreparedStatement[i]); - - ctrlCountResultSetMetaData[i].replay(); - ctrlCountResultSet[i].replay(); - ctrlCountPreparedStatement[i].replay(); - } - - replay(); - - StringQuery query = new StringQuery(mockDataSource, SELECT_FORENAME); + given(resultSet.next()).willReturn(true, true, true, false); + given(resultSet.getString(1)).willReturn(dbResults[0], dbResults[1], dbResults[2]); + StringQuery query = new StringQuery(dataSource, SELECT_FORENAME); query.setRowsExpected(3); String[] results = query.run(); - assertTrue("Array is non null", results != null); - assertTrue("Found results", results.length > 0); - assertTrue( - "Found expected number of results", - query.getRowsExpected() == 3); - - JdbcTemplate helper = new JdbcTemplate(mockDataSource); - for (int i = 0; i < results.length; i++) { - // BREAKS ON ' in name - int dbCount = helper.queryForInt( - "SELECT COUNT(FORENAME) FROM CUSTMR WHERE FORENAME='" + results[i] + "'", (Object[]) null); - assertTrue("found in db", dbCount == 1); - } - - for (int i = 0; i < dbResults.length; i++) { - ctrlCountResultSetMetaData[i].verify(); - ctrlCountResultSet[i].verify(); - ctrlCountPreparedStatement[i].verify(); - } + assertThat(results, is(equalTo(dbResults))); + verify(connection).prepareStatement(SELECT_FORENAME); + verify(resultSet).close(); + verify(preparedStatement).close(); + verify(connection).close(); } + @Test public void testStringQueryWithoutResults() throws SQLException { - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(SELECT_FORENAME_EMPTY); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - StringQuery query = new StringQuery(mockDataSource, SELECT_FORENAME_EMPTY); + given(resultSet.next()).willReturn(false); + StringQuery query = new StringQuery(dataSource, SELECT_FORENAME_EMPTY); String[] results = query.run(); - assertTrue("Array is non null", results != null); - assertTrue("Found 0 results", results.length == 0); + assertThat(results, is(equalTo(new String[0]))); + verify(connection).prepareStatement(SELECT_FORENAME_EMPTY); + verify(resultSet).close(); + verify(preparedStatement).close(); + verify(connection).close(); } + @Test public void testFindCustomerIntInt() throws SQLException { - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt("id"); - ctrlResultSet.setReturnValue(1); - mockResultSet.getString("forename"); - ctrlResultSet.setReturnValue("rod"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setObject(2, new Integer(1), Types.NUMERIC); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); + given(resultSet.next()).willReturn(true, false); + given(resultSet.getInt("id")).willReturn(1); + given(resultSet.getString("forename")).willReturn("rod"); - mockConnection.prepareStatement(SELECT_ID_WHERE); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - class CustomerQuery extends MappingSqlQuery { + class CustomerQuery extends MappingSqlQuery { public CustomerQuery(DataSource ds) { super(ds, SELECT_ID_WHERE); @@ -381,7 +210,7 @@ public class SqlQueryTests extends AbstractJdbcTests { } @Override - protected Object mapRow(ResultSet rs, int rownum) throws SQLException { + protected Customer mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); cust.setForename(rs.getString(COLUMN_NAMES[1])); @@ -389,48 +218,30 @@ public class SqlQueryTests extends AbstractJdbcTests { } public Customer findCustomer(int id, int otherNum) { - return (Customer) findObject(id, otherNum); + return findObject(id, otherNum); } } - CustomerQuery query = new CustomerQuery(mockDataSource); + CustomerQuery query = new CustomerQuery(dataSource); Customer cust = query.findCustomer(1, 1); assertTrue("Customer id was assigned correctly", cust.getId() == 1); - assertTrue( - "Customer forename was assigned correctly", - cust.getForename().equals("rod")); + assertTrue("Customer forename was assigned correctly", cust.getForename().equals("rod")); + verify(preparedStatement).setObject(1, 1, Types.NUMERIC); + verify(preparedStatement).setObject(2, 1, Types.NUMERIC); + verify(connection).prepareStatement(SELECT_ID_WHERE); + verify(resultSet).close(); + verify(preparedStatement).close(); + verify(connection).close(); } + @Test public void testFindCustomerString() throws SQLException { - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt("id"); - ctrlResultSet.setReturnValue(1); - mockResultSet.getString("forename"); - ctrlResultSet.setReturnValue("rod"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setString(1, "rod"); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(SELECT_ID_FORENAME_WHERE); - ctrlConnection.setReturnValue(mockPreparedStatement); + given(resultSet.next()).willReturn(true, false); + given(resultSet.getInt("id")).willReturn(1); + given(resultSet.getString("forename")).willReturn("rod"); - replay(); - - class CustomerQuery extends MappingSqlQuery { + class CustomerQuery extends MappingSqlQuery { public CustomerQuery(DataSource ds) { super(ds, SELECT_ID_FORENAME_WHERE); @@ -439,7 +250,7 @@ public class SqlQueryTests extends AbstractJdbcTests { } @Override - protected Object mapRow(ResultSet rs, int rownum) throws SQLException { + protected Customer mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); cust.setForename(rs.getString(COLUMN_NAMES[1])); @@ -447,91 +258,46 @@ public class SqlQueryTests extends AbstractJdbcTests { } public Customer findCustomer(String id) { - return (Customer) findObject(id); + return findObject(id); } } - CustomerQuery query = new CustomerQuery(mockDataSource); + CustomerQuery query = new CustomerQuery(dataSource); Customer cust = query.findCustomer("rod"); assertTrue("Customer id was assigned correctly", cust.getId() == 1); - assertTrue("Customer forename was assigned correctly", cust.getForename().equals("rod")); + assertTrue("Customer forename was assigned correctly", + cust.getForename().equals("rod")); + verify(preparedStatement).setString(1, "rod"); + verify(connection).prepareStatement(SELECT_ID_FORENAME_WHERE); + verify(resultSet).close(); + verify(preparedStatement).close(); + verify(connection).close(); } + @Test public void testFindCustomerMixed() throws SQLException { - MockControl ctrlResultSet2; - ResultSet mockResultSet2; - MockControl ctrlPreparedStatement2; - PreparedStatement mockPreparedStatement2; - - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt("id"); - ctrlResultSet.setReturnValue(1); - mockResultSet.getString("forename"); - ctrlResultSet.setReturnValue("rod"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(1), Types.INTEGER); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setString(2, "rod"); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - ctrlResultSet2 = MockControl.createControl(ResultSet.class); - mockResultSet2 = (ResultSet) ctrlResultSet2.getMock(); - mockResultSet2.next(); - ctrlResultSet2.setReturnValue(false); - mockResultSet2.close(); - ctrlResultSet2.setVoidCallable(); - - ctrlPreparedStatement2 = MockControl.createControl(PreparedStatement.class); - mockPreparedStatement2 = (PreparedStatement) ctrlPreparedStatement2.getMock(); - mockPreparedStatement2.setObject(1, new Integer(1), Types.INTEGER); - ctrlPreparedStatement2.setVoidCallable(); - mockPreparedStatement2.setString(2, "Roger"); - ctrlPreparedStatement2.setVoidCallable(); - mockPreparedStatement2.executeQuery(); - ctrlPreparedStatement2.setReturnValue(mockResultSet2); - if (debugEnabled) { - mockPreparedStatement2.getWarnings(); - ctrlPreparedStatement2.setReturnValue(null); - } - mockPreparedStatement2.close(); - ctrlPreparedStatement2.setVoidCallable(); - - mockConnection.prepareStatement(SELECT_ID_WHERE); - ctrlConnection.setReturnValue(mockPreparedStatement); - mockConnection.prepareStatement(SELECT_ID_WHERE); - ctrlConnection.setReturnValue(mockPreparedStatement2); - - ctrlResultSet2.replay(); - ctrlPreparedStatement2.replay(); - replay(); - - class CustomerQuery extends MappingSqlQuery { + reset(connection); + PreparedStatement preparedStatement2 = mock(PreparedStatement.class); + ResultSet resultSet2 = mock(ResultSet.class); + given(preparedStatement2.executeQuery()).willReturn(resultSet2); + given(resultSet.next()).willReturn(true, false); + given(resultSet.getInt("id")).willReturn(1); + given(resultSet.getString("forename")).willReturn("rod"); + given(resultSet2.next()).willReturn(false); + given(connection.prepareStatement(SELECT_ID_WHERE)).willReturn(preparedStatement, preparedStatement2); + + class CustomerQuery extends MappingSqlQuery { public CustomerQuery(DataSource ds) { super(ds, SELECT_ID_WHERE); - declareParameter( - new SqlParameter(COLUMN_NAMES[0], COLUMN_TYPES[0])); - declareParameter( - new SqlParameter(COLUMN_NAMES[1], COLUMN_TYPES[1])); + declareParameter(new SqlParameter(COLUMN_NAMES[0], COLUMN_TYPES[0])); + declareParameter(new SqlParameter(COLUMN_NAMES[1], COLUMN_TYPES[1])); compile(); } @Override - protected Object mapRow(ResultSet rs, int rownum) throws SQLException { + protected Customer mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); cust.setForename(rs.getString(COLUMN_NAMES[1])); @@ -539,12 +305,11 @@ public class SqlQueryTests extends AbstractJdbcTests { } public Customer findCustomer(int id, String name) { - return (Customer) findObject( - new Object[] { new Integer(id), name }); + return findObject(new Object[] { id, name }); } } - CustomerQuery query = new CustomerQuery(mockDataSource); + CustomerQuery query = new CustomerQuery(dataSource); Customer cust1 = query.findCustomer(1, "rod"); assertTrue("Found customer", cust1 != null); @@ -552,43 +317,25 @@ public class SqlQueryTests extends AbstractJdbcTests { Customer cust2 = query.findCustomer(1, "Roger"); assertTrue("No customer found", cust2 == null); + + verify(preparedStatement).setObject(1, 1, Types.INTEGER); + verify(preparedStatement).setString(2, "rod"); + verify(preparedStatement2).setObject(1, 1, Types.INTEGER); + verify(preparedStatement2).setString(2, "Roger"); + verify(resultSet).close(); + verify(resultSet2).close(); + verify(preparedStatement).close(); + verify(preparedStatement2).close(); + verify(connection, times(2)).close(); } + @Test public void testFindTooManyCustomers() throws SQLException { - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt("id"); - ctrlResultSet.setReturnValue(1); - mockResultSet.getString("forename"); - ctrlResultSet.setReturnValue("rod"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt("id"); - ctrlResultSet.setReturnValue(2); - mockResultSet.getString("forename"); - ctrlResultSet.setReturnValue("rod"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setString(1, "rod"); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(SELECT_ID_FORENAME_WHERE); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); + given(resultSet.next()).willReturn(true, true, false); + given(resultSet.getInt("id")).willReturn(1, 2); + given(resultSet.getString("forename")).willReturn("rod", "rod"); - class CustomerQuery extends MappingSqlQuery { + class CustomerQuery extends MappingSqlQuery { public CustomerQuery(DataSource ds) { super(ds, SELECT_ID_FORENAME_WHERE); @@ -597,7 +344,7 @@ public class SqlQueryTests extends AbstractJdbcTests { } @Override - protected Object mapRow(ResultSet rs, int rownum) throws SQLException { + protected Customer mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); cust.setForename(rs.getString(COLUMN_NAMES[1])); @@ -605,57 +352,31 @@ public class SqlQueryTests extends AbstractJdbcTests { } public Customer findCustomer(String id) { - return (Customer) findObject(id); + return findObject(id); } } - CustomerQuery query = new CustomerQuery(mockDataSource); + CustomerQuery query = new CustomerQuery(dataSource); + thrown.expect(IncorrectResultSizeDataAccessException.class); try { - Customer cust = query.findCustomer("rod"); - fail("Should fail if more than one row found"); + query.findCustomer("rod"); } - catch (IncorrectResultSizeDataAccessException ex) { - // OK + finally { + verify(preparedStatement).setString(1, "rod"); + verify(connection).prepareStatement(SELECT_ID_FORENAME_WHERE); + verify(resultSet).close(); + verify(preparedStatement).close(); + verify(connection).close(); } } + @Test public void testListCustomersIntInt() throws SQLException { - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt("id"); - ctrlResultSet.setReturnValue(1); - mockResultSet.getString("forename"); - ctrlResultSet.setReturnValue("rod"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt("id"); - ctrlResultSet.setReturnValue(2); - mockResultSet.getString("forename"); - ctrlResultSet.setReturnValue("dave"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setObject(2, new Integer(1), Types.NUMERIC); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(SELECT_ID_WHERE); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); + given(resultSet.next()).willReturn(true, true, false); + given(resultSet.getInt("id")).willReturn(1, 2); + given(resultSet.getString("forename")).willReturn("rod", "dave"); - class CustomerQuery extends MappingSqlQuery { + class CustomerQuery extends MappingSqlQuery { public CustomerQuery(DataSource ds) { super(ds, SELECT_ID_WHERE); @@ -665,7 +386,7 @@ public class SqlQueryTests extends AbstractJdbcTests { } @Override - protected Object mapRow(ResultSet rs, int rownum) throws SQLException { + protected Customer mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); cust.setForename(rs.getString(COLUMN_NAMES[1])); @@ -673,49 +394,26 @@ public class SqlQueryTests extends AbstractJdbcTests { } } - CustomerQuery query = new CustomerQuery(mockDataSource); - List list = query.execute(1, 1); + CustomerQuery query = new CustomerQuery(dataSource); + List list = query.execute(1, 1); assertTrue("2 results in list", list.size() == 2); - for (Iterator itr = list.iterator(); itr.hasNext();) { - Customer cust = (Customer) itr.next(); - } + assertThat(list.get(0).getForename(), is("rod")); + assertThat(list.get(1).getForename(), is("dave")); + verify(preparedStatement).setObject(1, 1, Types.NUMERIC); + verify(preparedStatement).setObject(2, 1, Types.NUMERIC); + verify(connection).prepareStatement(SELECT_ID_WHERE); + verify(resultSet).close(); + verify(preparedStatement).close(); + verify(connection).close(); } + @Test public void testListCustomersString() throws SQLException { - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt("id"); - ctrlResultSet.setReturnValue(1); - mockResultSet.getString("forename"); - ctrlResultSet.setReturnValue("rod"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt("id"); - ctrlResultSet.setReturnValue(2); - mockResultSet.getString("forename"); - ctrlResultSet.setReturnValue("dave"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setString(1, "one"); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(SELECT_ID_FORENAME_WHERE); - ctrlConnection.setReturnValue(mockPreparedStatement); + given(resultSet.next()).willReturn(true, true, false); + given(resultSet.getInt("id")).willReturn(1, 2); + given(resultSet.getString("forename")).willReturn("rod", "dave"); - replay(); - - class CustomerQuery extends MappingSqlQuery { + class CustomerQuery extends MappingSqlQuery { public CustomerQuery(DataSource ds) { super(ds, SELECT_ID_FORENAME_WHERE); @@ -724,53 +422,37 @@ public class SqlQueryTests extends AbstractJdbcTests { } @Override - protected Object mapRow(ResultSet rs, int rownum) throws SQLException { + protected Customer mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); cust.setForename(rs.getString(COLUMN_NAMES[1])); return cust; } - } - CustomerQuery query = new CustomerQuery(mockDataSource); - List list = query.execute("one"); + CustomerQuery query = new CustomerQuery(dataSource); + List list = query.execute("one"); assertTrue("2 results in list", list.size() == 2); - for (Iterator itr = list.iterator(); itr.hasNext();) { - Customer cust = (Customer) itr.next(); - } + assertThat(list.get(0).getForename(), is("rod")); + assertThat(list.get(1).getForename(), is("dave")); + verify(preparedStatement).setString(1, "one"); + verify(connection).prepareStatement(SELECT_ID_FORENAME_WHERE); + verify(resultSet).close(); + verify(preparedStatement).close(); + verify(connection).close(); } + @Test public void testFancyCustomerQuery() throws SQLException { - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt("id"); - ctrlResultSet.setReturnValue(1); - mockResultSet.getString("forename"); - ctrlResultSet.setReturnValue("rod"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement( - SELECT_ID_FORENAME_WHERE, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY); - ctrlConnection.setReturnValue(mockPreparedStatement); + given(resultSet.next()).willReturn(true, false); + given(resultSet.getInt("id")).willReturn(1); + given(resultSet.getString("forename")).willReturn("rod"); - replay(); + given(connection.prepareStatement(SELECT_ID_FORENAME_WHERE, + ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY) + ).willReturn(preparedStatement); - class CustomerQuery extends MappingSqlQuery { + class CustomerQuery extends MappingSqlQuery { public CustomerQuery(DataSource ds) { super(ds, SELECT_ID_FORENAME_WHERE); @@ -780,7 +462,7 @@ public class SqlQueryTests extends AbstractJdbcTests { } @Override - protected Object mapRow(ResultSet rs, int rownum) throws SQLException { + protected Customer mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); cust.setForename(rs.getString(COLUMN_NAMES[1])); @@ -788,20 +470,24 @@ public class SqlQueryTests extends AbstractJdbcTests { } public Customer findCustomer(int id) { - return (Customer) findObject(id); + return findObject(id); } } - CustomerQuery query = new CustomerQuery(mockDataSource); + CustomerQuery query = new CustomerQuery(dataSource); Customer cust = query.findCustomer(1); assertTrue("Customer id was assigned correctly", cust.getId() == 1); assertTrue("Customer forename was assigned correctly", cust.getForename().equals("rod")); + verify(preparedStatement).setObject(1, 1, Types.NUMERIC); + verify(resultSet).close(); + verify(preparedStatement).close(); + verify(connection).close(); } - public void testUnnamedParameterDeclarationWithNamedParameterQuery() throws SQLException { - replay(); - - class CustomerQuery extends MappingSqlQuery { + @Test + public void testUnnamedParameterDeclarationWithNamedParameterQuery() + throws SQLException { + class CustomerQuery extends MappingSqlQuery { public CustomerQuery(DataSource ds) { super(ds, SELECT_ID_FORENAME_WHERE); @@ -811,7 +497,7 @@ public class SqlQueryTests extends AbstractJdbcTests { } @Override - protected Object mapRow(ResultSet rs, int rownum) throws SQLException { + protected Customer mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); cust.setForename(rs.getString(COLUMN_NAMES[1])); @@ -819,62 +505,40 @@ public class SqlQueryTests extends AbstractJdbcTests { } public Customer findCustomer(int id) { - Map params = new HashMap(); - params.put("id", new Integer(id)); - return (Customer) executeByNamedParam(params).get(0); + Map params = new HashMap(); + params.put("id", id); + return executeByNamedParam(params).get(0); } } - CustomerQuery query = new CustomerQuery(mockDataSource); - try { - Customer cust = query.findCustomer(1); - fail("Query should not succeed since parameter declaration did not specify parameter name"); - } - catch (InvalidDataAccessApiUsageException ex) { - // OK - it worked - } + // Query should not succeed since parameter declaration did not specify parameter name + CustomerQuery query = new CustomerQuery(dataSource); + thrown.expect(InvalidDataAccessApiUsageException.class); + query.findCustomer(1); } - public void testNamedParameterCustomerQueryWithUnnamedDeclarations() throws SQLException { + @Test + public void testNamedParameterCustomerQueryWithUnnamedDeclarations() + throws SQLException { doTestNamedParameterCustomerQuery(false); } - public void testNamedParameterCustomerQueryWithNamedDeclarations() throws SQLException { + @Test + public void testNamedParameterCustomerQueryWithNamedDeclarations() + throws SQLException { doTestNamedParameterCustomerQuery(true); } - private void doTestNamedParameterCustomerQuery(final boolean namedDeclarations) throws SQLException { - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt("id"); - ctrlResultSet.setReturnValue(1); - mockResultSet.getString("forename"); - ctrlResultSet.setReturnValue("rod"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setString(2, "UK"); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement( - SELECT_ID_FORENAME_NAMED_PARAMETERS_PARSED, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY); - ctrlConnection.setReturnValue(mockPreparedStatement); + private void doTestNamedParameterCustomerQuery(final boolean namedDeclarations) + throws SQLException { + given(resultSet.next()).willReturn(true, false); + given(resultSet.getInt("id")).willReturn(1); + given(resultSet.getString("forename")).willReturn("rod"); + given(connection.prepareStatement(SELECT_ID_FORENAME_NAMED_PARAMETERS_PARSED, + ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY) + ).willReturn(preparedStatement); - replay(); - - class CustomerQuery extends MappingSqlQuery { + class CustomerQuery extends MappingSqlQuery { public CustomerQuery(DataSource ds) { super(ds, SELECT_ID_FORENAME_NAMED_PARAMETERS); @@ -891,7 +555,7 @@ public class SqlQueryTests extends AbstractJdbcTests { } @Override - protected Object mapRow(ResultSet rs, int rownum) throws SQLException { + protected Customer mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); cust.setForename(rs.getString(COLUMN_NAMES[1])); @@ -899,57 +563,35 @@ public class SqlQueryTests extends AbstractJdbcTests { } public Customer findCustomer(int id, String country) { - Map params = new HashMap(); - params.put("id", new Integer(id)); + Map params = new HashMap(); + params.put("id", id); params.put("country", country); - return (Customer) executeByNamedParam(params).get(0); + return executeByNamedParam(params).get(0); } } - CustomerQuery query = new CustomerQuery(mockDataSource); + CustomerQuery query = new CustomerQuery(dataSource); Customer cust = query.findCustomer(1, "UK"); assertTrue("Customer id was assigned correctly", cust.getId() == 1); assertTrue("Customer forename was assigned correctly", cust.getForename().equals("rod")); + verify(preparedStatement).setObject(1, 1, Types.NUMERIC); + verify(preparedStatement).setString(2, "UK"); + verify(resultSet).close(); + verify(preparedStatement).close(); + verify(connection).close(); } + @Test public void testNamedParameterInListQuery() throws SQLException { - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt("id"); - ctrlResultSet.setReturnValue(1); - mockResultSet.getString("forename"); - ctrlResultSet.setReturnValue("rod"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt("id"); - ctrlResultSet.setReturnValue(2); - mockResultSet.getString("forename"); - ctrlResultSet.setReturnValue("juergen"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setObject(2, new Integer(2), Types.NUMERIC); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement( - SELECT_ID_FORENAME_WHERE_ID_IN_LIST_1, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY); - ctrlConnection.setReturnValue(mockPreparedStatement); + given(resultSet.next()).willReturn(true, true, false); + given(resultSet.getInt("id")).willReturn(1, 2); + given(resultSet.getString("forename")).willReturn("rod", "juergen"); - replay(); + given(connection.prepareStatement(SELECT_ID_FORENAME_WHERE_ID_IN_LIST_1, + ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY) + ).willReturn(preparedStatement); - class CustomerQuery extends MappingSqlQuery { + class CustomerQuery extends MappingSqlQuery { public CustomerQuery(DataSource ds) { super(ds, SELECT_ID_FORENAME_WHERE_ID_IN_LIST_2); @@ -959,71 +601,49 @@ public class SqlQueryTests extends AbstractJdbcTests { } @Override - protected Object mapRow(ResultSet rs, int rownum) throws SQLException { + protected Customer mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); cust.setForename(rs.getString(COLUMN_NAMES[1])); return cust; } - public List findCustomers(List ids) { - Map params = new HashMap(); + public List findCustomers(List ids) { + Map params = new HashMap(); params.put("ids", ids); return executeByNamedParam(params); } } - CustomerQuery query = new CustomerQuery(mockDataSource); - List ids = new ArrayList(); - ids.add(new Integer(1)); - ids.add(new Integer(2)); - List cust = query.findCustomers(ids); + CustomerQuery query = new CustomerQuery(dataSource); + List ids = new ArrayList(); + ids.add(1); + ids.add(2); + List cust = query.findCustomers(ids); assertEquals("We got two customers back", cust.size(), 2); - Assert.assertEquals("First customer id was assigned correctly", ((Customer)cust.get(0)).getId(), 1); - Assert.assertEquals("First customer forename was assigned correctly", ((Customer)cust.get(0)).getForename(), "rod"); - Assert.assertEquals("Second customer id was assigned correctly", ((Customer)cust.get(1)).getId(), 2); - Assert.assertEquals("Second customer forename was assigned correctly", ((Customer)cust.get(1)).getForename(), "juergen"); + assertEquals("First customer id was assigned correctly", cust.get(0).getId(), 1); + assertEquals("First customer forename was assigned correctly", cust.get(0).getForename(), "rod"); + assertEquals("Second customer id was assigned correctly", cust.get(1).getId(), 2); + assertEquals("Second customer forename was assigned correctly", cust.get(1).getForename(), "juergen"); + verify(preparedStatement).setObject(1, 1, Types.NUMERIC); + verify(preparedStatement).setObject(2, 2, Types.NUMERIC); + verify(resultSet).close(); + verify(preparedStatement).close(); + verify(connection).close(); } + @Test public void testNamedParameterQueryReusingParameter() throws SQLException { - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt("id"); - ctrlResultSet.setReturnValue(1); - mockResultSet.getString("forename"); - ctrlResultSet.setReturnValue("rod"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt("id"); - ctrlResultSet.setReturnValue(2); - mockResultSet.getString("forename"); - ctrlResultSet.setReturnValue("juergen"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.setObject(2, new Integer(1), Types.NUMERIC); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement( - SELECT_ID_FORENAME_WHERE_ID_REUSED_1, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY); - ctrlConnection.setReturnValue(mockPreparedStatement); + given(resultSet.next()).willReturn(true, true, false); + given(resultSet.getInt("id")).willReturn(1, 2); + given(resultSet.getString("forename")).willReturn("rod", "juergen"); - replay(); + given(connection.prepareStatement(SELECT_ID_FORENAME_WHERE_ID_REUSED_1, + ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY)).willReturn(preparedStatement) +; - class CustomerQuery extends MappingSqlQuery { + class CustomerQuery extends MappingSqlQuery { public CustomerQuery(DataSource ds) { super(ds, SELECT_ID_FORENAME_WHERE_ID_REUSED_2); @@ -1033,39 +653,44 @@ public class SqlQueryTests extends AbstractJdbcTests { } @Override - protected Object mapRow(ResultSet rs, int rownum) throws SQLException { + protected Customer mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); cust.setForename(rs.getString(COLUMN_NAMES[1])); return cust; } - public List findCustomers(Integer id) { - Map params = new HashMap(); + public List findCustomers(Integer id) { + Map params = new HashMap(); params.put("id1", id); return executeByNamedParam(params); } } - CustomerQuery query = new CustomerQuery(mockDataSource); - List cust = query.findCustomers(new Integer(1)); + CustomerQuery query = new CustomerQuery(dataSource); + List cust = query.findCustomers(1); assertEquals("We got two customers back", cust.size(), 2); - Assert.assertEquals("First customer id was assigned correctly", ((Customer)cust.get(0)).getId(), 1); - Assert.assertEquals("First customer forename was assigned correctly", ((Customer)cust.get(0)).getForename(), "rod"); - Assert.assertEquals("Second customer id was assigned correctly", ((Customer)cust.get(1)).getId(), 2); - Assert.assertEquals("Second customer forename was assigned correctly", ((Customer)cust.get(1)).getForename(), "juergen"); + assertEquals("First customer id was assigned correctly", cust.get(0).getId(), 1); + assertEquals("First customer forename was assigned correctly", cust.get(0).getForename(), "rod"); + assertEquals("Second customer id was assigned correctly", cust.get(1).getId(), 2); + assertEquals("Second customer forename was assigned correctly", cust.get(1).getForename(), "juergen"); + + verify(preparedStatement).setObject(1, 1, Types.NUMERIC); + verify(preparedStatement).setObject(2, 1, Types.NUMERIC); + verify(resultSet).close(); + verify(preparedStatement).close(); + verify(connection).close(); } - public void testNamedParameterUsingInvalidQuestionMarkPlaceHolders() throws SQLException { + @Test + public void testNamedParameterUsingInvalidQuestionMarkPlaceHolders() + throws SQLException { + given( + connection.prepareStatement(SELECT_ID_FORENAME_WHERE_ID_REUSED_1, + ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY)).willReturn(preparedStatement); - mockConnection.prepareStatement( - SELECT_ID_FORENAME_WHERE_ID_REUSED_1, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - - class CustomerQuery extends MappingSqlQuery { + class CustomerQuery extends MappingSqlQuery { public CustomerQuery(DataSource ds) { super(ds, SELECT_ID_FORENAME_WHERE_ID_REUSED_1); @@ -1075,70 +700,34 @@ public class SqlQueryTests extends AbstractJdbcTests { } @Override - protected Object mapRow(ResultSet rs, int rownum) throws SQLException { + protected Customer mapRow(ResultSet rs, int rownum) throws SQLException { Customer cust = new Customer(); cust.setId(rs.getInt(COLUMN_NAMES[0])); cust.setForename(rs.getString(COLUMN_NAMES[1])); return cust; } - public List findCustomers(Integer id1) { - Map params = new HashMap(); + public List findCustomers(Integer id1) { + Map params = new HashMap(); params.put("id1", id1); return executeByNamedParam(params); } } - CustomerQuery query = new CustomerQuery(mockDataSource); - try { - List cust = query.findCustomers(new Integer(1)); - fail("Should have caused an InvalidDataAccessApiUsageException"); - } - catch (InvalidDataAccessApiUsageException e){ - } - + CustomerQuery query = new CustomerQuery(dataSource); + thrown.expect(InvalidDataAccessApiUsageException.class); + query.findCustomers(1); } + @Test public void testUpdateCustomers() throws SQLException { - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt("id"); - ctrlResultSet.setReturnValue(1); - mockResultSet.updateString(2, "Rod"); - ctrlResultSet.setVoidCallable(); - mockResultSet.updateRow(); - ctrlResultSet.setVoidCallable(); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getInt("id"); - ctrlResultSet.setReturnValue(2); - mockResultSet.updateString(2, "Thomas"); - ctrlResultSet.setVoidCallable(); - mockResultSet.updateRow(); - ctrlResultSet.setVoidCallable(); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setObject(1, new Integer(2), Types.NUMERIC); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeQuery(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement( - SELECT_ID_FORENAME_WHERE_ID, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); + given(resultSet.next()).willReturn(true, true, false); + given(resultSet.getInt("id")).willReturn(1, 2); + given(connection.prepareStatement(SELECT_ID_FORENAME_WHERE_ID, + ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_UPDATABLE) + ).willReturn(preparedStatement); - class CustomerUpdateQuery extends UpdatableSqlQuery { + class CustomerUpdateQuery extends UpdatableSqlQuery { public CustomerUpdateQuery(DataSource ds) { super(ds, SELECT_ID_FORENAME_WHERE_ID); @@ -1147,20 +736,28 @@ public class SqlQueryTests extends AbstractJdbcTests { } @Override - protected Object updateRow(ResultSet rs, int rownum, Map context) throws SQLException { - rs.updateString(2, "" + context.get(new Integer(rs.getInt(COLUMN_NAMES[0])))); + protected Customer updateRow(ResultSet rs, int rownum, Map context) + throws SQLException { + rs.updateString(2, "" + context.get(rs.getInt(COLUMN_NAMES[0]))); return null; } } - CustomerUpdateQuery query = new CustomerUpdateQuery(mockDataSource); - Map values = new HashMap(2); - values.put(new Integer(1), "Rod"); - values.put(new Integer(2), "Thomas"); - List customers = query.execute(2, values); - } + CustomerUpdateQuery query = new CustomerUpdateQuery(dataSource); + Map values = new HashMap(2); + values.put(1, "Rod"); + values.put(2, "Thomas"); + query.execute(2, values); + verify(resultSet).updateString(2, "Rod"); + verify(resultSet).updateString(2, "Thomas"); + verify(resultSet, times(2)).updateRow(); + verify(preparedStatement).setObject(1, 2, Types.NUMERIC); + verify(resultSet).close(); + verify(preparedStatement).close(); + verify(connection).close(); + } - private static class StringQuery extends MappingSqlQuery { + private static class StringQuery extends MappingSqlQuery { public StringQuery(DataSource ds, String sql) { super(ds, sql); @@ -1168,13 +765,13 @@ public class SqlQueryTests extends AbstractJdbcTests { } @Override - protected Object mapRow(ResultSet rs, int rownum) throws SQLException { + protected String mapRow(ResultSet rs, int rownum) throws SQLException { return rs.getString(1); } public String[] run() { - List list = execute(); - String[] results = (String[]) list.toArray(new String[list.size()]); + List list = execute(); + String[] results = list.toArray(new String[list.size()]); return results; } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java index 011fe1624b1..07b560f3869 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java @@ -16,6 +16,12 @@ package org.springframework.jdbc.object; +import static org.junit.Assert.assertEquals; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + +import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.ResultSetMetaData; @@ -24,13 +30,15 @@ import java.sql.Types; import java.util.HashMap; import java.util.Map; -import org.easymock.MockControl; -import org.apache.commons.logging.LogFactory; +import javax.sql.DataSource; -import org.springframework.jdbc.AbstractJdbcTests; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; import org.springframework.jdbc.JdbcUpdateAffectedIncorrectNumberOfRowsException; import org.springframework.jdbc.core.SqlParameter; -import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.jdbc.support.KeyHolder; @@ -39,151 +47,103 @@ import org.springframework.jdbc.support.KeyHolder; * @author Thomas Risberg * @author Juergen Hoeller */ -public class SqlUpdateTests extends AbstractJdbcTests { +public class SqlUpdateTests { private static final String UPDATE = - "update seat_status set booking_id = null"; + "update seat_status set booking_id = null"; private static final String UPDATE_INT = - "update seat_status set booking_id = null where performance_id = ?"; + "update seat_status set booking_id = null where performance_id = ?"; private static final String UPDATE_INT_INT = - "update seat_status set booking_id = null where performance_id = ? and price_band_id = ?"; + "update seat_status set booking_id = null where performance_id = ? and price_band_id = ?"; private static final String UPDATE_NAMED_PARAMETERS = - "update seat_status set booking_id = null where performance_id = :perfId and price_band_id = :priceId"; + "update seat_status set booking_id = null where performance_id = :perfId and price_band_id = :priceId"; private static final String UPDATE_STRING = - "update seat_status set booking_id = null where name = ?"; + "update seat_status set booking_id = null where name = ?"; private static final String UPDATE_OBJECTS = - "update seat_status set booking_id = null where performance_id = ? and price_band_id = ? and name = ? and confirmed = ?"; + "update seat_status set booking_id = null where performance_id = ? and price_band_id = ? and name = ? and confirmed = ?"; private static final String INSERT_GENERATE_KEYS = - "insert into show (name) values(?)"; - - private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled(); - - private MockControl ctrlPreparedStatement; - private PreparedStatement mockPreparedStatement; - private MockControl ctrlResultSet; - private ResultSet mockResultSet; - private MockControl ctrlResultSetMetaData; - private ResultSetMetaData mockResultSetMetaData; - - - @Override - protected void setUp() throws Exception { - super.setUp(); - ctrlPreparedStatement = MockControl.createControl(PreparedStatement.class); - mockPreparedStatement = (PreparedStatement) ctrlPreparedStatement.getMock(); + "insert into show (name) values(?)"; + + @Rule + public ExpectedException thrown = ExpectedException.none(); + + private DataSource dataSource; + private Connection connection; + private PreparedStatement preparedStatement; + private ResultSet resultSet; + private ResultSetMetaData resultSetMetaData; + + @Before + public void setUp() throws Exception { + dataSource = mock(DataSource.class); + connection = mock(Connection.class); + preparedStatement = mock(PreparedStatement.class); + resultSet = mock(ResultSet.class); + resultSetMetaData = mock(ResultSetMetaData.class); + given(dataSource.getConnection()).willReturn(connection); } - @Override - protected void tearDown() throws Exception { - super.tearDown(); - if (shouldVerify()) { - ctrlPreparedStatement.verify(); - } - } - - @Override - protected void replay() { - super.replay(); - ctrlPreparedStatement.replay(); + @After + public void verifyClosed() throws Exception { + verify(preparedStatement).close(); + verify(connection).close(); } - + @Test public void testUpdate() throws SQLException { - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(1); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(UPDATE); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); + given(preparedStatement.executeUpdate()).willReturn(1); + given(connection.prepareStatement(UPDATE)).willReturn(preparedStatement); Updater pc = new Updater(); int rowsAffected = pc.run(); + assertEquals(1, rowsAffected); } + @Test public void testUpdateInt() throws SQLException { - mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(1); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(UPDATE_INT); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); + given(preparedStatement.executeUpdate()).willReturn(1); + given(connection.prepareStatement(UPDATE_INT)).willReturn(preparedStatement); IntUpdater pc = new IntUpdater(); int rowsAffected = pc.run(1); + assertEquals(1, rowsAffected); + verify(preparedStatement).setObject(1, 1, Types.NUMERIC); } + @Test public void testUpdateIntInt() throws SQLException { - mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC); - mockPreparedStatement.setObject(2, new Integer(1), Types.NUMERIC); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(1); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(UPDATE_INT_INT); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); + given(preparedStatement.executeUpdate()).willReturn(1); + given(connection.prepareStatement(UPDATE_INT_INT)).willReturn(preparedStatement); IntIntUpdater pc = new IntIntUpdater(); int rowsAffected = pc.run(1, 1); + assertEquals(1, rowsAffected); + verify(preparedStatement).setObject(1, 1, Types.NUMERIC); + verify(preparedStatement).setObject(2, 1, Types.NUMERIC); } + @Test public void testNamedParameterUpdateWithUnnamedDeclarations() throws SQLException { doTestNamedParameterUpdate(false); } + @Test public void testNamedParameterUpdateWithNamedDeclarations() throws SQLException { doTestNamedParameterUpdate(true); } - private void doTestNamedParameterUpdate(final boolean namedDeclarations) throws SQLException { - mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC); - mockPreparedStatement.setObject(2, new Integer(1), Types.DECIMAL); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(1); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(UPDATE_INT_INT); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); + private void doTestNamedParameterUpdate(final boolean namedDeclarations) + throws SQLException { + given(preparedStatement.executeUpdate()).willReturn(1); + given(connection.prepareStatement(UPDATE_INT_INT)).willReturn(preparedStatement); class NamedParameterUpdater extends SqlUpdate { - public NamedParameterUpdater() { setSql(UPDATE_NAMED_PARAMETERS); - setDataSource(mockDataSource); + setDataSource(dataSource); if (namedDeclarations) { declareParameter(new SqlParameter("priceId", Types.DECIMAL)); declareParameter(new SqlParameter("perfId", Types.NUMERIC)); @@ -196,9 +156,9 @@ public class SqlUpdateTests extends AbstractJdbcTests { } public int run(int performanceId, int type) { - Map params = new HashMap(); - params.put("perfId", new Integer(performanceId)); - params.put("priceId", new Integer(type)); + Map params = new HashMap(); + params.put("perfId", performanceId); + params.put("priceId", type); return updateByNamedParam(params); } } @@ -206,245 +166,134 @@ public class SqlUpdateTests extends AbstractJdbcTests { NamedParameterUpdater pc = new NamedParameterUpdater(); int rowsAffected = pc.run(1, 1); assertEquals(1, rowsAffected); + verify(preparedStatement).setObject(1, 1, Types.NUMERIC); + verify(preparedStatement).setObject(2, 1, Types.DECIMAL); } + @Test public void testUpdateString() throws SQLException { - mockPreparedStatement.setString(1, "rod"); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(1); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(UPDATE_STRING); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); + given(preparedStatement.executeUpdate()).willReturn(1); + given(connection.prepareStatement(UPDATE_STRING)).willReturn(preparedStatement); StringUpdater pc = new StringUpdater(); int rowsAffected = pc.run("rod"); + assertEquals(1, rowsAffected); + verify(preparedStatement).setString(1, "rod"); } + @Test public void testUpdateMixed() throws SQLException { - mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC); - mockPreparedStatement.setObject(2, new Integer(1), Types.NUMERIC, 2); - mockPreparedStatement.setString(3, "rod"); - mockPreparedStatement.setObject(4, Boolean.TRUE, Types.BOOLEAN); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(1); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(UPDATE_OBJECTS); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); + given(preparedStatement.executeUpdate()).willReturn(1); + given(connection.prepareStatement(UPDATE_OBJECTS)).willReturn(preparedStatement); MixedUpdater pc = new MixedUpdater(); int rowsAffected = pc.run(1, 1, "rod", true); + assertEquals(1, rowsAffected); + verify(preparedStatement).setObject(1, 1, Types.NUMERIC); + verify(preparedStatement).setObject(2, 1, Types.NUMERIC, 2); + verify(preparedStatement).setString(3, "rod"); + verify(preparedStatement).setObject(4, Boolean.TRUE, Types.BOOLEAN); } + @Test public void testUpdateAndGeneratedKeys() throws SQLException { - ctrlResultSetMetaData = MockControl.createControl(ResultSetMetaData.class); - mockResultSetMetaData = (ResultSetMetaData) ctrlResultSetMetaData.getMock(); - mockResultSetMetaData.getColumnCount(); - ctrlResultSetMetaData.setReturnValue(1); - mockResultSetMetaData.getColumnLabel(1); - ctrlResultSetMetaData.setReturnValue("1", 2); - - ctrlResultSet = MockControl.createControl(ResultSet.class); - mockResultSet = (ResultSet) ctrlResultSet.getMock(); - mockResultSet.getMetaData(); - ctrlResultSet.setReturnValue(mockResultSetMetaData); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getObject(1); - ctrlResultSet.setReturnValue(new Integer(11)); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockPreparedStatement.setString(1, "rod"); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(1); - mockPreparedStatement.getGeneratedKeys(); - ctrlPreparedStatement.setReturnValue(mockResultSet); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(INSERT_GENERATE_KEYS, PreparedStatement.RETURN_GENERATED_KEYS); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - ctrlResultSet.replay(); - ctrlResultSetMetaData.replay(); + given(resultSetMetaData.getColumnCount()).willReturn(1); + given(resultSetMetaData.getColumnLabel(1)).willReturn("1"); + given(resultSet.getMetaData()).willReturn(resultSetMetaData); + given(resultSet.next()).willReturn(true, false); + given(resultSet.getObject(1)).willReturn(11); + given(preparedStatement.executeUpdate()).willReturn(1); + given(preparedStatement.getGeneratedKeys()).willReturn(resultSet); + given(connection.prepareStatement(INSERT_GENERATE_KEYS, + PreparedStatement.RETURN_GENERATED_KEYS) + ).willReturn(preparedStatement); GeneratedKeysUpdater pc = new GeneratedKeysUpdater(); KeyHolder generatedKeyHolder = new GeneratedKeyHolder(); int rowsAffected = pc.run("rod", generatedKeyHolder); + assertEquals(1, rowsAffected); assertEquals(1, generatedKeyHolder.getKeyList().size()); assertEquals(11, generatedKeyHolder.getKey().intValue()); + verify(preparedStatement).setString(1, "rod"); + verify(resultSet).close(); } + @Test public void testUpdateConstructor() throws SQLException { - mockPreparedStatement.setObject(1, new Integer(1), Types.NUMERIC); - mockPreparedStatement.setObject(2, new Integer(1), Types.NUMERIC); - mockPreparedStatement.setString(3, "rod"); - mockPreparedStatement.setObject(4, Boolean.TRUE, Types.BOOLEAN); - ctrlPreparedStatement.setVoidCallable(); - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(1); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(UPDATE_OBJECTS); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - + given(preparedStatement.executeUpdate()).willReturn(1); + given(connection.prepareStatement(UPDATE_OBJECTS)).willReturn(preparedStatement); ConstructorUpdater pc = new ConstructorUpdater(); + int rowsAffected = pc.run(1, 1, "rod", true); + assertEquals(1, rowsAffected); + verify(preparedStatement).setObject(1, 1, Types.NUMERIC); + verify(preparedStatement).setObject(2, 1, Types.NUMERIC); + verify(preparedStatement).setString(3, "rod"); + verify(preparedStatement).setObject(4, Boolean.TRUE, Types.BOOLEAN); } + @Test public void testUnderMaxRows() throws SQLException { - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(3); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(UPDATE); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); + given(preparedStatement.executeUpdate()).willReturn(3); + given(connection.prepareStatement(UPDATE)).willReturn(preparedStatement); MaxRowsUpdater pc = new MaxRowsUpdater(); + int rowsAffected = pc.run(); assertEquals(3, rowsAffected); } + @Test public void testMaxRows() throws SQLException { - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(5); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(UPDATE); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); + given(preparedStatement.executeUpdate()).willReturn(5); + given(connection.prepareStatement(UPDATE)).willReturn(preparedStatement); MaxRowsUpdater pc = new MaxRowsUpdater(); int rowsAffected = pc.run(); + assertEquals(5, rowsAffected); } + @Test public void testOverMaxRows() throws SQLException { - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(8); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(UPDATE); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); + given(preparedStatement.executeUpdate()).willReturn(8); + given(connection.prepareStatement(UPDATE)).willReturn(preparedStatement); MaxRowsUpdater pc = new MaxRowsUpdater(); - try { - int rowsAffected = pc.run(); - fail("Shouldn't continue when too many rows affected"); - } - catch (JdbcUpdateAffectedIncorrectNumberOfRowsException juaicrex) { - // OK - } + + thrown.expect(JdbcUpdateAffectedIncorrectNumberOfRowsException.class); + pc.run(); } + @Test public void testRequiredRows() throws SQLException { - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(3); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(UPDATE); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); + given(preparedStatement.executeUpdate()).willReturn(3); + given(connection.prepareStatement(UPDATE)).willReturn(preparedStatement); RequiredRowsUpdater pc = new RequiredRowsUpdater(); int rowsAffected = pc.run(); + assertEquals(3, rowsAffected); } + @Test public void testNotRequiredRows() throws SQLException { - mockPreparedStatement.executeUpdate(); - ctrlPreparedStatement.setReturnValue(2); - if (debugEnabled) { - mockPreparedStatement.getWarnings(); - ctrlPreparedStatement.setReturnValue(null); - } - mockPreparedStatement.close(); - ctrlPreparedStatement.setVoidCallable(); - - mockConnection.prepareStatement(UPDATE); - ctrlConnection.setReturnValue(mockPreparedStatement); - - replay(); - + given(preparedStatement.executeUpdate()).willReturn(2); + given(connection.prepareStatement(UPDATE)).willReturn(preparedStatement); + thrown.expect(JdbcUpdateAffectedIncorrectNumberOfRowsException.class); RequiredRowsUpdater pc = new RequiredRowsUpdater(); - try { - int rowsAffected = pc.run(); - fail("Shouldn't continue when too many rows affected"); - } - catch (JdbcUpdateAffectedIncorrectNumberOfRowsException juaicrex) { - // OK - } + pc.run(); } - private class Updater extends SqlUpdate { public Updater() { setSql(UPDATE); - setDataSource(mockDataSource); + setDataSource(dataSource); compile(); } @@ -458,7 +307,7 @@ public class SqlUpdateTests extends AbstractJdbcTests { public IntUpdater() { setSql(UPDATE_INT); - setDataSource(mockDataSource); + setDataSource(dataSource); declareParameter(new SqlParameter(Types.NUMERIC)); compile(); } @@ -473,7 +322,7 @@ public class SqlUpdateTests extends AbstractJdbcTests { public IntIntUpdater() { setSql(UPDATE_INT_INT); - setDataSource(mockDataSource); + setDataSource(dataSource); declareParameter(new SqlParameter(Types.NUMERIC)); declareParameter(new SqlParameter(Types.NUMERIC)); compile(); @@ -489,7 +338,7 @@ public class SqlUpdateTests extends AbstractJdbcTests { public StringUpdater() { setSql(UPDATE_STRING); - setDataSource(mockDataSource); + setDataSource(dataSource); declareParameter(new SqlParameter(Types.VARCHAR)); compile(); } @@ -504,7 +353,7 @@ public class SqlUpdateTests extends AbstractJdbcTests { public MixedUpdater() { setSql(UPDATE_OBJECTS); - setDataSource(mockDataSource); + setDataSource(dataSource); declareParameter(new SqlParameter(Types.NUMERIC)); declareParameter(new SqlParameter(Types.NUMERIC, 2)); declareParameter(new SqlParameter(Types.VARCHAR)); @@ -514,7 +363,7 @@ public class SqlUpdateTests extends AbstractJdbcTests { public int run(int performanceId, int type, String name, boolean confirmed) { Object[] params = - new Object[] {new Integer(performanceId), new Integer(type), name, + new Object[] {performanceId, type, name, new Boolean(confirmed)}; return update(params); } @@ -525,7 +374,7 @@ public class SqlUpdateTests extends AbstractJdbcTests { public GeneratedKeysUpdater() { setSql(INSERT_GENERATE_KEYS); - setDataSource(mockDataSource); + setDataSource(dataSource); declareParameter(new SqlParameter(Types.VARCHAR)); setReturnGeneratedKeys(true); compile(); @@ -541,7 +390,7 @@ public class SqlUpdateTests extends AbstractJdbcTests { private class ConstructorUpdater extends SqlUpdate { public ConstructorUpdater() { - super(mockDataSource, UPDATE_OBJECTS, + super(dataSource, UPDATE_OBJECTS, new int[] {Types.NUMERIC, Types.NUMERIC, Types.VARCHAR, Types.BOOLEAN }); compile(); } @@ -549,7 +398,7 @@ public class SqlUpdateTests extends AbstractJdbcTests { public int run(int performanceId, int type, String name, boolean confirmed) { Object[] params = new Object[] { - new Integer(performanceId), new Integer(type), name, new Boolean(confirmed)}; + performanceId, type, name, new Boolean(confirmed)}; return update(params); } } @@ -559,7 +408,7 @@ public class SqlUpdateTests extends AbstractJdbcTests { public MaxRowsUpdater() { setSql(UPDATE); - setDataSource(mockDataSource); + setDataSource(dataSource); setMaxRowsAffected(5); compile(); } @@ -574,7 +423,7 @@ public class SqlUpdateTests extends AbstractJdbcTests { public RequiredRowsUpdater() { setSql(UPDATE); - setDataSource(mockDataSource); + setDataSource(dataSource); setRequiredRowsAffected(3); compile(); } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java index 3dae9479306..d1bde67770c 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java @@ -16,25 +16,37 @@ package org.springframework.jdbc.object; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.BDDMockito.given; +import static org.mockito.Matchers.eq; +import static org.mockito.Matchers.startsWith; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; + +import java.math.BigDecimal; import java.sql.CallableStatement; import java.sql.Connection; import java.sql.ResultSet; +import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.sql.Types; -import java.sql.ResultSetMetaData; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.math.BigDecimal; import javax.sql.DataSource; -import org.easymock.MockControl; -import org.apache.commons.logging.LogFactory; - +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; import org.springframework.dao.DataAccessException; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.jdbc.AbstractJdbcTests; import org.springframework.jdbc.BadSqlGrammarException; import org.springframework.jdbc.core.CallableStatementCreator; import org.springframework.jdbc.core.JdbcTemplate; @@ -55,707 +67,381 @@ import org.springframework.transaction.support.TransactionSynchronizationManager * @author Trevor Cook * @author Rod Johnson */ -public class StoredProcedureTests extends AbstractJdbcTests { +public class StoredProcedureTests { - private final boolean debugEnabled = LogFactory.getLog(JdbcTemplate.class).isDebugEnabled(); + @Rule + public ExpectedException thrown = ExpectedException.none(); - private MockControl ctrlCallable; - private CallableStatement mockCallable; + private DataSource dataSource; + private Connection connection; + private CallableStatement callableStatement; - @Override - protected void setUp() throws Exception { - super.setUp(); + private boolean verifyClosedAfter = true; - ctrlCallable = MockControl.createControl(CallableStatement.class); - mockCallable = (CallableStatement) ctrlCallable.getMock(); + @Before + public void setup() throws Exception { + dataSource = mock(DataSource.class); + connection = mock(Connection.class); + callableStatement = mock(CallableStatement.class); + given(dataSource.getConnection()).willReturn(connection); + given(callableStatement.getConnection()).willReturn(connection); } - @Override - protected void tearDown() throws Exception { - super.tearDown(); - if (shouldVerify()) { - ctrlCallable.verify(); + @After + public void verifyClosed() throws Exception { + if(verifyClosedAfter) { + verify(callableStatement).close(); + verify(connection, atLeastOnce()).close(); } } - @Override - protected void replay() { - super.replay(); - ctrlCallable.replay(); - } - + @Test public void testNoSuchStoredProcedure() throws Exception { - SQLException sex = - new SQLException( - "Syntax error or access violation exception", - "42000"); - mockCallable.execute(); - ctrlCallable.setThrowable(sex); - mockCallable.close(); - ctrlCallable.setVoidCallable(); - - mockConnection.prepareCall( - "{call " + NoSuchStoredProcedure.SQL + "()}"); - ctrlConnection.setReturnValue(mockCallable); - - replay(); - - NoSuchStoredProcedure sproc = new NoSuchStoredProcedure(mockDataSource); - try { - sproc.execute(); - fail("Shouldn't succeed in running stored procedure which doesn't exist"); - } catch (BadSqlGrammarException ex) { - // OK - } + SQLException sqlException = new SQLException( + "Syntax error or access violation exception", "42000"); + given(callableStatement.execute()).willThrow(sqlException); + given(connection.prepareCall("{call " + NoSuchStoredProcedure.SQL + "()}")).willReturn( + callableStatement); + + NoSuchStoredProcedure sproc = new NoSuchStoredProcedure(dataSource); + thrown.expect(BadSqlGrammarException.class); + sproc.execute(); } - private void testAddInvoice(final int amount, final int custid) - throws Exception { - AddInvoice adder = new AddInvoice(mockDataSource); + private void testAddInvoice(final int amount, final int custid) throws Exception { + AddInvoice adder = new AddInvoice(dataSource); int id = adder.execute(amount, custid); assertEquals(4, id); } private void testAddInvoiceUsingObjectArray(final int amount, final int custid) - throws Exception { - AddInvoiceUsingObjectArray adder = new AddInvoiceUsingObjectArray(mockDataSource); + throws Exception { + AddInvoiceUsingObjectArray adder = new AddInvoiceUsingObjectArray(dataSource); int id = adder.execute(amount, custid); assertEquals(5, id); } + @Test public void testAddInvoices() throws Exception { - mockCallable.setObject(1, new Integer(1106), Types.INTEGER); - ctrlCallable.setVoidCallable(); - mockCallable.setObject(2, new Integer(3), Types.INTEGER); - ctrlCallable.setVoidCallable(); - mockCallable.registerOutParameter(3, Types.INTEGER); - ctrlCallable.setVoidCallable(); - mockCallable.execute(); - ctrlCallable.setReturnValue(false); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - mockCallable.getObject(3); - ctrlCallable.setReturnValue(new Integer(4)); - if (debugEnabled) { - mockCallable.getWarnings(); - ctrlCallable.setReturnValue(null); - } - mockCallable.close(); - ctrlCallable.setVoidCallable(); - - mockConnection.prepareCall("{call " + AddInvoice.SQL + "(?, ?, ?)}"); - ctrlConnection.setReturnValue(mockCallable); - - replay(); + given(callableStatement.execute()).willReturn(false); + given(callableStatement.getUpdateCount()).willReturn(-1); + given(callableStatement.getObject(3)).willReturn(4); + given(connection.prepareCall("{call " + AddInvoice.SQL + "(?, ?, ?)}") + ).willReturn(callableStatement); testAddInvoice(1106, 3); - + verify(callableStatement).setObject(1, 1106, Types.INTEGER); + verify(callableStatement).setObject(2, 3, Types.INTEGER); + verify(callableStatement).registerOutParameter(3, Types.INTEGER); } + @Test public void testAddInvoicesUsingObjectArray() throws Exception { - mockCallable.setObject(1, new Integer(1106), Types.INTEGER); - ctrlCallable.setVoidCallable(); - mockCallable.setObject(2, new Integer(4), Types.INTEGER); - ctrlCallable.setVoidCallable(); - mockCallable.registerOutParameter(3, Types.INTEGER); - ctrlCallable.setVoidCallable(); - mockCallable.execute(); - ctrlCallable.setReturnValue(false); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - mockCallable.getObject(3); - ctrlCallable.setReturnValue(new Integer(5)); - if (debugEnabled) { - mockCallable.getWarnings(); - ctrlCallable.setReturnValue(null); - } - mockCallable.close(); - ctrlCallable.setVoidCallable(); - - mockConnection.prepareCall("{call " + AddInvoice.SQL + "(?, ?, ?)}"); - ctrlConnection.setReturnValue(mockCallable); - - replay(); + given(callableStatement.execute()).willReturn(false); + given(callableStatement.getUpdateCount()).willReturn(-1); + given(callableStatement.getObject(3)).willReturn(5); + given(connection.prepareCall("{call " + AddInvoice.SQL + "(?, ?, ?)}") + ).willReturn(callableStatement); testAddInvoiceUsingObjectArray(1106, 4); - + verify(callableStatement).setObject(1, 1106, Types.INTEGER); + verify(callableStatement).setObject(2, 4, Types.INTEGER); + verify(callableStatement).registerOutParameter(3, Types.INTEGER); } + @Test public void testAddInvoicesWithinTransaction() throws Exception { - mockCallable.setObject(1, new Integer(1106), Types.INTEGER); - ctrlCallable.setVoidCallable(); - mockCallable.setObject(2, new Integer(3), Types.INTEGER); - ctrlCallable.setVoidCallable(); - mockCallable.registerOutParameter(3, Types.INTEGER); - ctrlCallable.setVoidCallable(); - mockCallable.execute(); - ctrlCallable.setReturnValue(false); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - mockCallable.getObject(3); - ctrlCallable.setReturnValue(new Integer(4)); - if (debugEnabled) { - mockCallable.getWarnings(); - ctrlCallable.setReturnValue(null); - } - mockCallable.close(); - ctrlCallable.setVoidCallable(); - - mockConnection.prepareCall("{call " + AddInvoice.SQL + "(?, ?, ?)}"); - ctrlConnection.setReturnValue(mockCallable); - - replay(); - - TransactionSynchronizationManager.bindResource( - mockDataSource, - new ConnectionHolder(mockConnection)); - + given(callableStatement.execute()).willReturn(false); + given(callableStatement.getUpdateCount()).willReturn(-1); + given(callableStatement.getObject(3)).willReturn(4); + given(connection.prepareCall("{call " + AddInvoice.SQL + "(?, ?, ?)}") + ).willReturn(callableStatement); + TransactionSynchronizationManager.bindResource(dataSource, new ConnectionHolder(connection)); try { testAddInvoice(1106, 3); + verify(callableStatement).setObject(1, 1106, Types.INTEGER); + verify(callableStatement).setObject(2, 3, Types.INTEGER); + verify(callableStatement).registerOutParameter(3, Types.INTEGER); + verify(connection, never()).close(); } finally { - TransactionSynchronizationManager.unbindResource(mockDataSource); + TransactionSynchronizationManager.unbindResource(dataSource); + connection.close(); } } - /** - * Confirm no connection was used to get metadata. - * Does not use superclass replay mechanism. + * Confirm no connection was used to get metadata. Does not use superclass replay + * mechanism. + * * @throws Exception */ - public void testStoredProcedureConfiguredViaJdbcTemplateWithCustomExceptionTranslator() throws Exception { - mockCallable.setObject(1, new Integer(11), Types.INTEGER); - ctrlCallable.setVoidCallable(1); - mockCallable.registerOutParameter(2, Types.INTEGER); - ctrlCallable.setVoidCallable(1); - mockCallable.execute(); - ctrlCallable.setReturnValue(false, 1); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - mockCallable.getObject(2); - ctrlCallable.setReturnValue(new Integer(5), 1); - if (debugEnabled) { - mockCallable.getWarnings(); - ctrlCallable.setReturnValue(null); - } - mockCallable.close(); - ctrlCallable.setVoidCallable(1); - // Must call this here as we're not using setUp()/tearDown() mechanism - ctrlCallable.replay(); - - ctrlConnection = MockControl.createControl(Connection.class); - mockConnection = (Connection) ctrlConnection.getMock(); - mockConnection.prepareCall("{call " + StoredProcedureConfiguredViaJdbcTemplate.SQL + "(?, ?)}"); - ctrlConnection.setReturnValue(mockCallable, 1); - mockConnection.close(); - ctrlConnection.setVoidCallable(1); - ctrlConnection.replay(); - - MockControl dsControl = MockControl.createControl(DataSource.class); - DataSource localDs = (DataSource) dsControl.getMock(); - localDs.getConnection(); - dsControl.setReturnValue(mockConnection, 1); - dsControl.replay(); + @Test + public void testStoredProcedureConfiguredViaJdbcTemplateWithCustomExceptionTranslator() + throws Exception { + given(callableStatement.execute()).willReturn(false); + given(callableStatement.getUpdateCount()).willReturn(-1); + given(callableStatement.getObject(2)).willReturn(5); + given(connection.prepareCall("{call " + StoredProcedureConfiguredViaJdbcTemplate.SQL + "(?, ?)}") + ).willReturn(callableStatement); class TestJdbcTemplate extends JdbcTemplate { + int calls; + @Override - public Map call(CallableStatementCreator csc, List declaredParameters) throws DataAccessException { + public Map call(CallableStatementCreator csc, + List declaredParameters) throws DataAccessException { calls++; return super.call(csc, declaredParameters); } - } TestJdbcTemplate t = new TestJdbcTemplate(); - t.setDataSource(localDs); - // Will fail without the following, because we're not able to get a connection from the - // DataSource here if we need to to create an ExceptionTranslator + t.setDataSource(dataSource); + // Will fail without the following, because we're not able to get a connection + // from the DataSource here if we need to to create an ExceptionTranslator t.setExceptionTranslator(new SQLStateSQLExceptionTranslator()); StoredProcedureConfiguredViaJdbcTemplate sp = new StoredProcedureConfiguredViaJdbcTemplate(t); assertEquals(sp.execute(11), 5); assertEquals(1, t.calls); - dsControl.verify(); - ctrlCallable.verify(); - ctrlConnection.verify(); + verify(callableStatement).setObject(1, 11, Types.INTEGER); + verify(callableStatement).registerOutParameter(2, Types.INTEGER); } /** * Confirm our JdbcTemplate is used + * * @throws Exception */ + @Test public void testStoredProcedureConfiguredViaJdbcTemplate() throws Exception { - mockCallable.setObject(1, new Integer(1106), Types.INTEGER); - ctrlCallable.setVoidCallable(); - mockCallable.registerOutParameter(2, Types.INTEGER); - ctrlCallable.setVoidCallable(); - mockCallable.execute(); - ctrlCallable.setReturnValue(false); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - mockCallable.getObject(2); - ctrlCallable.setReturnValue(new Integer(4)); - if (debugEnabled) { - mockCallable.getWarnings(); - ctrlCallable.setReturnValue(null); - } - mockCallable.close(); - ctrlCallable.setVoidCallable(); - - mockConnection.prepareCall("{call " + StoredProcedureConfiguredViaJdbcTemplate.SQL + "(?, ?)}"); - ctrlConnection.setReturnValue(mockCallable); - - replay(); + given(callableStatement.execute()).willReturn(false); + given(callableStatement.getUpdateCount()).willReturn(-1); + given(callableStatement.getObject(2)).willReturn(4); + given(connection.prepareCall("{call " + StoredProcedureConfiguredViaJdbcTemplate.SQL + "(?, ?)}") + ).willReturn(callableStatement); JdbcTemplate t = new JdbcTemplate(); - t.setDataSource(mockDataSource); + t.setDataSource(dataSource); StoredProcedureConfiguredViaJdbcTemplate sp = new StoredProcedureConfiguredViaJdbcTemplate(t); - assertEquals(sp.execute(1106), 4); + verify(callableStatement).setObject(1, 1106, Types.INTEGER); + verify(callableStatement).registerOutParameter(2, Types.INTEGER); } + @Test public void testNullArg() throws Exception { - MockControl ctrlResultSet = MockControl.createControl(ResultSet.class); - ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock(); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - - mockCallable.setNull(1, Types.VARCHAR); - ctrlCallable.setVoidCallable(); - mockCallable.execute(); - ctrlCallable.setReturnValue(false); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - if (debugEnabled) { - mockCallable.getWarnings(); - ctrlCallable.setReturnValue(null); - } - mockCallable.close(); - ctrlCallable.setVoidCallable(); - - mockConnection.prepareCall("{call " + NullArg.SQL + "(?)}"); - ctrlConnection.setReturnValue(mockCallable); - - replay(); - ctrlResultSet.replay(); - - NullArg na = new NullArg(mockDataSource); + given(callableStatement.execute()).willReturn(false); + given(callableStatement.getUpdateCount()).willReturn(-1); + given(connection.prepareCall("{call " + NullArg.SQL + "(?)}")).willReturn(callableStatement); + NullArg na = new NullArg(dataSource); na.execute((String) null); + callableStatement.setNull(1, Types.VARCHAR); } + @Test public void testUnnamedParameter() throws Exception { - replay(); - try { - UnnamedParameterStoredProcedure unp = - new UnnamedParameterStoredProcedure(mockDataSource); - fail("Shouldn't succeed in creating stored procedure with unnamed parameter"); - } catch (InvalidDataAccessApiUsageException idaauex) { - // OK - } + this.verifyClosedAfter = false; + // Shouldn't succeed in creating stored procedure with unnamed parameter + thrown.expect(InvalidDataAccessApiUsageException.class); + new UnnamedParameterStoredProcedure(dataSource); } + @Test public void testMissingParameter() throws Exception { - replay(); - - try { - MissingParameterStoredProcedure mp = - new MissingParameterStoredProcedure(mockDataSource); - mp.execute(); - fail("Shouldn't succeed in running stored procedure with missing required parameter"); - } catch (InvalidDataAccessApiUsageException idaauex) { - // OK - } + this.verifyClosedAfter = false; + MissingParameterStoredProcedure mp = new MissingParameterStoredProcedure(dataSource); + thrown.expect(InvalidDataAccessApiUsageException.class); + mp.execute(); + fail("Shouldn't succeed in running stored procedure with missing required parameter"); } + @Test public void testStoredProcedureExceptionTranslator() throws Exception { - SQLException sex = - new SQLException( - "Syntax error or access violation exception", - "42000"); - mockCallable.execute(); - ctrlCallable.setThrowable(sex); - mockCallable.close(); - ctrlCallable.setVoidCallable(); - - mockConnection.prepareCall( - "{call " + StoredProcedureExceptionTranslator.SQL + "()}"); - ctrlConnection.setReturnValue(mockCallable); - - replay(); - - StoredProcedureExceptionTranslator sproc = - new StoredProcedureExceptionTranslator(mockDataSource); - try { - sproc.execute(); - fail("Custom exception should be thrown"); - } catch (CustomDataException ex) { - // OK - } + SQLException sqlException = new SQLException( + "Syntax error or access violation exception", "42000"); + given(callableStatement.execute()).willThrow(sqlException); + given(connection.prepareCall("{call " + StoredProcedureExceptionTranslator.SQL + "()}") + ).willReturn(callableStatement); + StoredProcedureExceptionTranslator sproc = new StoredProcedureExceptionTranslator(dataSource); + thrown.expect(CustomDataException.class); + sproc.execute(); } + @Test public void testStoredProcedureWithResultSet() throws Exception { - MockControl ctrlResultSet = MockControl.createControl(ResultSet.class); - ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock(); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - if (debugEnabled) { - mockCallable.getWarnings(); - ctrlCallable.setReturnValue(null); - } - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockCallable.execute(); - ctrlCallable.setReturnValue(true); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - mockCallable.getResultSet(); - ctrlCallable.setReturnValue(mockResultSet); - mockCallable.getMoreResults(); - ctrlCallable.setReturnValue(false); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - mockCallable.close(); - ctrlCallable.setVoidCallable(); - - mockConnection.prepareCall("{call " + StoredProcedureWithResultSet.SQL + "()}"); - ctrlConnection.setReturnValue(mockCallable); - - replay(); - ctrlResultSet.replay(); - - StoredProcedureWithResultSet sproc = new StoredProcedureWithResultSet(mockDataSource); + ResultSet resultSet = mock(ResultSet.class); + given(resultSet.next()).willReturn(true, true, false); + given(callableStatement.execute()).willReturn(true); + given(callableStatement.getUpdateCount()).willReturn(-1); + given(callableStatement.getResultSet()).willReturn(resultSet); + given(callableStatement.getUpdateCount()).willReturn(-1); + given(connection.prepareCall("{call " + StoredProcedureWithResultSet.SQL + "()}") + ).willReturn(callableStatement); + StoredProcedureWithResultSet sproc = new StoredProcedureWithResultSet(dataSource); sproc.execute(); - - ctrlResultSet.verify(); assertEquals(2, sproc.getCount()); + verify(resultSet).close(); } + @Test + @SuppressWarnings("unchecked") public void testStoredProcedureWithResultSetMapped() throws Exception { - MockControl ctrlResultSet = MockControl.createControl(ResultSet.class); - ResultSet mockResultSet = (ResultSet) ctrlResultSet.getMock(); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getString(2); - ctrlResultSet.setReturnValue("Foo"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(true); - mockResultSet.getString(2); - ctrlResultSet.setReturnValue("Bar"); - mockResultSet.next(); - ctrlResultSet.setReturnValue(false); - mockResultSet.close(); - ctrlResultSet.setVoidCallable(); - - mockCallable.execute(); - ctrlCallable.setReturnValue(true); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - mockCallable.getResultSet(); - ctrlCallable.setReturnValue(mockResultSet); - mockCallable.getMoreResults(); - ctrlCallable.setReturnValue(false); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - if (debugEnabled) { - mockCallable.getWarnings(); - ctrlCallable.setReturnValue(null); - } - mockCallable.close(); - ctrlCallable.setVoidCallable(); - - mockConnection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}"); - ctrlConnection.setReturnValue(mockCallable); - - replay(); - ctrlResultSet.replay(); - - StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped(mockDataSource); - Map res = sproc.execute(); - - ctrlResultSet.verify(); - - List rs = (List) res.get("rs"); + ResultSet resultSet = mock(ResultSet.class); + given(resultSet.next()).willReturn(true, true, false); + given(resultSet.getString(2)).willReturn("Foo", "Bar"); + given(callableStatement.execute()).willReturn(true); + given(callableStatement.getUpdateCount()).willReturn(-1); + given(callableStatement.getResultSet()).willReturn(resultSet); + given(callableStatement.getMoreResults()).willReturn(false); + given(callableStatement.getUpdateCount()).willReturn(-1); + given(connection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}") + ).willReturn(callableStatement); + StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped(dataSource); + Map res = sproc.execute(); + List rs = (List) res.get("rs"); assertEquals(2, rs.size()); assertEquals("Foo", rs.get(0)); assertEquals("Bar", rs.get(1)); - + verify(resultSet).close(); } + @Test + @SuppressWarnings("unchecked") public void testStoredProcedureWithUndeclaredResults() throws Exception { - MockControl ctrlResultSet1 = MockControl.createControl(ResultSet.class); - ResultSet mockResultSet1 = (ResultSet) ctrlResultSet1.getMock(); - mockResultSet1.next(); - ctrlResultSet1.setReturnValue(true); - mockResultSet1.getString(2); - ctrlResultSet1.setReturnValue("Foo"); - mockResultSet1.next(); - ctrlResultSet1.setReturnValue(true); - mockResultSet1.getString(2); - ctrlResultSet1.setReturnValue("Bar"); - mockResultSet1.next(); - ctrlResultSet1.setReturnValue(false); - mockResultSet1.close(); - ctrlResultSet1.setVoidCallable(); - - MockControl ctrlMetaData = MockControl.createControl(ResultSetMetaData.class); - ResultSetMetaData mockMetaData = (ResultSetMetaData) ctrlMetaData.getMock(); - mockMetaData.getColumnCount(); - ctrlMetaData.setReturnValue(2); - mockMetaData.getColumnLabel(1); - ctrlMetaData.setReturnValue("spam"); - mockMetaData.getColumnLabel(2); - ctrlMetaData.setReturnValue("eggs"); - - MockControl ctrlResultSet2 = MockControl.createControl(ResultSet.class); - ResultSet mockResultSet2 = (ResultSet) ctrlResultSet2.getMock(); - mockResultSet2.getMetaData(); - ctrlResultSet2.setReturnValue(mockMetaData); - mockResultSet2.next(); - ctrlResultSet2.setReturnValue(true); - mockResultSet2.getObject(1); - ctrlResultSet2.setReturnValue("Spam"); - mockResultSet2.getObject(2); - ctrlResultSet2.setReturnValue("Eggs"); - mockResultSet2.next(); - ctrlResultSet2.setReturnValue(false); - mockResultSet2.close(); - ctrlResultSet2.setVoidCallable(); - - mockCallable.execute(); - ctrlCallable.setReturnValue(true); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - mockCallable.getResultSet(); - ctrlCallable.setReturnValue(mockResultSet1); - mockCallable.getMoreResults(); - ctrlCallable.setReturnValue(true); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - mockCallable.getResultSet(); - ctrlCallable.setReturnValue(mockResultSet2); - mockCallable.getMoreResults(); - ctrlCallable.setReturnValue(false); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(0); - mockCallable.getMoreResults(); - ctrlCallable.setReturnValue(false); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - if (debugEnabled) { - mockCallable.getWarnings(); - ctrlCallable.setReturnValue(null); - } - mockCallable.close(); - ctrlCallable.setVoidCallable(); - - mockConnection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}"); - ctrlConnection.setReturnValue(mockCallable); - - replay(); - ctrlResultSet1.replay(); - ctrlMetaData.replay(); - ctrlResultSet2.replay(); - - StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped(mockDataSource); - Map res = sproc.execute(); - - ctrlResultSet1.verify(); - ctrlResultSet2.verify(); + ResultSet resultSet1 = mock(ResultSet.class); + given(resultSet1.next()).willReturn(true, true, false); + given(resultSet1.getString(2)).willReturn("Foo", "Bar"); + + ResultSetMetaData resultSetMetaData = mock(ResultSetMetaData.class); + given(resultSetMetaData.getColumnCount()).willReturn(2); + given(resultSetMetaData.getColumnLabel(1)).willReturn("spam"); + given(resultSetMetaData.getColumnLabel(2)).willReturn("eggs"); + + ResultSet resultSet2 = mock(ResultSet.class); + given(resultSet2.getMetaData()).willReturn(resultSetMetaData); + given(resultSet2.next()).willReturn(true, false); + given(resultSet2.getObject(1)).willReturn("Spam"); + given(resultSet2.getObject(2)).willReturn("Eggs"); + + given(callableStatement.execute()).willReturn(true); + given(callableStatement.getUpdateCount()).willReturn(-1); + given(callableStatement.getResultSet()).willReturn(resultSet1, resultSet2); + given(callableStatement.getMoreResults()).willReturn(true, false, false); + given(callableStatement.getUpdateCount()).willReturn(-1, -1, 0, -1); + given(connection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}") + ).willReturn(callableStatement); + + StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped(dataSource); + Map res = sproc.execute(); assertEquals("incorrect number of returns", 3, res.size()); - List rs1 = (List) res.get("rs"); + List rs1 = (List) res.get("rs"); assertEquals(2, rs1.size()); assertEquals("Foo", rs1.get(0)); assertEquals("Bar", rs1.get(1)); - List rs2 = (List) res.get("#result-set-2"); + List rs2 = (List) res.get("#result-set-2"); assertEquals(1, rs2.size()); Object o2 = rs2.get(0); assertTrue("wron type returned for result set 2", o2 instanceof Map); - Map m2 = (Map) o2; + Map m2 = (Map) o2; assertEquals("Spam", m2.get("spam")); assertEquals("Eggs", m2.get("eggs")); Number n = (Number) res.get("#update-count-1"); assertEquals("wrong update count", 0, n.intValue()); + verify(resultSet1).close(); + verify(resultSet2).close(); } + @Test public void testStoredProcedureSkippingResultsProcessing() throws Exception { - mockCallable.execute(); - ctrlCallable.setReturnValue(true); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - if (debugEnabled) { - mockCallable.getWarnings(); - ctrlCallable.setReturnValue(null); - } - mockCallable.close(); - ctrlCallable.setVoidCallable(); - - mockConnection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}"); - ctrlConnection.setReturnValue(mockCallable); - - replay(); - - JdbcTemplate jdbcTemplate = new JdbcTemplate(mockDataSource); + given(callableStatement.execute()).willReturn(true); + given(callableStatement.getUpdateCount()).willReturn(-1); + given(connection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}") + ).willReturn(callableStatement); + JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); jdbcTemplate.setSkipResultsProcessing(true); - StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped(jdbcTemplate); - Map res = sproc.execute(); - + StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped( + jdbcTemplate); + Map res = sproc.execute(); assertEquals("incorrect number of returns", 0, res.size()); } + @Test + @SuppressWarnings("unchecked") public void testStoredProcedureSkippingUndeclaredResults() throws Exception { - MockControl ctrlResultSet1 = MockControl.createControl(ResultSet.class); - ResultSet mockResultSet1 = (ResultSet) ctrlResultSet1.getMock(); - mockResultSet1.next(); - ctrlResultSet1.setReturnValue(true); - mockResultSet1.getString(2); - ctrlResultSet1.setReturnValue("Foo"); - mockResultSet1.next(); - ctrlResultSet1.setReturnValue(true); - mockResultSet1.getString(2); - ctrlResultSet1.setReturnValue("Bar"); - mockResultSet1.next(); - ctrlResultSet1.setReturnValue(false); - mockResultSet1.close(); - ctrlResultSet1.setVoidCallable(); - - mockCallable.execute(); - ctrlCallable.setReturnValue(true); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - mockCallable.getResultSet(); - ctrlCallable.setReturnValue(mockResultSet1); - mockCallable.getMoreResults(); - ctrlCallable.setReturnValue(true); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - mockCallable.getMoreResults(); - ctrlCallable.setReturnValue(false); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - if (debugEnabled) { - mockCallable.getWarnings(); - ctrlCallable.setReturnValue(null); - } - mockCallable.close(); - ctrlCallable.setVoidCallable(); - - mockConnection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}"); - ctrlConnection.setReturnValue(mockCallable); - - replay(); - ctrlResultSet1.replay(); - - JdbcTemplate jdbcTemplate = new JdbcTemplate(mockDataSource); + ResultSet resultSet = mock(ResultSet.class); + given(resultSet.next()).willReturn(true, true, false); + given(resultSet.getString(2)).willReturn("Foo", "Bar"); + given(callableStatement.execute()).willReturn(true); + given(callableStatement.getUpdateCount()).willReturn(-1); + given(callableStatement.getResultSet()).willReturn(resultSet); + given(callableStatement.getMoreResults()).willReturn(true, false); + given(callableStatement.getUpdateCount()).willReturn(-1, -1); + given(connection.prepareCall("{call " + StoredProcedureWithResultSetMapped.SQL + "()}") + ).willReturn(callableStatement); + + JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); jdbcTemplate.setSkipUndeclaredResults(true); - StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped(jdbcTemplate); - Map res = sproc.execute(); - - ctrlResultSet1.verify(); + StoredProcedureWithResultSetMapped sproc = new StoredProcedureWithResultSetMapped( + jdbcTemplate); + Map res = sproc.execute(); assertEquals("incorrect number of returns", 1, res.size()); - - List rs1 = (List) res.get("rs"); + List rs1 = (List) res.get("rs"); assertEquals(2, rs1.size()); assertEquals("Foo", rs1.get(0)); assertEquals("Bar", rs1.get(1)); + verify(resultSet).close(); } + @Test public void testParameterMapper() throws Exception { - mockCallable.setString(1, "EasyMock for interface java.sql.Connection"); - ctrlCallable.setVoidCallable(); - mockCallable.registerOutParameter(2, Types.VARCHAR); - ctrlCallable.setVoidCallable(); - mockCallable.execute(); - ctrlCallable.setReturnValue(false); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - mockCallable.getObject(2); - ctrlCallable.setReturnValue("OK"); - if (debugEnabled) { - mockCallable.getWarnings(); - ctrlCallable.setReturnValue(null); - } - mockCallable.close(); - ctrlCallable.setVoidCallable(); - - mockConnection.prepareCall( - "{call " + ParameterMapperStoredProcedure.SQL + "(?, ?)}"); - ctrlConnection.setReturnValue(mockCallable); - - replay(); - ParameterMapperStoredProcedure pmsp = new ParameterMapperStoredProcedure(mockDataSource); - Map out = pmsp.executeTest(); + given(callableStatement.execute()).willReturn(false); + given(callableStatement.getUpdateCount()).willReturn(-1); + given(callableStatement.getObject(2)).willReturn("OK"); + given(connection.prepareCall("{call " + ParameterMapperStoredProcedure.SQL + "(?, ?)}") + ).willReturn(callableStatement); + + ParameterMapperStoredProcedure pmsp = new ParameterMapperStoredProcedure(dataSource); + Map out = pmsp.executeTest(); assertEquals("OK", out.get("out")); + + verify(callableStatement).setString(eq(1), startsWith("Mock for Connection")); + verify(callableStatement).registerOutParameter(2, Types.VARCHAR); } + @Test public void testSqlTypeValue() throws Exception { - int[] testVal = new int[] {1, 2}; - mockCallable.getConnection(); - ctrlCallable.setDefaultReturnValue(mockConnection); - mockCallable.setObject(1, testVal, Types.ARRAY); - ctrlCallable.setVoidCallable(); - mockCallable.registerOutParameter(2, Types.VARCHAR); - ctrlCallable.setVoidCallable(); - mockCallable.execute(); - ctrlCallable.setReturnValue(false); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - mockCallable.getObject(2); - ctrlCallable.setReturnValue("OK"); - if (debugEnabled) { - mockCallable.getWarnings(); - ctrlCallable.setReturnValue(null); - } - mockCallable.close(); - ctrlCallable.setVoidCallable(); - - mockConnection.prepareCall( - "{call " + SqlTypeValueStoredProcedure.SQL + "(?, ?)}"); - ctrlConnection.setReturnValue(mockCallable); - - replay(); - SqlTypeValueStoredProcedure stvsp = new SqlTypeValueStoredProcedure(mockDataSource); - Map out = stvsp.executeTest(testVal); + int[] testVal = new int[] { 1, 2 }; + given(callableStatement.execute()).willReturn(false); + given(callableStatement.getUpdateCount()).willReturn(-1); + given(callableStatement.getObject(2)).willReturn("OK"); + given(connection.prepareCall("{call " + SqlTypeValueStoredProcedure.SQL + "(?, ?)}") + ).willReturn(callableStatement); + + SqlTypeValueStoredProcedure stvsp = new SqlTypeValueStoredProcedure(dataSource); + Map out = stvsp.executeTest(testVal); assertEquals("OK", out.get("out")); + verify(callableStatement).setObject(1, testVal, Types.ARRAY); + verify(callableStatement).registerOutParameter(2, Types.VARCHAR); } + @Test public void testNumericWithScale() throws Exception { - mockCallable.getConnection(); - ctrlCallable.setDefaultReturnValue(mockConnection); - mockCallable.registerOutParameter(1, Types.DECIMAL, 4); - ctrlCallable.setVoidCallable(); - mockCallable.execute(); - ctrlCallable.setReturnValue(false); - mockCallable.getUpdateCount(); - ctrlCallable.setReturnValue(-1); - mockCallable.getObject(1); - ctrlCallable.setReturnValue(new BigDecimal("12345.6789")); - if (debugEnabled) { - mockCallable.getWarnings(); - ctrlCallable.setReturnValue(null); - } - mockCallable.close(); - ctrlCallable.setVoidCallable(); - - mockConnection.prepareCall( - "{call " + NumericWithScaleStoredProcedure.SQL + "(?)}"); - ctrlConnection.setReturnValue(mockCallable); - - replay(); - NumericWithScaleStoredProcedure nwssp = new NumericWithScaleStoredProcedure(mockDataSource); - Map out = nwssp.executeTest(); + given(callableStatement.execute()).willReturn(false); + given(callableStatement.getUpdateCount()).willReturn(-1); + given(callableStatement.getObject(1)).willReturn(new BigDecimal("12345.6789")); + given(connection.prepareCall("{call " + NumericWithScaleStoredProcedure.SQL + "(?)}") + ).willReturn(callableStatement); + NumericWithScaleStoredProcedure nwssp = new NumericWithScaleStoredProcedure(dataSource); + Map out = nwssp.executeTest(); assertEquals(new BigDecimal("12345.6789"), out.get("out")); + verify(callableStatement).registerOutParameter(1, Types.DECIMAL, 4); } - private static class StoredProcedureConfiguredViaJdbcTemplate extends StoredProcedure { public static final String SQL = "configured_via_jt"; @@ -769,15 +455,13 @@ public class StoredProcedureTests extends AbstractJdbcTests { } public int execute(int intIn) { - Map in = new HashMap(); - in.put("intIn", new Integer(intIn)); - Map out = execute(in); - Number intOut = (Number) out.get("intOut"); - return intOut.intValue(); + Map in = new HashMap(); + in.put("intIn", intIn); + Map out = execute(in); + return ((Number) out.get("intOut")).intValue(); } } - private static class AddInvoice extends StoredProcedure { public static final String SQL = "add_invoice"; @@ -792,12 +476,11 @@ public class StoredProcedureTests extends AbstractJdbcTests { } public int execute(int amount, int custid) { - Map in = new HashMap(); - in.put("amount", new Integer(amount)); - in.put("custid", new Integer(custid)); - Map out = execute(in); - Number id = (Number) out.get("newid"); - return id.intValue(); + Map in = new HashMap(); + in.put("amount", amount); + in.put("custid", custid); + Map out = execute(in); + return ((Number) out.get("newid")).intValue(); } } @@ -815,14 +498,11 @@ public class StoredProcedureTests extends AbstractJdbcTests { } public int execute(int amount, int custid) { - Map out = execute(new Object[] {amount, custid}); - System.out.println("####### " + out); - Number id = (Number) out.get("newid"); - return id.intValue(); + Map out = execute(new Object[] { amount, custid }); + return ((Number) out.get("newid")).intValue(); } } - private static class NullArg extends StoredProcedure { public static final String SQL = "takes_null"; @@ -835,13 +515,12 @@ public class StoredProcedureTests extends AbstractJdbcTests { } public void execute(String s) { - Map in = new HashMap(); + Map in = new HashMap(); in.put("ptest", s); - Map out = execute(in); + execute(in); } } - private static class NoSuchStoredProcedure extends StoredProcedure { public static final String SQL = "no_sproc_with_this_name"; @@ -853,11 +532,10 @@ public class StoredProcedureTests extends AbstractJdbcTests { } public void execute() { - execute(new HashMap()); + execute(new HashMap()); } } - private static class UnnamedParameterStoredProcedure extends StoredProcedure { public UnnamedParameterStoredProcedure(DataSource ds) { @@ -866,14 +544,8 @@ public class StoredProcedureTests extends AbstractJdbcTests { compile(); } - public void execute(int id) { - Map in = new HashMap(); - in.put("id", new Integer(id)); - Map out = execute(in); - } } - private static class MissingParameterStoredProcedure extends StoredProcedure { public MissingParameterStoredProcedure(DataSource ds) { @@ -884,11 +556,10 @@ public class StoredProcedureTests extends AbstractJdbcTests { } public void execute() { - execute(new HashMap()); + execute(new HashMap()); } } - private static class StoredProcedureWithResultSet extends StoredProcedure { public static final String SQL = "sproc_with_result_set"; @@ -903,7 +574,7 @@ public class StoredProcedureTests extends AbstractJdbcTests { } public void execute() { - execute(new HashMap()); + execute(new HashMap()); } public int getCount() { @@ -911,7 +582,6 @@ public class StoredProcedureTests extends AbstractJdbcTests { } } - private static class StoredProcedureWithResultSetMapped extends StoredProcedure { public static final String SQL = "sproc_with_result_set"; @@ -919,33 +589,30 @@ public class StoredProcedureTests extends AbstractJdbcTests { public StoredProcedureWithResultSetMapped(DataSource ds) { setDataSource(ds); setSql(SQL); - declareParameter( - new SqlReturnResultSet("rs", new RowMapperImpl())); + declareParameter(new SqlReturnResultSet("rs", new RowMapperImpl())); compile(); } public StoredProcedureWithResultSetMapped(JdbcTemplate jt) { setJdbcTemplate(jt); setSql(SQL); - declareParameter( - new SqlReturnResultSet("rs", new RowMapperImpl())); + declareParameter(new SqlReturnResultSet("rs", new RowMapperImpl())); compile(); } - public Map execute() { - Map out = execute(new HashMap()); - return out; + public Map execute() { + return execute(new HashMap()); } - private static class RowMapperImpl implements RowMapper { + private static class RowMapperImpl implements RowMapper { + @Override - public Object mapRow(ResultSet rs, int rowNum) throws SQLException { + public String mapRow(ResultSet rs, int rowNum) throws SQLException { return rs.getString(2); } } } - private static class ParameterMapperStoredProcedure extends StoredProcedure { public static final String SQL = "parameter_mapper_sp"; @@ -958,10 +625,8 @@ public class StoredProcedureTests extends AbstractJdbcTests { compile(); } - public Map executeTest() { - Map out = null; - out = execute(new TestParameterMapper()); - return out; + public Map executeTest() { + return execute(new TestParameterMapper()); } private static class TestParameterMapper implements ParameterMapper { @@ -970,16 +635,15 @@ public class StoredProcedureTests extends AbstractJdbcTests { } @Override - public Map createMap(Connection conn) throws SQLException { - Map inParms = new HashMap(); - String testValue = conn.toString(); + public Map createMap(Connection con) throws SQLException { + Map inParms = new HashMap(); + String testValue = con.toString(); inParms.put("in", testValue); return inParms; } } } - private static class SqlTypeValueStoredProcedure extends StoredProcedure { public static final String SQL = "sql_type_value_sp"; @@ -992,20 +656,18 @@ public class StoredProcedureTests extends AbstractJdbcTests { compile(); } - public Map executeTest(final int[] inValue) { - Map in = new HashMap(1); + public Map executeTest(final int[] inValue) { + Map in = new HashMap(); in.put("in", new AbstractSqlTypeValue() { @Override public Object createTypeValue(Connection con, int type, String typeName) { - //assertEquals(Connection.class, con.getClass()); - //assertEquals(Types.ARRAY, type); - //assertEquals("NUMBER", typeName); + // assertEquals(Connection.class, con.getClass()); + // assertEquals(Types.ARRAY, type); + // assertEquals("NUMBER", typeName); return inValue; } }); - Map out = null; - out = execute(in); - return out; + return execute(in); } } @@ -1020,15 +682,11 @@ public class StoredProcedureTests extends AbstractJdbcTests { compile(); } - public Map executeTest() { - Map in = new HashMap(1); - Map out = null; - out = execute(in); - return out; + public Map executeTest() { + return execute(new HashMap()); } } - private static class StoredProcedureExceptionTranslator extends StoredProcedure { public static final String SQL = "no_sproc_with_this_name"; @@ -1037,11 +695,10 @@ public class StoredProcedureTests extends AbstractJdbcTests { setDataSource(ds); setSql(SQL); getJdbcTemplate().setExceptionTranslator(new SQLExceptionTranslator() { + @Override - public DataAccessException translate( - String task, - String sql, - SQLException sqlex) { + public DataAccessException translate(String task, String sql, + SQLException sqlex) { return new CustomDataException(sql, sqlex); } @@ -1050,11 +707,10 @@ public class StoredProcedureTests extends AbstractJdbcTests { } public void execute() { - execute(new HashMap()); + execute(new HashMap()); } } - @SuppressWarnings("serial") private static class CustomDataException extends DataAccessException { diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java index bb022964a35..1b24276eb63 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java @@ -16,6 +16,12 @@ package org.springframework.jdbc.support; +import static org.junit.Assert.assertEquals; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; @@ -23,9 +29,7 @@ import java.sql.Statement; import javax.sql.DataSource; -import junit.framework.TestCase; -import org.easymock.MockControl; - +import org.junit.Test; import org.springframework.jdbc.support.incrementer.HsqlMaxValueIncrementer; import org.springframework.jdbc.support.incrementer.MySQLMaxValueIncrementer; import org.springframework.jdbc.support.incrementer.OracleSequenceMaxValueIncrementer; @@ -35,50 +39,26 @@ import org.springframework.jdbc.support.incrementer.PostgreSQLSequenceMaxValueIn * @author Juergen Hoeller * @since 27.02.2004 */ -public class DataFieldMaxValueIncrementerTests extends TestCase { +public class DataFieldMaxValueIncrementerTests { + private DataSource dataSource = mock(DataSource.class); + private Connection connection = mock(Connection.class); + private Statement statement = mock(Statement.class); + private ResultSet resultSet = mock(ResultSet.class); + + @Test public void testHsqlMaxValueIncrementer() throws SQLException { - MockControl dsControl = MockControl.createControl(DataSource.class); - DataSource ds = (DataSource) dsControl.getMock(); - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - MockControl stmtControl = MockControl.createControl(Statement.class); - Statement stmt = (Statement) stmtControl.getMock(); - MockControl rsControl = MockControl.createControl(ResultSet.class); - ResultSet rs = (ResultSet) rsControl.getMock(); - - ds.getConnection(); - dsControl.setReturnValue(con, 2); - con.createStatement(); - conControl.setReturnValue(stmt, 2); - stmt.executeUpdate("insert into myseq values(null)"); - stmtControl.setReturnValue(1, 6); - stmt.executeQuery("select max(identity()) from myseq"); - stmtControl.setReturnValue(rs, 6); - rs.next(); - rsControl.setReturnValue(true, 6); - for (long i = 0; i < 6; i++) { - rs.getLong(1); - rsControl.setReturnValue(i); - } - rs.close(); - rsControl.setVoidCallable(6); - stmt.executeUpdate("delete from myseq where seq < 2"); - stmtControl.setReturnValue(1); - stmt.executeUpdate("delete from myseq where seq < 5"); - stmtControl.setReturnValue(1); - stmt.close(); - stmtControl.setVoidCallable(2); - con.close(); - conControl.setVoidCallable(2); - - dsControl.replay(); - conControl.replay(); - stmtControl.replay(); - rsControl.replay(); + given(dataSource.getConnection()).willReturn(connection); + given(connection.createStatement()).willReturn(statement); + given(statement.executeUpdate("insert into myseq values(null)")).willReturn(1); + given(statement.executeQuery("select max(identity()) from myseq")).willReturn(resultSet); + given(resultSet.next()).willReturn(true); + given(resultSet.getLong(1)).willReturn(0L, 1L, 2L, 3L, 4L, 5L); + given(statement.executeUpdate("delete from myseq where seq < 2")).willReturn(1); + given(statement.executeUpdate("delete from myseq where seq < 5")).willReturn(1); HsqlMaxValueIncrementer incrementer = new HsqlMaxValueIncrementer(); - incrementer.setDataSource(ds); + incrementer.setDataSource(dataSource); incrementer.setIncrementerName("myseq"); incrementer.setColumnName("seq"); incrementer.setCacheSize(3); @@ -90,51 +70,22 @@ public class DataFieldMaxValueIncrementerTests extends TestCase { assertEquals("002", incrementer.nextStringValue()); assertEquals(3, incrementer.nextIntValue()); assertEquals(4, incrementer.nextLongValue()); - - dsControl.verify(); - conControl.verify(); - stmtControl.verify(); - rsControl.verify(); + verify(resultSet, times(6)).close(); + verify(statement, times(2)).close(); + verify(connection, times(2)).close(); } + @Test public void testMySQLMaxValueIncrementer() throws SQLException { - MockControl dsControl = MockControl.createControl(DataSource.class); - DataSource ds = (DataSource) dsControl.getMock(); - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - MockControl stmtControl = MockControl.createControl(Statement.class); - Statement stmt = (Statement) stmtControl.getMock(); - MockControl rsControl = MockControl.createControl(ResultSet.class); - ResultSet rs = (ResultSet) rsControl.getMock(); - - ds.getConnection(); - dsControl.setReturnValue(con, 2); - con.createStatement(); - conControl.setReturnValue(stmt, 2); - stmt.executeUpdate("update myseq set seq = last_insert_id(seq + 2)"); - stmtControl.setReturnValue(1, 2); - stmt.executeQuery("select last_insert_id()"); - stmtControl.setReturnValue(rs, 2); - rs.next(); - rsControl.setReturnValue(true, 2); - rs.getLong(1); - rsControl.setReturnValue(2); - rs.getLong(1); - rsControl.setReturnValue(4); - rs.close(); - rsControl.setVoidCallable(2); - stmt.close(); - stmtControl.setVoidCallable(2); - con.close(); - conControl.setVoidCallable(2); - - dsControl.replay(); - conControl.replay(); - stmtControl.replay(); - rsControl.replay(); + given(dataSource.getConnection()).willReturn(connection); + given(connection.createStatement()).willReturn(statement); + given(statement.executeUpdate("update myseq set seq = last_insert_id(seq + 2)")).willReturn(1); + given(statement.executeQuery("select last_insert_id()")).willReturn(resultSet); + given(resultSet.next()).willReturn(true); + given(resultSet.getLong(1)).willReturn(2L, 4L); MySQLMaxValueIncrementer incrementer = new MySQLMaxValueIncrementer(); - incrementer.setDataSource(ds); + incrementer.setDataSource(dataSource); incrementer.setIncrementerName("myseq"); incrementer.setColumnName("seq"); incrementer.setCacheSize(2); @@ -146,48 +97,21 @@ public class DataFieldMaxValueIncrementerTests extends TestCase { assertEquals("3", incrementer.nextStringValue()); assertEquals(4, incrementer.nextLongValue()); - dsControl.verify(); - conControl.verify(); - stmtControl.verify(); - rsControl.verify(); + verify(resultSet, times(2)).close(); + verify(statement, times(2)).close(); + verify(connection, times(2)).close(); } + @Test public void testPostgreSQLSequenceMaxValueIncrementer() throws SQLException { - MockControl dsControl = MockControl.createControl(DataSource.class); - DataSource ds = (DataSource) dsControl.getMock(); - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - MockControl stmtControl = MockControl.createControl(Statement.class); - Statement stmt = (Statement) stmtControl.getMock(); - MockControl rsControl = MockControl.createControl(ResultSet.class); - ResultSet rs = (ResultSet) rsControl.getMock(); - - ds.getConnection(); - dsControl.setReturnValue(con, 2); - con.createStatement(); - conControl.setReturnValue(stmt, 2); - stmt.executeQuery("select nextval('myseq')"); - stmtControl.setReturnValue(rs, 2); - rs.next(); - rsControl.setReturnValue(true, 2); - rs.getLong(1); - rsControl.setReturnValue(10); - rs.getLong(1); - rsControl.setReturnValue(12); - rs.close(); - rsControl.setVoidCallable(2); - stmt.close(); - stmtControl.setVoidCallable(2); - con.close(); - conControl.setVoidCallable(2); - - dsControl.replay(); - conControl.replay(); - stmtControl.replay(); - rsControl.replay(); + given(dataSource.getConnection()).willReturn(connection); + given(connection.createStatement()).willReturn(statement); + given(statement.executeQuery("select nextval('myseq')")).willReturn(resultSet); + given(resultSet.next()).willReturn(true); + given(resultSet.getLong(1)).willReturn(10L, 12L); PostgreSQLSequenceMaxValueIncrementer incrementer = new PostgreSQLSequenceMaxValueIncrementer(); - incrementer.setDataSource(ds); + incrementer.setDataSource(dataSource); incrementer.setIncrementerName("myseq"); incrementer.setPaddingLength(5); incrementer.afterPropertiesSet(); @@ -195,48 +119,21 @@ public class DataFieldMaxValueIncrementerTests extends TestCase { assertEquals("00010", incrementer.nextStringValue()); assertEquals(12, incrementer.nextIntValue()); - dsControl.verify(); - conControl.verify(); - stmtControl.verify(); - rsControl.verify(); + verify(resultSet, times(2)).close(); + verify(statement, times(2)).close(); + verify(connection, times(2)).close(); } + @Test public void testOracleSequenceMaxValueIncrementer() throws SQLException { - MockControl dsControl = MockControl.createControl(DataSource.class); - DataSource ds = (DataSource) dsControl.getMock(); - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - MockControl stmtControl = MockControl.createControl(Statement.class); - Statement stmt = (Statement) stmtControl.getMock(); - MockControl rsControl = MockControl.createControl(ResultSet.class); - ResultSet rs = (ResultSet) rsControl.getMock(); - - ds.getConnection(); - dsControl.setReturnValue(con, 2); - con.createStatement(); - conControl.setReturnValue(stmt, 2); - stmt.executeQuery("select myseq.nextval from dual"); - stmtControl.setReturnValue(rs, 2); - rs.next(); - rsControl.setReturnValue(true, 2); - rs.getLong(1); - rsControl.setReturnValue(10); - rs.getLong(1); - rsControl.setReturnValue(12); - rs.close(); - rsControl.setVoidCallable(2); - stmt.close(); - stmtControl.setVoidCallable(2); - con.close(); - conControl.setVoidCallable(2); - - dsControl.replay(); - conControl.replay(); - stmtControl.replay(); - rsControl.replay(); + given(dataSource.getConnection()).willReturn(connection); + given(connection.createStatement()).willReturn(statement); + given(statement.executeQuery("select myseq.nextval from dual")).willReturn(resultSet); + given(resultSet.next()).willReturn(true); + given(resultSet.getLong(1)).willReturn(10L, 12L); OracleSequenceMaxValueIncrementer incrementer = new OracleSequenceMaxValueIncrementer(); - incrementer.setDataSource(ds); + incrementer.setDataSource(dataSource); incrementer.setIncrementerName("myseq"); incrementer.setPaddingLength(2); incrementer.afterPropertiesSet(); @@ -244,10 +141,9 @@ public class DataFieldMaxValueIncrementerTests extends TestCase { assertEquals(10, incrementer.nextLongValue()); assertEquals("12", incrementer.nextStringValue()); - dsControl.verify(); - conControl.verify(); - stmtControl.verify(); - rsControl.verify(); + verify(resultSet, times(2)).close(); + verify(statement, times(2)).close(); + verify(connection, times(2)).close(); } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java index f4db4d3e66f..96140c6c9a2 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java @@ -16,18 +16,19 @@ package org.springframework.jdbc.support; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.Reader; import java.io.StringReader; import java.sql.PreparedStatement; -import java.sql.SQLException; import java.sql.ResultSet; +import java.sql.SQLException; -import junit.framework.TestCase; -import org.easymock.MockControl; - +import org.junit.Test; import org.springframework.jdbc.support.lob.DefaultLobHandler; import org.springframework.jdbc.support.lob.LobCreator; import org.springframework.jdbc.support.lob.LobHandler; @@ -36,126 +37,77 @@ import org.springframework.jdbc.support.lob.LobHandler; * @author Juergen Hoeller * @since 17.12.2003 */ -public class DefaultLobHandlerTests extends TestCase { +public class DefaultLobHandlerTests { + private ResultSet rs = mock(ResultSet.class); + private PreparedStatement ps = mock(PreparedStatement.class); + private LobHandler lobHandler = new DefaultLobHandler(); + private LobCreator lobCreator = lobHandler.getLobCreator(); + + @Test public void testGetBlobAsBytes() throws SQLException { - LobHandler lobHandler = new DefaultLobHandler(); - MockControl rsControl = MockControl.createControl(ResultSet.class); - ResultSet rs = (ResultSet) rsControl.getMock(); - rs.getBytes(1); - rsControl.setReturnValue(null); - rsControl.replay(); lobHandler.getBlobAsBytes(rs, 1); - rsControl.verify(); + verify(rs).getBytes(1); } + @Test public void testGetBlobAsBinaryStream() throws SQLException { - LobHandler lobHandler = new DefaultLobHandler(); - MockControl rsControl = MockControl.createControl(ResultSet.class); - ResultSet rs = (ResultSet) rsControl.getMock(); - rs.getBinaryStream(1); - rsControl.setReturnValue(null); - rsControl.replay(); lobHandler.getBlobAsBinaryStream(rs, 1); - rsControl.verify(); + verify(rs).getBinaryStream(1); } + @Test public void testGetClobAsString() throws SQLException { - LobHandler lobHandler = new DefaultLobHandler(); - MockControl rsControl = MockControl.createControl(ResultSet.class); - ResultSet rs = (ResultSet) rsControl.getMock(); - rs.getString(1); - rsControl.setReturnValue(null); - rsControl.replay(); lobHandler.getClobAsString(rs, 1); - rsControl.verify(); + verify(rs).getString(1); } + @Test public void testGetClobAsAsciiStream() throws SQLException { - LobHandler lobHandler = new DefaultLobHandler(); - MockControl rsControl = MockControl.createControl(ResultSet.class); - ResultSet rs = (ResultSet) rsControl.getMock(); - rs.getAsciiStream(1); - rsControl.setReturnValue(null); - rsControl.replay(); lobHandler.getClobAsAsciiStream(rs, 1); - rsControl.verify(); + verify(rs).getAsciiStream(1); } + @Test public void testGetClobAsCharacterStream() throws SQLException { - LobHandler lobHandler = new DefaultLobHandler(); - MockControl rsControl = MockControl.createControl(ResultSet.class); - ResultSet rs = (ResultSet) rsControl.getMock(); - rs.getCharacterStream(1); - rsControl.setReturnValue(null); - rsControl.replay(); lobHandler.getClobAsCharacterStream(rs, 1); - rsControl.verify(); + verify(rs).getCharacterStream(1); } + @Test public void testSetBlobAsBytes() throws SQLException { - LobCreator lobCreator = (new DefaultLobHandler()).getLobCreator(); byte[] content = "testContent".getBytes(); - - MockControl psControl = MockControl.createControl(PreparedStatement.class); - PreparedStatement ps = (PreparedStatement) psControl.getMock(); - ps.setBytes(1, content); - psControl.replay(); - lobCreator.setBlobAsBytes(ps, 1, content); - psControl.verify(); + verify(ps).setBytes(1, content); } + @Test public void testSetBlobAsBinaryStream() throws SQLException, IOException { - LobCreator lobCreator = (new DefaultLobHandler()).getLobCreator(); - InputStream bis = new ByteArrayInputStream("testContent".getBytes()); - - MockControl psControl = MockControl.createControl(PreparedStatement.class); - PreparedStatement ps = (PreparedStatement) psControl.getMock(); - ps.setBinaryStream(1, bis, 11); - psControl.replay(); + InputStream bis = new ByteArrayInputStream("testContent".getBytes()); lobCreator.setBlobAsBinaryStream(ps, 1, bis, 11); - psControl.verify(); + verify(ps).setBinaryStream(1, bis, 11); } + @Test public void testSetClobAsString() throws SQLException, IOException { - LobCreator lobCreator = (new DefaultLobHandler()).getLobCreator(); String content = "testContent"; - - MockControl psControl = MockControl.createControl(PreparedStatement.class); - PreparedStatement ps = (PreparedStatement) psControl.getMock(); - ps.setString(1, content); - psControl.replay(); - lobCreator.setClobAsString(ps, 1, content); - psControl.verify(); + verify(ps).setString(1, content); } + @Test public void testSetClobAsAsciiStream() throws SQLException, IOException { - LobCreator lobCreator = (new DefaultLobHandler()).getLobCreator(); InputStream bis = new ByteArrayInputStream("testContent".getBytes()); - - MockControl psControl = MockControl.createControl(PreparedStatement.class); - PreparedStatement ps = (PreparedStatement) psControl.getMock(); - ps.setAsciiStream(1, bis, 11); - psControl.replay(); - lobCreator.setClobAsAsciiStream(ps, 1, bis, 11); - psControl.verify(); + verify(ps).setAsciiStream(1, bis, 11); } + @Test public void testSetClobAsCharacterStream() throws SQLException, IOException { - LobCreator lobCreator = (new DefaultLobHandler()).getLobCreator(); Reader str = new StringReader("testContent"); - - MockControl psControl = MockControl.createControl(PreparedStatement.class); - PreparedStatement ps = (PreparedStatement) psControl.getMock(); - ps.setCharacterStream(1, str, 11); - psControl.replay(); - lobCreator.setClobAsCharacterStream(ps, 1, str, 11); - psControl.verify(); + verify(ps).setCharacterStream(1, str, 11); } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/NativeJdbcExtractorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/NativeJdbcExtractorTests.java index a5c23af49cc..3e6de69dec9 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/NativeJdbcExtractorTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/NativeJdbcExtractorTests.java @@ -16,6 +16,10 @@ package org.springframework.jdbc.support; +import static org.junit.Assert.*; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; + import java.sql.CallableStatement; import java.sql.Connection; import java.sql.DatabaseMetaData; @@ -24,9 +28,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import junit.framework.TestCase; -import org.easymock.MockControl; - +import org.junit.Test; import org.springframework.jdbc.support.nativejdbc.CommonsDbcpNativeJdbcExtractor; import org.springframework.jdbc.support.nativejdbc.SimpleNativeJdbcExtractor; @@ -34,33 +36,23 @@ import org.springframework.jdbc.support.nativejdbc.SimpleNativeJdbcExtractor; * @author Andre Biryukov * @author Juergen Hoeller */ -public class NativeJdbcExtractorTests extends TestCase { +public class NativeJdbcExtractorTests { + @Test public void testSimpleNativeJdbcExtractor() throws SQLException { SimpleNativeJdbcExtractor extractor = new SimpleNativeJdbcExtractor(); - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - MockControl dbmdControl = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData dbmd = (DatabaseMetaData) dbmdControl.getMock(); - MockControl con2Control = MockControl.createControl(Connection.class); - Connection con2 = (Connection) con2Control.getMock(); - con.getMetaData(); - conControl.setReturnValue(dbmd, 2); - dbmd.getConnection(); - dbmdControl.setReturnValue(con2, 2); - conControl.replay(); - dbmdControl.replay(); - con2Control.replay(); + Connection con = mock(Connection.class); + DatabaseMetaData dbmd = mock(DatabaseMetaData.class); + Connection con2 = mock(Connection.class); + given(con.getMetaData()).willReturn(dbmd); + given(dbmd.getConnection()).willReturn(con2); Connection nativeCon = extractor.getNativeConnection(con); assertEquals(con2, nativeCon); - MockControl stmtControl = MockControl.createControl(Statement.class); - Statement stmt = (Statement) stmtControl.getMock(); - stmt.getConnection(); - stmtControl.setReturnValue(con); - stmtControl.replay(); + Statement stmt = mock(Statement.class); + given(stmt.getConnection()).willReturn(con); nativeCon = extractor.getNativeConnectionFromStatement(stmt); assertEquals(con2, nativeCon); @@ -68,51 +60,29 @@ public class NativeJdbcExtractorTests extends TestCase { Statement nativeStmt = extractor.getNativeStatement(stmt); assertEquals(nativeStmt, stmt); - MockControl psControl = MockControl.createControl(PreparedStatement.class); - PreparedStatement ps = (PreparedStatement) psControl.getMock(); - psControl.replay(); + PreparedStatement ps = mock(PreparedStatement.class); PreparedStatement nativePs = extractor.getNativePreparedStatement(ps); assertEquals(ps, nativePs); - MockControl csControl = MockControl.createControl(CallableStatement.class); - CallableStatement cs = (CallableStatement) csControl.getMock(); - MockControl rsControl = MockControl.createControl(ResultSet.class); - ResultSet rs = (ResultSet) rsControl.getMock(); - cs.getResultSet(); - csControl.setReturnValue(rs); - csControl.replay(); - rsControl.replay(); + CallableStatement cs = mock(CallableStatement.class); + ResultSet rs = mock(ResultSet.class); + given(cs.getResultSet()).willReturn(rs); CallableStatement nativeCs = extractor.getNativeCallableStatement(cs); assertEquals(cs, nativeCs); ResultSet nativeRs = extractor.getNativeResultSet(cs.getResultSet()); assertEquals(nativeRs, rs); - - conControl.verify(); - dbmdControl.verify(); - con2Control.verify(); - stmtControl.verify(); - psControl.verify(); - csControl.verify(); - rsControl.verify(); } public void testCommonsDbcpNativeJdbcExtractor() throws SQLException { CommonsDbcpNativeJdbcExtractor extractor = new CommonsDbcpNativeJdbcExtractor(); assertFalse(extractor.isNativeConnectionNecessaryForNativeStatements()); - MockControl conControl = MockControl.createControl(Connection.class); - Connection con = (Connection) conControl.getMock(); - MockControl stmtControl = MockControl.createControl(Statement.class); - Statement stmt = (Statement) stmtControl.getMock(); - con.getMetaData(); - conControl.setReturnValue(null, 2); - stmt.getConnection(); - stmtControl.setReturnValue(con, 1); - conControl.replay(); - stmtControl.replay(); + Connection con = mock(Connection.class); + Statement stmt = mock(Statement.class); + given(stmt.getConnection()).willReturn(con); Connection nativeConnection = extractor.getNativeConnection(con); assertEquals(con, nativeConnection); @@ -121,24 +91,14 @@ public class NativeJdbcExtractorTests extends TestCase { assertEquals(con, nativeConnection); assertEquals(stmt, extractor.getNativeStatement(stmt)); - MockControl psControl = MockControl.createControl(PreparedStatement.class); - PreparedStatement ps = (PreparedStatement) psControl.getMock(); - psControl.replay(); + PreparedStatement ps = mock(PreparedStatement.class); assertEquals(ps, extractor.getNativePreparedStatement(ps)); - MockControl csControl = MockControl.createControl(CallableStatement.class); - CallableStatement cs = (CallableStatement) csControl.getMock(); - csControl.replay(); + CallableStatement cs = mock(CallableStatement.class); assertEquals(cs, extractor.getNativePreparedStatement(cs)); - MockControl rsControl = MockControl.createControl(ResultSet.class); - ResultSet rs = (ResultSet) rsControl.getMock(); - rsControl.replay(); + ResultSet rs = mock(ResultSet.class); assertEquals(rs, extractor.getNativeResultSet(rs)); - - conControl.verify(); - stmtControl.verify(); - psControl.verify(); } } diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java index d44b0d1a25a..e118d922ff8 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodesFactoryTests.java @@ -16,6 +16,16 @@ package org.springframework.jdbc.support; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.SQLException; @@ -23,26 +33,22 @@ import java.util.Arrays; import javax.sql.DataSource; -import junit.framework.TestCase; - -import org.easymock.MockControl; +import org.junit.Test; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; -import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; - /** * Tests for SQLErrorCodes loading. * * @author Rod Johnson * @author Thomas Risberg */ -public class SQLErrorCodesFactoryTests extends TestCase { +public class SQLErrorCodesFactoryTests { /** * Check that a default instance returns empty error codes for an unknown database. */ + @Test public void testDefaultInstanceWithNoSuchDatabase() { SQLErrorCodes sec = SQLErrorCodesFactory.getInstance().getErrorCodes("xx"); assertTrue(sec.getBadSqlGrammarCodes().length == 0); @@ -52,6 +58,7 @@ public class SQLErrorCodesFactoryTests extends TestCase { /** * Check that a known database produces recognizable codes. */ + @Test public void testDefaultInstanceWithOracle() { SQLErrorCodes sec = SQLErrorCodesFactory.getInstance().getErrorCodes("Oracle"); assertIsOracle(sec); @@ -119,6 +126,7 @@ public class SQLErrorCodesFactoryTests extends TestCase { assertTrue(Arrays.binarySearch(sec.getBadSqlGrammarCodes(), "-204") >= 0); } + @Test public void testLookupOrder() { class TestSQLErrorCodesFactory extends SQLErrorCodesFactory { private int lookups = 0; @@ -147,6 +155,7 @@ public class SQLErrorCodesFactoryTests extends TestCase { /** * Check that user defined error codes take precedence. */ + @Test public void testFindUserDefinedCodes() { class TestSQLErrorCodesFactory extends SQLErrorCodesFactory { @Override @@ -166,6 +175,7 @@ public class SQLErrorCodesFactoryTests extends TestCase { assertEquals("2", sf.getErrorCodes("Oracle").getBadSqlGrammarCodes()[1]); } + @Test public void testInvalidUserDefinedCodeFormat() { class TestSQLErrorCodesFactory extends SQLErrorCodesFactory { @Override @@ -187,6 +197,7 @@ public class SQLErrorCodesFactoryTests extends TestCase { /** * Check that custom error codes take precedence. */ + @Test public void testFindCustomCodes() { class TestSQLErrorCodesFactory extends SQLErrorCodesFactory { @Override @@ -207,43 +218,27 @@ public class SQLErrorCodesFactoryTests extends TestCase { assertEquals(1, translation.getErrorCodes().length); } + @Test public void testDataSourceWithNullMetadata() throws Exception { + Connection connection = mock(Connection.class); + DataSource dataSource = mock(DataSource.class); + given(dataSource.getConnection()).willReturn(connection); - MockControl ctrlConnection = MockControl.createControl(Connection.class); - Connection mockConnection = (Connection) ctrlConnection.getMock(); - mockConnection.getMetaData(); - ctrlConnection.setReturnValue(null); - mockConnection.close(); - ctrlConnection.setVoidCallable(); - ctrlConnection.replay(); - - MockControl ctrlDataSource = MockControl.createControl(DataSource.class); - DataSource mockDataSource = (DataSource) ctrlDataSource.getMock(); - mockDataSource.getConnection(); - ctrlDataSource.setDefaultReturnValue(mockConnection); - ctrlDataSource.replay(); - - SQLErrorCodes sec = SQLErrorCodesFactory.getInstance().getErrorCodes(mockDataSource); + SQLErrorCodes sec = SQLErrorCodesFactory.getInstance().getErrorCodes(dataSource); assertIsEmpty(sec); - ctrlConnection.verify(); - ctrlDataSource.verify(); + verify(connection).close(); } + @Test public void testGetFromDataSourceWithSQLException() throws Exception { - SQLException expectedSQLException = new SQLException(); - MockControl ctrlDataSource = MockControl.createControl(DataSource.class); - DataSource mockDataSource = (DataSource) ctrlDataSource.getMock(); - mockDataSource.getConnection(); - ctrlDataSource.setThrowable(expectedSQLException); - ctrlDataSource.replay(); + DataSource dataSource = mock(DataSource.class); + given(dataSource.getConnection()).willThrow(expectedSQLException); - SQLErrorCodes sec = SQLErrorCodesFactory.getInstance().getErrorCodes(mockDataSource); + SQLErrorCodes sec = SQLErrorCodesFactory.getInstance().getErrorCodes(dataSource); assertIsEmpty(sec); - - ctrlDataSource.verify(); } private void assertIsEmpty(SQLErrorCodes sec) { @@ -253,25 +248,14 @@ public class SQLErrorCodesFactoryTests extends TestCase { } private SQLErrorCodes getErrorCodesFromDataSource(String productName, SQLErrorCodesFactory factory) throws Exception { - MockControl mdControl = MockControl.createControl(DatabaseMetaData.class); - DatabaseMetaData md = (DatabaseMetaData) mdControl.getMock(); - md.getDatabaseProductName(); - mdControl.setReturnValue(productName); - mdControl.replay(); - - MockControl ctrlConnection = MockControl.createControl(Connection.class); - Connection mockConnection = (Connection) ctrlConnection.getMock(); - mockConnection.getMetaData(); - ctrlConnection.setReturnValue(md); - mockConnection.close(); - ctrlConnection.setVoidCallable(); - ctrlConnection.replay(); - - MockControl ctrlDataSource = MockControl.createControl(DataSource.class); - DataSource mockDataSource = (DataSource) ctrlDataSource.getMock(); - mockDataSource.getConnection(); - ctrlDataSource.setDefaultReturnValue(mockConnection); - ctrlDataSource.replay(); + DatabaseMetaData databaseMetaData = mock(DatabaseMetaData.class); + given(databaseMetaData.getDatabaseProductName()).willReturn(productName); + + Connection connection = mock(Connection.class); + given(connection.getMetaData()).willReturn(databaseMetaData); + + DataSource dataSource = mock(DataSource.class); + given(dataSource.getConnection()).willReturn(connection); SQLErrorCodesFactory secf = null; if (factory != null) { @@ -281,33 +265,35 @@ public class SQLErrorCodesFactoryTests extends TestCase { secf = SQLErrorCodesFactory.getInstance(); } - SQLErrorCodes sec = secf.getErrorCodes(mockDataSource); + SQLErrorCodes sec = secf.getErrorCodes(dataSource); - mdControl.verify(); - ctrlConnection.verify(); - ctrlDataSource.verify(); - SQLErrorCodes sec2 = secf.getErrorCodes(mockDataSource); + SQLErrorCodes sec2 = secf.getErrorCodes(dataSource); assertSame("Cached per DataSource", sec2, sec); + verify(connection).close(); return sec; } + @Test public void testSQLServerRecognizedFromMetadata() throws Exception { SQLErrorCodes sec = getErrorCodesFromDataSource("MS-SQL", null); assertIsSQLServer(sec); } + @Test public void testOracleRecognizedFromMetadata() throws Exception { SQLErrorCodes sec = getErrorCodesFromDataSource("Oracle", null); assertIsOracle(sec); } + @Test public void testHsqlRecognizedFromMetadata() throws Exception { SQLErrorCodes sec = getErrorCodesFromDataSource("HSQL Database Engine", null); assertIsHsql(sec); } + @Test public void testDB2RecognizedFromMetadata() throws Exception { SQLErrorCodes sec = getErrorCodesFromDataSource("DB2", null); assertIsDB2(sec); @@ -320,6 +306,7 @@ public class SQLErrorCodesFactoryTests extends TestCase { /** * Check that wild card database name works. */ + @Test public void testWildCardNameRecognized() throws Exception { class WildcardSQLErrorCodesFactory extends SQLErrorCodesFactory { @Override diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java index 1b415ea8fbb..becb786a385 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java @@ -16,6 +16,11 @@ package org.springframework.jdbc.support.rowset; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.mock; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.math.BigDecimal; @@ -25,156 +30,172 @@ import java.sql.SQLException; import java.sql.Time; import java.sql.Timestamp; -import junit.framework.TestCase; -import org.easymock.MockControl; - +import org.junit.Before; +import org.junit.Test; import org.springframework.jdbc.InvalidResultSetAccessException; /** * @author Thomas Risberg */ -public class ResultSetWrappingRowSetTests extends TestCase { +public class ResultSetWrappingRowSetTests { - private MockControl rsetControl; private ResultSet rset; private ResultSetWrappingSqlRowSet rowset; - @Override + @Before public void setUp() throws Exception { - rsetControl = MockControl.createControl(ResultSet.class); - rset = (ResultSet) rsetControl.getMock(); - rset.getMetaData(); - rsetControl.setReturnValue(null); - rset.getMetaData(); - rsetControl.setReturnValue(null); + rset = mock(ResultSet.class); + rowset = new ResultSetWrappingSqlRowSet(rset); } + @Test public void testGetBigDecimalInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getBigDecimal", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getBigDecimal", new Class[] {int.class}); doTest(rset, rowset, new Integer(1), BigDecimal.valueOf(1)); } + @Test public void testGetBigDecimalString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getBigDecimal", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getBigDecimal", new Class[] {String.class}); doTest(rset, rowset, "test", BigDecimal.valueOf(1)); } + @Test public void testGetStringInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getString", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getString", new Class[] {int.class}); doTest(rset, rowset, new Integer(1), "test"); } + @Test public void testGetStringString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getString", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getString", new Class[] {String.class}); doTest(rset, rowset, "test", "test"); } + @Test public void testGetTimestampInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getTimestamp", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getTimestamp", new Class[] {int.class}); doTest(rset, rowset, new Integer(1), new Timestamp(1234l)); } + @Test public void testGetTimestampString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getTimestamp", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getTimestamp", new Class[] {String.class}); doTest(rset, rowset, "test", new Timestamp(1234l)); } + @Test public void testGetDateInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getDate", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getDate", new Class[] {int.class}); doTest(rset, rowset, new Integer(1), new Date(1234l)); } + @Test public void testGetDateString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getDate", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getDate", new Class[] {String.class}); doTest(rset, rowset, "test", new Date(1234l)); } + @Test public void testGetTimeInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getTime", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getTime", new Class[] {int.class}); doTest(rset, rowset, new Integer(1), new Time(1234l)); } + @Test public void testGetTimeString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getTime", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getTime", new Class[] {String.class}); doTest(rset, rowset, "test", new Time(1234l)); } + @Test public void testGetObjectInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getObject", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getObject", new Class[] {int.class}); doTest(rset, rowset, new Integer(1), new Object()); } + @Test public void testGetObjectString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getObject", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getObject", new Class[] {String.class}); doTest(rset, rowset, "test", new Object()); } + @Test public void testGetIntInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getInt", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getInt", new Class[] {int.class}); doTest(rset, rowset, new Integer(1), new Integer(1)); } + @Test public void testGetIntString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getInt", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getInt", new Class[] {String.class}); doTest(rset, rowset, "test", new Integer(1)); } + @Test public void testGetFloatInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getFloat", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getFloat", new Class[] {int.class}); doTest(rset, rowset, new Integer(1), new Float(1)); } + @Test public void testGetFloatString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getFloat", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getFloat", new Class[] {String.class}); doTest(rset, rowset, "test", new Float(1)); } + @Test public void testGetDoubleInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getDouble", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getDouble", new Class[] {int.class}); doTest(rset, rowset, new Integer(1), new Double(1)); } + @Test public void testGetDoubleString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getDouble", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getDouble", new Class[] {String.class}); doTest(rset, rowset, "test", new Double(1)); } + @Test public void testGetLongInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getLong", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getLong", new Class[] {int.class}); doTest(rset, rowset, new Integer(1), new Long(1)); } + @Test public void testGetLongString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getLong", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getLong", new Class[] {String.class}); doTest(rset, rowset, "test", new Long(1)); } + @Test public void testGetBooleanInt() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getBoolean", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getBoolean", new Class[] {int.class}); doTest(rset, rowset, new Integer(1), new Boolean(true)); } + @Test public void testGetBooleanString() throws Exception { Method rset = ResultSet.class.getDeclaredMethod("getBoolean", new Class[] {int.class}); Method rowset = ResultSetWrappingSqlRowSet.class.getDeclaredMethod("getBoolean", new Class[] {String.class}); @@ -183,56 +204,14 @@ public class ResultSetWrappingRowSetTests extends TestCase { private void doTest(Method rsetMethod, Method rowsetMethod, Object arg, Object ret) throws Exception { if (arg instanceof String) { - Method findMethod = ResultSet.class.getDeclaredMethod("findColumn", new Class[] {String.class}); - findMethod.invoke(rset, new Object[] {arg}); - rsetControl.setReturnValue(1); - rsetMethod.invoke(rset, new Object[] {1}); - } - else { - rsetMethod.invoke(rset, new Object[] {arg}); - } - if (ret instanceof Double) { - rsetControl.setReturnValue(((Double) ret).doubleValue()); - } - else if (ret instanceof Float) { - rsetControl.setReturnValue(((Float) ret).floatValue()); - } - else if (ret instanceof Integer) { - rsetControl.setReturnValue(((Integer) ret).intValue()); - } - else if (ret instanceof Short) { - rsetControl.setReturnValue(((Short) ret).shortValue()); - } - else if (ret instanceof Long) { - rsetControl.setReturnValue(((Long) ret).longValue()); - } - else if (ret instanceof Boolean) { - rsetControl.setReturnValue(((Boolean) ret).booleanValue()); + given(rset.findColumn((String) arg)).willReturn(1); + given(rsetMethod.invoke(rset, 1)).willReturn(ret).willThrow(new SQLException("test")); + } else { + given(rsetMethod.invoke(rset, arg)).willReturn(ret).willThrow(new SQLException("test")); } - else if (ret instanceof Byte) { - rsetControl.setReturnValue(((Byte) ret).byteValue()); - } - else { - rsetControl.setReturnValue(ret); - } - - if (arg instanceof String) { - Method findMethod = ResultSet.class.getDeclaredMethod("findColumn", new Class[] {String.class}); - findMethod.invoke(rset, new Object[] {arg}); - rsetControl.setReturnValue(1); - rsetMethod.invoke(rset, new Object[] {1}); - } - else { - rsetMethod.invoke(rset, new Object[] {arg}); - } - rsetControl.setThrowable(new SQLException("test")); - - rsetControl.replay(); - - rowset = new ResultSetWrappingSqlRowSet(rset); - rowsetMethod.invoke(rowset, new Object[] {arg}); + rowsetMethod.invoke(rowset, arg); try { - rowsetMethod.invoke(rowset, new Object[] {arg}); + rowsetMethod.invoke(rowset, arg); fail("InvalidResultSetAccessException should have been thrown"); } catch (InvocationTargetException ex) { From b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 11 Dec 2012 17:35:09 -0800 Subject: [PATCH 04/34] Introduce 'spring-build-junit' subproject Introduce new 'spring-build-junit' subproject containing shared JUnit utilities and classes to be used by other test cases. This project is for internal use within the framework, and therefore creates no artifacts to be published to any repository. The initial code includes support for JUnit Assumptions that can be used to determine when a test should run. Tests can be skipped based on the running JDK version, logging level or based on specific 'groups' that have activated via a Gradle property. It is intended that sources within the spring-build-junit project be folded into spring-core/src/test/java, pending some Gradle work that will facilitate sharing test output across subprojects; therefore this commit should be seen as a temporary solution. Issue: SPR-9984 --- build.gradle | 30 ++++- settings.gradle | 1 + .../springframework/build/junit/Assume.java | 111 ++++++++++++++++++ .../build/junit/JavaVersion.java | 96 +++++++++++++++ .../build/junit/TestGroup.java | 62 ++++++++++ .../build/junit/JavaVersionTest.java | 43 +++++++ .../build/junit/TestGroupTest.java | 73 ++++++++++++ 7 files changed, 415 insertions(+), 1 deletion(-) create mode 100644 spring-build-junit/src/main/java/org/springframework/build/junit/Assume.java create mode 100644 spring-build-junit/src/main/java/org/springframework/build/junit/JavaVersion.java create mode 100644 spring-build-junit/src/main/java/org/springframework/build/junit/TestGroup.java create mode 100644 spring-build-junit/src/test/java/org/springframework/build/junit/JavaVersionTest.java create mode 100644 spring-build-junit/src/test/java/org/springframework/build/junit/TestGroupTest.java diff --git a/build.gradle b/build.gradle index d01d0d701ba..b2e7af70c62 100644 --- a/build.gradle +++ b/build.gradle @@ -110,7 +110,7 @@ configure(allprojects.findAll{it.name in ["spring", "spring-jms", "spring-orm", } } -configure(subprojects) { subproject -> +configure(subprojects - project(":spring-build-junit")) { subproject -> apply plugin: "merge" apply from: "${gradleScriptDir}/publish-maven.gradle" @@ -159,6 +159,34 @@ configure(subprojects) { subproject -> } } +configure(allprojects - project(":spring-build-junit")) { + dependencies { + testCompile(project(":spring-build-junit")) + } + + eclipse.classpath.file.whenMerged { classpath -> + classpath.entries.find{it.path == "/spring-build-junit"}.exported = false + } + + test.systemProperties.put("testGroups", properties.get("testGroups")) +} + +project("spring-build-junit") { + description = "Build-time JUnit dependencies and utilities" + + // NOTE: This is an internal project and is not published. + + dependencies { + compile("commons-logging:commons-logging:1.1.1") + compile("junit:junit:${junitVersion}") + compile("org.hamcrest:hamcrest-all:1.3") + compile("org.easymock:easymock:${easymockVersion}") + } + + // Don't actually generate any artifacts + configurations.archives.artifacts.clear() +} + project("spring-core") { description = "Spring Core" diff --git a/settings.gradle b/settings.gradle index 11ce95641fb..8d4e147bccb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -22,3 +22,4 @@ include "spring-web" include "spring-webmvc" include "spring-webmvc-portlet" include "spring-webmvc-tiles3" +include "spring-build-junit" diff --git a/spring-build-junit/src/main/java/org/springframework/build/junit/Assume.java b/spring-build-junit/src/main/java/org/springframework/build/junit/Assume.java new file mode 100644 index 00000000000..7b916d0b59c --- /dev/null +++ b/spring-build-junit/src/main/java/org/springframework/build/junit/Assume.java @@ -0,0 +1,111 @@ +/* + * Copyright 2002-2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.build.junit; + +import static org.junit.Assume.assumeFalse; + +import java.util.Set; + +import org.apache.commons.logging.Log; +import org.junit.internal.AssumptionViolatedException; + +/** + * Provides utility methods that allow JUnit tests to {@link Assume} certain conditions + * hold {@code true}. If the assumption fails, it means the test should be skipped. + * + *

For example, if a set of tests require at least JDK 1.7 it can use + * {@code Assume#atLeast(JdkVersion.JAVA_17)} as shown below: + * + * 

+ * public void MyTests {
+ *
+ *   @BeforeClass
+ *   public static assumptions() {
+ *       Assume.atLeast(JdkVersion.JAVA_17);
+ *   }
+ *
+ *   // ... all the test methods that require at least JDK 1.7
+ * }
+ *
+ * + * If only a single test requires at least JDK 1.7 it can use the + * {@code Assume#atLeast(JdkVersion.JAVA_17)} as shown below: + * + * 
+ * public void MyTests {
+ *
+ *   @Test
+ *   public void requiresJdk17 {
+ *       Assume.atLeast(JdkVersion.JAVA_17);
+ *       // ... perform the actual test
+ *   }
+ * }
+ *
+ * + * In addition to assumptions based on the JDK version, tests can be categorized into + * {@link TestGroup}s. Active groups are enabled using the 'testGroups' system property, + * usually activated from the gradle command line: + * 
+ * gradle test -PtestGroups="performance"
+ *
+ * + * Groups can be specified as a comma separated list of values, or using the pseudo group + * 'all'. See {@link TestGroup} for a list of valid groups. + * + * @author Rob Winch + * @author Phillip Webb + * @since 3.2 + * @see #atLeast(JavaVersion) + * @see #group(TestGroup) + */ +public abstract class Assume { + + + private static final Set GROUPS = TestGroup.parse(System.getProperty("testGroups")); + + + /** + * Assume a minimum {@link JavaVersion} is running. + * @param version the minimum version for the test to run + */ + public static void atLeast(JavaVersion version) { + if (!JavaVersion.runningVersion().isAtLeast(version)) { + throw new AssumptionViolatedException("Requires JDK " + version + " but running " + + JavaVersion.runningVersion()); + } + } + + /** + * Assume that a particular {@link TestGroup} has been specified. + * @param group the group that must be specified. + */ + public static void group(TestGroup group) { + if (!GROUPS.contains(group)) { + throw new AssumptionViolatedException("Requires unspecified group " + group + + " from " + GROUPS); + } + } + + /** + * Assume that the specified log is not set to Trace or Debug. + * @param log the log to test + */ + public static void notLogging(Log log) { + assumeFalse(log.isTraceEnabled()); + assumeFalse(log.isDebugEnabled()); + } +} diff --git a/spring-build-junit/src/main/java/org/springframework/build/junit/JavaVersion.java b/spring-build-junit/src/main/java/org/springframework/build/junit/JavaVersion.java new file mode 100644 index 00000000000..db9fee370f0 --- /dev/null +++ b/spring-build-junit/src/main/java/org/springframework/build/junit/JavaVersion.java @@ -0,0 +1,96 @@ +/* + * Copyright 2002-2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.build.junit; + +/** + * Enumeration of known JDK versions. + * + * @author Phillip Webb + * @see #runningVersion() + */ +public enum JavaVersion { + + + /** + * Java 1.5 + */ + JAVA_15("1.5", 15), + + /** + * Java 1.6 + */ + JAVA_16("1.6", 16), + + /** + * Java 1.7 + */ + JAVA_17("1.7", 17), + + /** + * Java 1.8 + */ + JAVA_18("1.8", 18); + + + private static final JavaVersion runningVersion = findRunningVersion(); + + private static JavaVersion findRunningVersion() { + String version = System.getProperty("java.version"); + for (JavaVersion candidate : values()) { + if (version.startsWith(candidate.version)) { + return candidate; + } + } + return JavaVersion.JAVA_15; + } + + + private String version; + + private int value; + + + private JavaVersion(String version, int value) { + this.version = version; + this.value = value; + } + + + @Override + public String toString() { + return version; + } + + /** + * Determines if the specified version is the same as or greater than this version. + * @param version the version to check + * @return {@code true} if the specified version is at least this version + */ + public boolean isAtLeast(JavaVersion version) { + return this.value >= version.value; + } + + + /** + * Returns the current running JDK version. If the current version cannot be + * determined {@link #JAVA_15} will be returned. + * @return the JDK version + */ + public static JavaVersion runningVersion() { + return runningVersion; + } +} diff --git a/spring-build-junit/src/main/java/org/springframework/build/junit/TestGroup.java b/spring-build-junit/src/main/java/org/springframework/build/junit/TestGroup.java new file mode 100644 index 00000000000..3be8b83514b --- /dev/null +++ b/spring-build-junit/src/main/java/org/springframework/build/junit/TestGroup.java @@ -0,0 +1,62 @@ +/* + * Copyright 2002-2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.build.junit; + +import java.util.Collections; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.Set; + +/** + * A test group used to limit when certain tests are run. + * + * @see Assume#group(TestGroup) + * @author Phillip Webb + */ +public enum TestGroup { + + + /** + * Performance related tests that may take a considerable time to run. + */ + PERFORMANCE; + + + /** + * Parse the specified comma separates string of groups. + * @param value the comma separated string of groups + * @return a set of groups + */ + public static Set parse(String value) { + if (value == null || "".equals(value)) { + return Collections.emptySet(); + } + if("ALL".equalsIgnoreCase(value)) { + return EnumSet.allOf(TestGroup.class); + } + Set groups = new HashSet(); + for (String group : value.split(",")) { + try { + groups.add(valueOf(group.trim().toUpperCase())); + } catch (IllegalArgumentException e) { + throw new IllegalArgumentException("Unable to find test group '" + group.trim() + + "' when parsing '" + value + "'"); + } + } + return groups; + } +} diff --git a/spring-build-junit/src/test/java/org/springframework/build/junit/JavaVersionTest.java b/spring-build-junit/src/test/java/org/springframework/build/junit/JavaVersionTest.java new file mode 100644 index 00000000000..1600d4ca195 --- /dev/null +++ b/spring-build-junit/src/test/java/org/springframework/build/junit/JavaVersionTest.java @@ -0,0 +1,43 @@ +/* + * Copyright 2002-2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.build.junit; + +import static org.hamcrest.Matchers.startsWith; +import static org.junit.Assert.*; + +import org.junit.Test; + +/** + * Tests for {@link JavaVersion}. + * + * @author Phillip Webb + */ +public class JavaVersionTest { + + @Test + public void runningVersion() { + assertNotNull(JavaVersion.runningVersion()); + assertThat(System.getProperty("java.version"), startsWith(JavaVersion.runningVersion().toString())); + } + + @Test + public void isAtLeast() throws Exception { + assertTrue(JavaVersion.JAVA_16.isAtLeast(JavaVersion.JAVA_15)); + assertTrue(JavaVersion.JAVA_16.isAtLeast(JavaVersion.JAVA_16)); + assertFalse(JavaVersion.JAVA_16.isAtLeast(JavaVersion.JAVA_17)); + } +} diff --git a/spring-build-junit/src/test/java/org/springframework/build/junit/TestGroupTest.java b/spring-build-junit/src/test/java/org/springframework/build/junit/TestGroupTest.java new file mode 100644 index 00000000000..2b30f299310 --- /dev/null +++ b/spring-build-junit/src/test/java/org/springframework/build/junit/TestGroupTest.java @@ -0,0 +1,73 @@ +/* + * Copyright 2002-2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.build.junit; + +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; + +import java.util.Collections; +import java.util.EnumSet; +import java.util.Set; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + +/** + * Tests for {@link TestGroup}. + * + * @author Phillip Webb + */ +public class TestGroupTest { + + @Rule + public ExpectedException thrown = ExpectedException.none(); + + @Test + public void parseNull() throws Exception { + assertThat(TestGroup.parse(null), is(Collections. emptySet())); + } + + @Test + public void parseEmptyString() throws Exception { + assertThat(TestGroup.parse(""), is(Collections. emptySet())); + } + + @Test + public void parseWithSpaces() throws Exception { + assertThat(TestGroup.parse("PERFORMANCE, PERFORMANCE"), + is((Set) EnumSet.of(TestGroup.PERFORMANCE))); + } + + @Test + public void parseInMixedCase() throws Exception { + assertThat(TestGroup.parse("performance, PERFormaNCE"), + is((Set) EnumSet.of(TestGroup.PERFORMANCE))); + } + + @Test + public void parseMissing() throws Exception { + thrown.expect(IllegalArgumentException.class); + thrown.expectMessage("Unable to find test group 'missing' when parsing 'performance, missing'"); + TestGroup.parse("performance, missing"); + } + + @Test + public void parseAll() throws Exception { + assertThat(TestGroup.parse("all"), is((Set)EnumSet.allOf(TestGroup.class))); + } +} From 60032e0012aa0535b9afac4b86833bfc60e5bd5e Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 11 Dec 2012 18:07:48 -0800 Subject: [PATCH 05/34] Ignore performance-sensitive tests by default Make use of the new JUnit functionality introduced in the previous commit to 'Assume' that perfomance- and timing-sensitive tests should run only when TestGroup.PERFORMANCE is selected, i.e. when -PtestGroups="performance" has been provided at the Gradle command line. The net effect is that these tests are now ignored by default, which will result in far fewer false-negative CI build failures due to resource contention and other external factors that cause slowdowns. We will set up a dedicated performance CI build to run these tests on an isolated machine, etc. Issue: SPR-9984 --- .../beans/BeanWrapperTests.java | 8 ++-- .../DefaultListableBeanFactoryTests.java | 39 +++++++------------ .../AspectJAutoProxyCreatorTests.java | 21 +++++----- .../AnnotationProcessorPerformanceTests.java | 27 ++++++------- .../ApplicationContextExpressionTests.java | 8 ++-- .../annotation/EnableSchedulingTests.java | 8 ++++ .../GenericConversionServiceTests.java | 5 +++ .../expression/spel/PerformanceTests.java | 7 ++++ .../web/bind/ServletRequestUtilsTests.java | 7 ++++ .../bind/PortletRequestUtilsTests.java | 29 +++++++++++++- ...ansactionalAnnotationIntegrationTests.java | 8 ++++ 11 files changed, 105 insertions(+), 62 deletions(-) diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java index 930c530961e..7da97104176 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java @@ -49,6 +49,8 @@ import org.springframework.beans.propertyeditors.CustomNumberEditor; import org.springframework.beans.propertyeditors.StringArrayPropertyEditor; import org.springframework.beans.propertyeditors.StringTrimmerEditor; import org.springframework.beans.support.DerivedFromProtectedBaseBean; +import org.springframework.build.junit.Assume; +import org.springframework.build.junit.TestGroup; import org.springframework.core.convert.ConversionFailedException; import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.support.DefaultConversionService; @@ -1139,10 +1141,8 @@ public final class BeanWrapperTests { @Test public void testLargeMatchingPrimitiveArray() { - if (LogFactory.getLog(BeanWrapperTests.class).isTraceEnabled()) { - // Skip this test: Trace logging blows the time limit. - return; - } + Assume.group(TestGroup.PERFORMANCE); + Assume.notLogging(LogFactory.getLog(BeanWrapperTests.class)); PrimitiveArrayBean tb = new PrimitiveArrayBean(); BeanWrapper bw = new BeanWrapperImpl(tb); diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java index bc9f1ffba10..35f3420ca04 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java @@ -72,6 +72,8 @@ import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.xml.ConstructorDependenciesBean; import org.springframework.beans.factory.xml.DependenciesBean; import org.springframework.beans.propertyeditors.CustomNumberEditor; +import org.springframework.build.junit.Assume; +import org.springframework.build.junit.TestGroup; import org.springframework.core.MethodParameter; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.support.DefaultConversionService; @@ -1693,10 +1695,8 @@ public class DefaultListableBeanFactoryTests { @Test public void testPrototypeCreationIsFastEnough() { - if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) { - // Skip this test: Trace logging blows the time limit. - return; - } + Assume.group(TestGroup.PERFORMANCE); + Assume.notLogging(factoryLog); DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); RootBeanDefinition rbd = new RootBeanDefinition(TestBean.class); rbd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE); @@ -1713,10 +1713,8 @@ public class DefaultListableBeanFactoryTests { @Test public void testPrototypeCreationWithDependencyCheckIsFastEnough() { - if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) { - // Skip this test: Trace logging blows the time limit. - return; - } + Assume.group(TestGroup.PERFORMANCE); + Assume.notLogging(factoryLog); DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); RootBeanDefinition rbd = new RootBeanDefinition(LifecycleBean.class); rbd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE); @@ -1759,10 +1757,8 @@ public class DefaultListableBeanFactoryTests { @Test @Ignore // TODO re-enable when ConstructorResolver TODO sorted out public void testPrototypeCreationWithConstructorArgumentsIsFastEnough() { - if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) { - // Skip this test: Trace logging blows the time limit. - return; - } + Assume.group(TestGroup.PERFORMANCE); + Assume.notLogging(factoryLog); DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); RootBeanDefinition rbd = new RootBeanDefinition(TestBean.class); rbd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE); @@ -1809,10 +1805,8 @@ public class DefaultListableBeanFactoryTests { @Test public void testPrototypeCreationWithResolvedConstructorArgumentsIsFastEnough() { - if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) { - // Skip this test: Trace logging blows the time limit. - return; - } + Assume.group(TestGroup.PERFORMANCE); + Assume.notLogging(factoryLog); DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); RootBeanDefinition rbd = new RootBeanDefinition(TestBean.class); rbd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE); @@ -1833,10 +1827,8 @@ public class DefaultListableBeanFactoryTests { @Test public void testPrototypeCreationWithPropertiesIsFastEnough() { - if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) { - // Skip this test: Trace logging blows the time limit. - return; - } + Assume.group(TestGroup.PERFORMANCE); + Assume.notLogging(factoryLog); DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); RootBeanDefinition rbd = new RootBeanDefinition(TestBean.class); rbd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE); @@ -1882,10 +1874,8 @@ public class DefaultListableBeanFactoryTests { */ @Test public void testPrototypeCreationWithResolvedPropertiesIsFastEnough() { - if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) { - // Skip this test: Trace logging blows the time limit. - return; - } + Assume.group(TestGroup.PERFORMANCE); + Assume.notLogging(factoryLog); DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); RootBeanDefinition rbd = new RootBeanDefinition(TestBean.class); rbd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE); @@ -2200,6 +2190,7 @@ public class DefaultListableBeanFactoryTests { */ @Test(timeout=1000) public void testByTypeLookupIsFastEnough() { + Assume.group(TestGroup.PERFORMANCE); DefaultListableBeanFactory bf = new DefaultListableBeanFactory(); for (int i = 0; i < 1000; i++) { diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java index 66aa6e0e579..0c2927961dc 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; import java.lang.reflect.Method; @@ -50,6 +51,8 @@ import org.springframework.beans.factory.config.MethodInvokingFactoryBean; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; +import org.springframework.build.junit.Assume; +import org.springframework.build.junit.TestGroup; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.context.support.GenericApplicationContext; @@ -112,10 +115,8 @@ public final class AspectJAutoProxyCreatorTests { @Test public void testAspectsAndAdvisorAppliedToPrototypeIsFastEnough() { - if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) { - // Skip this test: Trace logging blows the time limit. - return; - } + Assume.group(TestGroup.PERFORMANCE); + Assume.notLogging(factoryLog); ClassPathXmlApplicationContext ac = newContext("aspectsPlusAdvisor.xml"); StopWatch sw = new StopWatch(); sw.start("Prototype Creation"); @@ -134,10 +135,8 @@ public final class AspectJAutoProxyCreatorTests { @Test public void testAspectsAndAdvisorNotAppliedToPrototypeIsFastEnough() { - if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) { - // Skip this test: Trace logging blows the time limit. - return; - } + Assume.group(TestGroup.PERFORMANCE); + Assume.notLogging(factoryLog); ClassPathXmlApplicationContext ac = newContext("aspectsPlusAdvisor.xml"); StopWatch sw = new StopWatch(); sw.start("Prototype Creation"); @@ -156,10 +155,8 @@ public final class AspectJAutoProxyCreatorTests { @Test public void testAspectsAndAdvisorNotAppliedToManySingletonsIsFastEnough() { - if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) { - // Skip this test: Trace logging blows the time limit. - return; - } + Assume.group(TestGroup.PERFORMANCE); + Assume.notLogging(factoryLog); GenericApplicationContext ac = new GenericApplicationContext(); new XmlBeanDefinitionReader(ac).loadBeanDefinitions(new ClassPathResource(qName("aspectsPlusAdvisor.xml"), getClass())); diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java index e225b5cfe99..12b0a100b71 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java @@ -17,6 +17,7 @@ package org.springframework.context.annotation; import static org.junit.Assert.*; +import static org.junit.Assume.assumeFalse; import javax.annotation.Resource; @@ -30,6 +31,8 @@ import org.springframework.beans.factory.annotation.Required; import org.springframework.beans.factory.config.RuntimeBeanReference; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RootBeanDefinition; +import org.springframework.build.junit.Assume; +import org.springframework.build.junit.TestGroup; import org.springframework.context.support.GenericApplicationContext; import org.springframework.util.StopWatch; @@ -44,10 +47,8 @@ public class AnnotationProcessorPerformanceTests { @Test public void testPrototypeCreationWithResourcePropertiesIsFastEnough() { - if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) { - // Skip this test: Trace logging blows the time limit. - return; - } + Assume.group(TestGroup.PERFORMANCE); + Assume.notLogging(factoryLog); GenericApplicationContext ctx = new GenericApplicationContext(); AnnotationConfigUtils.registerAnnotationConfigProcessors(ctx); ctx.refresh(); @@ -70,10 +71,8 @@ public class AnnotationProcessorPerformanceTests { @Test public void testPrototypeCreationWithOverriddenResourcePropertiesIsFastEnough() { - if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) { - // Skip this test: Trace logging blows the time limit. - return; - } + Assume.group(TestGroup.PERFORMANCE); + Assume.notLogging(factoryLog); GenericApplicationContext ctx = new GenericApplicationContext(); AnnotationConfigUtils.registerAnnotationConfigProcessors(ctx); ctx.refresh(); @@ -97,10 +96,8 @@ public class AnnotationProcessorPerformanceTests { @Test public void testPrototypeCreationWithAutowiredPropertiesIsFastEnough() { - if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) { - // Skip this test: Trace logging blows the time limit. - return; - } + Assume.group(TestGroup.PERFORMANCE); + Assume.notLogging(factoryLog); GenericApplicationContext ctx = new GenericApplicationContext(); AnnotationConfigUtils.registerAnnotationConfigProcessors(ctx); ctx.refresh(); @@ -123,10 +120,8 @@ public class AnnotationProcessorPerformanceTests { @Test public void testPrototypeCreationWithOverriddenAutowiredPropertiesIsFastEnough() { - if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) { - // Skip this test: Trace logging blows the time limit. - return; - } + Assume.group(TestGroup.PERFORMANCE); + Assume.notLogging(factoryLog); GenericApplicationContext ctx = new GenericApplicationContext(); AnnotationConfigUtils.registerAnnotationConfigProcessors(ctx); ctx.refresh(); diff --git a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java index 16eccd8d33e..b23b6861162 100644 --- a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java +++ b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java @@ -38,6 +38,8 @@ import org.springframework.beans.factory.support.AutowireCandidateQualifier; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.GenericBeanDefinition; import org.springframework.beans.factory.support.RootBeanDefinition; +import org.springframework.build.junit.Assume; +import org.springframework.build.junit.TestGroup; import org.springframework.context.annotation.AnnotationConfigUtils; import org.springframework.context.support.GenericApplicationContext; import org.springframework.util.SerializationTestUtils; @@ -218,10 +220,8 @@ public class ApplicationContextExpressionTests { @Test public void prototypeCreationIsFastEnough() { - if (factoryLog.isTraceEnabled() || factoryLog.isDebugEnabled()) { - // Skip this test: Trace logging blows the time limit. - return; - } + Assume.group(TestGroup.PERFORMANCE); + Assume.notLogging(factoryLog); GenericApplicationContext ac = new GenericApplicationContext(); RootBeanDefinition rbd = new RootBeanDefinition(TestBean.class); rbd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE); diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java index 349c6ec3870..d4be14d47b6 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java @@ -19,8 +19,11 @@ package org.springframework.scheduling.annotation; import java.util.Date; import java.util.concurrent.atomic.AtomicInteger; +import org.junit.Before; import org.junit.Test; +import org.springframework.build.junit.Assume; +import org.springframework.build.junit.TestGroup; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -43,6 +46,11 @@ import static org.junit.Assert.*; */ public class EnableSchedulingTests { + @Before + public void setUp() { + Assume.group(TestGroup.PERFORMANCE); + } + @Test public void withFixedRateTask() throws InterruptedException { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java index 41333498ba9..fadd6933a78 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java @@ -35,6 +35,8 @@ import java.util.UUID; import org.junit.Test; +import org.springframework.build.junit.Assume; +import org.springframework.build.junit.TestGroup; import org.springframework.core.convert.ConversionFailedException; import org.springframework.core.convert.ConverterNotFoundException; import org.springframework.core.convert.TypeDescriptor; @@ -398,6 +400,7 @@ public class GenericConversionServiceTests { @Test public void testPerformance1() { + Assume.group(TestGroup.PERFORMANCE); GenericConversionService conversionService = new DefaultConversionService(); StopWatch watch = new StopWatch("integer->string conversionPerformance"); watch.start("convert 4,000,000 with conversion service"); @@ -415,6 +418,7 @@ public class GenericConversionServiceTests { @Test public void testPerformance2() throws Exception { + Assume.group(TestGroup.PERFORMANCE); GenericConversionService conversionService = new DefaultConversionService(); StopWatch watch = new StopWatch("list -> list conversionPerformance"); watch.start("convert 4,000,000 with conversion service"); @@ -442,6 +446,7 @@ public class GenericConversionServiceTests { @Test public void testPerformance3() throws Exception { + Assume.group(TestGroup.PERFORMANCE); GenericConversionService conversionService = new DefaultConversionService(); StopWatch watch = new StopWatch("map -> map conversionPerformance"); watch.start("convert 4,000,000 with conversion service"); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java index 231a3adff0f..0d3efa95ddb 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java @@ -19,6 +19,8 @@ package org.springframework.expression.spel; import junit.framework.Assert; import org.junit.Test; +import org.springframework.build.junit.Assume; +import org.springframework.build.junit.TestGroup; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; @@ -43,6 +45,8 @@ public class PerformanceTests { @Test public void testPerformanceOfPropertyAccess() throws Exception { + Assume.group(TestGroup.PERFORMANCE); + long starttime = 0; long endtime = 0; @@ -89,7 +93,10 @@ public class PerformanceTests { } } + @Test public void testPerformanceOfMethodAccess() throws Exception { + Assume.group(TestGroup.PERFORMANCE); + long starttime = 0; long endtime = 0; diff --git a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java index 51e2f501d80..cba2d487f23 100644 --- a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java +++ b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java @@ -19,6 +19,8 @@ package org.springframework.web.bind; import static org.junit.Assert.*; import org.junit.Test; +import org.springframework.build.junit.Assume; +import org.springframework.build.junit.TestGroup; import org.springframework.mock.web.test.MockHttpServletRequest; import org.springframework.util.StopWatch; @@ -399,6 +401,7 @@ public class ServletRequestUtilsTests { @Test public void testGetLongParameterWithDefaultValueHandlingIsFastEnough() { + Assume.group(TestGroup.PERFORMANCE); MockHttpServletRequest request = new MockHttpServletRequest(); StopWatch sw = new StopWatch(); sw.start(); @@ -412,6 +415,7 @@ public class ServletRequestUtilsTests { @Test public void testGetFloatParameterWithDefaultValueHandlingIsFastEnough() { + Assume.group(TestGroup.PERFORMANCE); MockHttpServletRequest request = new MockHttpServletRequest(); StopWatch sw = new StopWatch(); sw.start(); @@ -425,6 +429,7 @@ public class ServletRequestUtilsTests { @Test public void testGetDoubleParameterWithDefaultValueHandlingIsFastEnough() { + Assume.group(TestGroup.PERFORMANCE); MockHttpServletRequest request = new MockHttpServletRequest(); StopWatch sw = new StopWatch(); sw.start(); @@ -438,6 +443,7 @@ public class ServletRequestUtilsTests { @Test public void testGetBooleanParameterWithDefaultValueHandlingIsFastEnough() { + Assume.group(TestGroup.PERFORMANCE); MockHttpServletRequest request = new MockHttpServletRequest(); StopWatch sw = new StopWatch(); sw.start(); @@ -451,6 +457,7 @@ public class ServletRequestUtilsTests { @Test public void testGetStringParameterWithDefaultValueHandlingIsFastEnough() { + Assume.group(TestGroup.PERFORMANCE); MockHttpServletRequest request = new MockHttpServletRequest(); StopWatch sw = new StopWatch(); sw.start(); diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java index 3730a69e12b..c903e01a663 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java @@ -18,6 +18,9 @@ package org.springframework.web.portlet.bind; import junit.framework.TestCase; +import org.junit.Test; +import org.springframework.build.junit.Assume; +import org.springframework.build.junit.TestGroup; import org.springframework.mock.web.portlet.MockPortletRequest; import org.springframework.util.StopWatch; @@ -28,8 +31,9 @@ import static org.junit.Assert.*; * @author Juergen Hoeller * @author Mark Fisher */ -public class PortletRequestUtilsTests extends TestCase { +public class PortletRequestUtilsTests { + @Test public void testIntParameter() throws PortletRequestBindingException { MockPortletRequest request = new MockPortletRequest(); request.addParameter("param1", "5"); @@ -68,6 +72,7 @@ public class PortletRequestUtilsTests extends TestCase { } } + @Test public void testIntParameters() throws PortletRequestBindingException { MockPortletRequest request = new MockPortletRequest(); request.addParameter("param", new String[] {"1", "2", "3"}); @@ -90,9 +95,9 @@ public class PortletRequestUtilsTests extends TestCase { catch (PortletRequestBindingException ex) { // expected } - } + @Test public void testLongParameter() throws PortletRequestBindingException { MockPortletRequest request = new MockPortletRequest(); request.addParameter("param1", "5"); @@ -131,6 +136,7 @@ public class PortletRequestUtilsTests extends TestCase { } } + @Test public void testLongParameters() throws PortletRequestBindingException { MockPortletRequest request = new MockPortletRequest(); request.setParameter("param", new String[] {"1", "2", "3"}); @@ -162,6 +168,7 @@ public class PortletRequestUtilsTests extends TestCase { assertEquals(2, values[1]); } + @Test public void testFloatParameter() throws PortletRequestBindingException { MockPortletRequest request = new MockPortletRequest(); request.addParameter("param1", "5.5"); @@ -200,6 +207,7 @@ public class PortletRequestUtilsTests extends TestCase { } } + @Test public void testFloatParameters() throws PortletRequestBindingException { MockPortletRequest request = new MockPortletRequest(); request.addParameter("param", new String[] {"1.5", "2.5", "3"}); @@ -224,6 +232,7 @@ public class PortletRequestUtilsTests extends TestCase { } } + @Test public void testDoubleParameter() throws PortletRequestBindingException { MockPortletRequest request = new MockPortletRequest(); request.addParameter("param1", "5.5"); @@ -262,6 +271,7 @@ public class PortletRequestUtilsTests extends TestCase { } } + @Test public void testDoubleParameters() throws PortletRequestBindingException { MockPortletRequest request = new MockPortletRequest(); request.addParameter("param", new String[] {"1.5", "2.5", "3"}); @@ -286,6 +296,7 @@ public class PortletRequestUtilsTests extends TestCase { } } + @Test public void testBooleanParameter() throws PortletRequestBindingException { MockPortletRequest request = new MockPortletRequest(); request.addParameter("param1", "true"); @@ -319,6 +330,7 @@ public class PortletRequestUtilsTests extends TestCase { assertFalse(PortletRequestUtils.getRequiredBooleanParameter(request, "paramEmpty")); } + @Test public void testBooleanParameters() throws PortletRequestBindingException { MockPortletRequest request = new MockPortletRequest(); request.addParameter("param", new String[] {"true", "yes", "off", "1", "bogus"}); @@ -342,6 +354,7 @@ public class PortletRequestUtilsTests extends TestCase { } } + @Test public void testStringParameter() throws PortletRequestBindingException { MockPortletRequest request = new MockPortletRequest(); request.addParameter("param1", "str"); @@ -365,7 +378,9 @@ public class PortletRequestUtilsTests extends TestCase { assertEquals("", PortletRequestUtils.getRequiredStringParameter(request, "paramEmpty")); } + @Test public void testGetIntParameterWithDefaultValueHandlingIsFastEnough() { + Assume.group(TestGroup.PERFORMANCE); MockPortletRequest request = new MockPortletRequest(); StopWatch sw = new StopWatch(); sw.start(); @@ -376,7 +391,9 @@ public class PortletRequestUtilsTests extends TestCase { assertThat(sw.getTotalTimeMillis(), lessThan(250L)); } + @Test public void testGetLongParameterWithDefaultValueHandlingIsFastEnough() { + Assume.group(TestGroup.PERFORMANCE); MockPortletRequest request = new MockPortletRequest(); StopWatch sw = new StopWatch(); sw.start(); @@ -387,7 +404,9 @@ public class PortletRequestUtilsTests extends TestCase { assertThat(sw.getTotalTimeMillis(), lessThan(250L)); } + @Test public void testGetFloatParameterWithDefaultValueHandlingIsFastEnough() { + Assume.group(TestGroup.PERFORMANCE); MockPortletRequest request = new MockPortletRequest(); StopWatch sw = new StopWatch(); sw.start(); @@ -398,7 +417,9 @@ public class PortletRequestUtilsTests extends TestCase { assertThat(sw.getTotalTimeMillis(), lessThan(350L)); } + @Test public void testGetDoubleParameterWithDefaultValueHandlingIsFastEnough() { + Assume.group(TestGroup.PERFORMANCE); MockPortletRequest request = new MockPortletRequest(); StopWatch sw = new StopWatch(); sw.start(); @@ -409,7 +430,9 @@ public class PortletRequestUtilsTests extends TestCase { assertThat(sw.getTotalTimeMillis(), lessThan(250L)); } + @Test public void testGetBooleanParameterWithDefaultValueHandlingIsFastEnough() { + Assume.group(TestGroup.PERFORMANCE); MockPortletRequest request = new MockPortletRequest(); StopWatch sw = new StopWatch(); sw.start(); @@ -420,7 +443,9 @@ public class PortletRequestUtilsTests extends TestCase { assertThat(sw.getTotalTimeMillis(), lessThan(250L)); } + @Test public void testGetStringParameterWithDefaultValueHandlingIsFastEnough() { + Assume.group(TestGroup.PERFORMANCE); MockPortletRequest request = new MockPortletRequest(); StopWatch sw = new StopWatch(); sw.start(); diff --git a/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java b/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java index eb715261ea0..b2fbd959d26 100644 --- a/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java +++ b/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java @@ -18,10 +18,13 @@ package org.springframework.scheduling.annotation; import java.util.concurrent.atomic.AtomicInteger; +import org.junit.Before; import org.junit.Test; import org.springframework.aop.support.AopUtils; import org.springframework.beans.factory.BeanCreationException; +import org.springframework.build.junit.Assume; +import org.springframework.build.junit.TestGroup; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -48,6 +51,11 @@ import static org.junit.Assert.*; */ public class ScheduledAndTransactionalAnnotationIntegrationTests { + @Before + public void setUp() { + Assume.group(TestGroup.PERFORMANCE); + } + @Test public void failsWhenJdkProxyAndScheduledMethodNotPresentOnInterface() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); From 8472a2b2ab23dbd0a4009296847ee8e1dbee8d45 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Fri, 28 Dec 2012 19:32:49 +0100 Subject: [PATCH 06/34] Update Apache license headers for affected sources --- .../java/org/springframework/aop/Advisor.java | 2 +- .../aop/AfterReturningAdvice.java | 2 +- .../aop/AopInvocationException.java | 2 +- .../aop/DynamicIntroductionAdvice.java | 2 +- .../springframework/aop/IntroductionAdvisor.java | 2 +- .../aop/IntroductionAwareMethodMatcher.java | 2 +- .../springframework/aop/IntroductionInfo.java | 2 +- .../springframework/aop/MethodBeforeAdvice.java | 2 +- .../org/springframework/aop/MethodMatcher.java | 2 +- .../java/org/springframework/aop/Pointcut.java | 2 +- .../org/springframework/aop/PointcutAdvisor.java | 2 +- .../aop/ProxyMethodInvocation.java | 2 +- .../springframework/aop/TargetClassAware.java | 2 +- .../org/springframework/aop/TargetSource.java | 2 +- .../org/springframework/aop/TrueClassFilter.java | 2 +- .../springframework/aop/TrueMethodMatcher.java | 2 +- .../org/springframework/aop/TruePointcut.java | 2 +- .../aop/aspectj/AspectInstanceFactory.java | 2 +- .../AspectJAdviceParameterNameDiscoverer.java | 2 +- .../aop/aspectj/AspectJAfterAdvice.java | 2 +- .../aop/aspectj/AspectJAopUtils.java | 2 +- .../aop/aspectj/AspectJExpressionPointcut.java | 2 +- .../AspectJExpressionPointcutAdvisor.java | 2 +- .../aop/aspectj/AspectJProxyUtils.java | 2 +- .../aop/aspectj/AspectJWeaverMessageHandler.java | 2 +- .../aop/aspectj/DeclareParentsAdvisor.java | 2 +- .../MethodInvocationProceedingJoinPoint.java | 2 +- .../aop/aspectj/RuntimeTestWalker.java | 2 +- .../aop/aspectj/SimpleAspectInstanceFactory.java | 2 +- .../aspectj/SingletonAspectInstanceFactory.java | 2 +- .../aop/aspectj/TypePatternClassFilter.java | 2 +- .../AbstractAspectJAdvisorFactory.java | 2 +- .../AnnotationAwareAspectJAutoProxyCreator.java | 2 +- .../annotation/AspectJAdvisorFactory.java | 2 +- .../aop/aspectj/annotation/AspectMetadata.java | 2 +- .../BeanFactoryAspectInstanceFactory.java | 2 +- ...stantiationModelAwarePointcutAdvisorImpl.java | 2 +- .../annotation/NotAnAtAspectException.java | 2 +- ...SimpleMetadataAwareAspectInstanceFactory.java | 2 +- ...gletonMetadataAwareAspectInstanceFactory.java | 2 +- .../AspectJAwareAdvisorAutoProxyCreator.java | 2 +- .../autoproxy/AspectJPrecedenceComparator.java | 2 +- ...InterceptorDrivenBeanDefinitionDecorator.java | 2 +- .../springframework/aop/config/AdviceEntry.java | 2 +- .../aop/config/AdvisorComponentDefinition.java | 2 +- .../springframework/aop/config/AdvisorEntry.java | 2 +- .../aop/config/AopConfigUtils.java | 2 +- .../aop/config/AopNamespaceHandler.java | 2 +- .../aop/config/AopNamespaceUtils.java | 2 +- .../AspectJAutoProxyBeanDefinitionParser.java | 2 +- .../aop/config/ConfigBeanDefinitionParser.java | 2 +- .../aop/config/PointcutEntry.java | 2 +- .../ScopedProxyBeanDefinitionDecorator.java | 2 +- .../springframework/aop/framework/Advised.java | 2 +- .../aop/framework/AdvisedSupport.java | 2 +- .../aop/framework/AopConfigException.java | 2 +- .../aop/framework/AopContext.java | 2 +- .../springframework/aop/framework/AopProxy.java | 2 +- .../aop/framework/AopProxyFactory.java | 2 +- .../aop/framework/AopProxyUtils.java | 2 +- .../framework/DefaultAdvisorChainFactory.java | 2 +- .../aop/framework/ProxyConfig.java | 2 +- .../aop/framework/ProxyCreatorSupport.java | 2 +- .../aop/framework/ProxyFactoryBean.java | 2 +- .../framework/ReflectiveMethodInvocation.java | 2 +- .../aop/framework/adapter/AdvisorAdapter.java | 2 +- .../adapter/AdvisorAdapterRegistry.java | 2 +- .../adapter/AfterReturningAdviceAdapter.java | 2 +- .../adapter/AfterReturningAdviceInterceptor.java | 2 +- .../adapter/DefaultAdvisorAdapterRegistry.java | 2 +- .../adapter/MethodBeforeAdviceAdapter.java | 2 +- .../adapter/MethodBeforeAdviceInterceptor.java | 2 +- .../framework/adapter/ThrowsAdviceAdapter.java | 2 +- .../adapter/ThrowsAdviceInterceptor.java | 2 +- .../adapter/UnknownAdviceTypeException.java | 2 +- .../AbstractAdvisorAutoProxyCreator.java | 2 +- .../aop/framework/autoproxy/AutoProxyUtils.java | 2 +- .../BeanFactoryAdvisorRetrievalHelper.java | 2 +- .../autoproxy/BeanNameAutoProxyCreator.java | 2 +- .../DefaultAdvisorAutoProxyCreator.java | 2 +- .../InfrastructureAdvisorAutoProxyCreator.java | 2 +- .../autoproxy/ProxyCreationContext.java | 2 +- .../framework/autoproxy/TargetSourceCreator.java | 2 +- ...tractBeanFactoryBasedTargetSourceCreator.java | 2 +- .../target/QuickTargetSourceCreator.java | 2 +- .../AbstractMonitoringInterceptor.java | 2 +- .../interceptor/AbstractTraceInterceptor.java | 2 +- .../ConcurrencyThrottleInterceptor.java | 2 +- .../CustomizableTraceInterceptor.java | 2 +- .../aop/interceptor/DebugInterceptor.java | 2 +- .../aop/interceptor/ExposeBeanNameAdvisors.java | 2 +- .../interceptor/ExposeInvocationInterceptor.java | 2 +- .../JamonPerformanceMonitorInterceptor.java | 2 +- .../PerformanceMonitorInterceptor.java | 2 +- .../aop/interceptor/SimpleTraceInterceptor.java | 2 +- .../aop/scope/DefaultScopedObject.java | 2 +- .../springframework/aop/scope/ScopedObject.java | 2 +- .../aop/scope/ScopedProxyFactoryBean.java | 2 +- .../aop/scope/ScopedProxyUtils.java | 2 +- .../AbstractBeanFactoryPointcutAdvisor.java | 2 +- .../aop/support/AbstractExpressionPointcut.java | 2 +- .../support/AbstractGenericPointcutAdvisor.java | 2 +- .../aop/support/AbstractPointcutAdvisor.java | 2 +- .../aop/support/ClassFilters.java | 2 +- .../aop/support/ComposablePointcut.java | 2 +- .../aop/support/ControlFlowPointcut.java | 2 +- .../DefaultBeanFactoryPointcutAdvisor.java | 2 +- .../aop/support/DefaultIntroductionAdvisor.java | 2 +- .../aop/support/DefaultPointcutAdvisor.java | 2 +- ...tePerTargetObjectIntroductionInterceptor.java | 2 +- .../DelegatingIntroductionInterceptor.java | 2 +- .../aop/support/DynamicMethodMatcher.java | 2 +- .../support/DynamicMethodMatcherPointcut.java | 2 +- .../aop/support/IntroductionInfoSupport.java | 2 +- .../aop/support/JdkRegexpMethodPointcut.java | 2 +- .../aop/support/MethodMatchers.java | 2 +- .../aop/support/NameMatchMethodPointcut.java | 2 +- .../support/NameMatchMethodPointcutAdvisor.java | 2 +- .../springframework/aop/support/Pointcuts.java | 2 +- .../aop/support/RegexpMethodPointcutAdvisor.java | 2 +- .../aop/support/RootClassFilter.java | 2 +- .../aop/support/StaticMethodMatcher.java | 2 +- .../annotation/AnnotationMatchingPointcut.java | 2 +- .../AbstractBeanFactoryBasedTargetSource.java | 2 +- .../target/AbstractLazyCreationTargetSource.java | 2 +- .../aop/target/AbstractPoolingTargetSource.java | 2 +- .../aop/target/CommonsPoolTargetSource.java | 2 +- .../aop/target/EmptyTargetSource.java | 2 +- .../aop/target/LazyInitTargetSource.java | 2 +- .../aop/target/PoolingConfig.java | 2 +- .../aop/target/PrototypeTargetSource.java | 2 +- .../aop/target/SimpleBeanTargetSource.java | 2 +- .../aop/target/SingletonTargetSource.java | 2 +- .../aop/target/ThreadLocalTargetSourceStats.java | 2 +- .../dynamic/AbstractRefreshableTargetSource.java | 2 +- .../BeanFactoryRefreshableTargetSource.java | 2 +- .../aop/target/dynamic/Refreshable.java | 2 +- ...viceParameterNameDiscoverAnnotationTests.java | 2 +- ...spectJAdviceParameterNameDiscovererTests.java | 2 +- .../aspectj/AspectJExpressionPointcutTests.java | 2 +- .../aspectj/BeanNamePointcutMatchingTests.java | 2 +- ...MethodInvocationProceedingJoinPointTests.java | 2 +- ...spectJAdviceParameterNameDiscovererTests.java | 2 +- .../TigerAspectJExpressionPointcutTests.java | 2 +- .../aop/aspectj/TypePatternClassFilterTests.java | 2 +- .../aspectj/annotation/ArgumentBindingTests.java | 2 +- .../annotation/AspectJPointcutAdvisorTests.java | 2 +- .../aspectj/annotation/AspectMetadataTests.java | 2 +- .../annotation/AspectProxyFactoryTests.java | 2 +- .../ReflectiveAspectJAdvisorFactoryTests.java | 2 +- .../AspectJPrecedenceComparatorTests.java | 2 +- .../config/AopNamespaceHandlerEventTests.java | 2 +- .../AopNamespaceHandlerPointcutErrorTests.java | 2 +- .../aop/config/TopLevelAopTagTests.java | 2 +- .../aop/framework/AopProxyUtilsTests.java | 2 +- .../framework/IntroductionBenchmarkTests.java | 2 +- .../aop/framework/MethodInvocationTests.java | 2 +- .../aop/framework/PrototypeTargetTests.java | 2 +- .../aop/framework/ProxyFactoryTests.java | 2 +- .../adapter/ThrowsAdviceInterceptorTests.java | 2 +- .../ConcurrencyThrottleInterceptorTests.java | 2 +- .../CustomizableTraceInterceptorTests.java | 2 +- .../aop/interceptor/DebugInterceptorTests.java | 2 +- .../interceptor/ExposeBeanNameAdvisorsTests.java | 2 +- .../ExposeInvocationInterceptorTests.java | 2 +- .../PerformanceMonitorInterceptorTests.java | 2 +- .../interceptor/SimpleTraceInterceptorTests.java | 2 +- .../aop/scope/DefaultScopedObjectTests.java | 2 +- .../aop/scope/ScopedProxyAutowireTests.java | 2 +- .../aop/support/AopUtilsTests.java | 2 +- .../aop/support/ClassFiltersTests.java | 2 +- .../aop/support/ComposablePointcutTests.java | 2 +- .../aop/support/ControlFlowPointcutTests.java | 2 +- .../DelegatingIntroductionInterceptorTests.java | 2 +- .../support/JdkRegexpMethodPointcutTests.java | 2 +- .../aop/support/MethodMatchersTests.java | 2 +- .../support/NameMatchMethodPointcutTests.java | 2 +- .../aop/support/PointcutsTests.java | 2 +- ...expMethodPointcutAdvisorIntegrationTests.java | 2 +- .../CommonsPoolTargetSourceProxyTests.java | 2 +- .../target/HotSwappableTargetSourceTests.java | 2 +- .../target/LazyCreationTargetSourceTests.java | 2 +- .../aop/target/LazyInitTargetSourceTests.java | 2 +- .../target/PrototypeBasedTargetSourceTests.java | 2 +- .../aop/target/PrototypeTargetSourceTests.java | 2 +- .../aop/target/ThreadLocalTargetSourceTests.java | 2 +- .../dynamic/RefreshableTargetSourceTests.java | 2 +- .../test/java/test/aop/CountingBeforeAdvice.java | 2 +- .../src/test/java/test/aop/DefaultLockable.java | 2 +- spring-aop/src/test/java/test/aop/Lockable.java | 2 +- .../src/test/java/test/aop/MethodCounter.java | 2 +- .../src/test/java/test/aop/NopInterceptor.java | 2 +- .../test/aop/SerializableNopInterceptor.java | 2 +- .../test/java/test/beans/DerivedTestBean.java | 2 +- .../test/java/test/beans/INestedTestBean.java | 2 +- spring-aop/src/test/java/test/beans/IOther.java | 2 +- .../src/test/java/test/beans/NestedTestBean.java | 2 +- spring-aop/src/test/java/test/beans/Person.java | 2 +- .../test/java/test/beans/SerializablePerson.java | 2 +- .../src/test/java/test/beans/SideEffectBean.java | 2 +- .../src/test/java/test/beans/TestBean.java | 2 +- .../test/java/test/beans/subpkg/DeepBean.java | 2 +- .../parsing/CollectingReaderEventListener.java | 2 +- .../java/test/util/SerializationTestUtils.java | 2 +- .../test/java/test/util/TestResourceUtils.java | 2 +- .../src/test/java/test/util/TimeStamped.java | 2 +- .../aspectj/AbstractBeanConfigurerAspect.aj | 2 +- .../aspectj/AbstractDependencyInjectionAspect.aj | 2 +- ...ctInterfaceDrivenDependencyInjectionAspect.aj | 2 +- .../aspectj/AnnotationBeanConfigurerAspect.aj | 2 +- .../factory/aspectj/ConfigurableObject.java | 2 +- ...icInterfaceDrivenDependencyInjectionAspect.aj | 2 +- .../cache/aspectj/AbstractCacheAspect.aj | 2 +- .../cache/aspectj/AnnotationCacheAspect.aj | 2 +- .../aspectj/AspectJCachingConfiguration.java | 2 +- .../staticmock/AbstractMethodMockingControl.aj | 2 +- ...AnnotationDrivenStaticEntityMockingControl.aj | 2 +- .../mock/staticmock/MockStaticEntityMethods.java | 1 + .../jpa/aspectj/JpaExceptionTranslatorAspect.aj | 16 ++++++++++++++++ .../aspectj/AbstractTransactionAspect.aj | 2 +- .../aspectj/AnnotationTransactionAspect.aj | 2 +- ...spectJTransactionManagementConfiguration.java | 2 +- .../AutoProxyWithCodeStyleAspectsTests.java | 2 +- .../aop/aspectj/autoproxy/CodeStyleAspect.aj | 2 +- .../java/org/springframework/beans/Colour.java | 2 +- .../springframework/beans/DerivedTestBean.java | 2 +- .../springframework/beans/INestedTestBean.java | 2 +- .../java/org/springframework/beans/IOther.java | 2 +- .../org/springframework/beans/ITestBean.java | 2 +- .../springframework/beans/IndexedTestBean.java | 2 +- .../springframework/beans/NestedTestBean.java | 2 +- .../java/org/springframework/beans/TestBean.java | 2 +- .../aspectj/AbstractBeanConfigurerTests.java | 2 +- .../SpringConfiguredWithAutoProxyingTests.java | 2 +- .../factory/aspectj/XmlBeanConfigurerTests.java | 2 +- .../cache/aspectj/AbstractAnnotationTest.java | 2 +- .../cache/aspectj/AspectJAnnotationTest.java | 2 +- .../config/AnnotatedClassCacheableService.java | 2 +- .../cache/config/CacheableService.java | 2 +- .../cache/config/DefaultCacheableService.java | 2 +- .../cache/config/SomeKeyGenerator.java | 2 +- ...tionDrivenStaticEntityMockingControlTest.java | 2 +- .../mock/staticmock/Delegate.java | 2 +- .../springframework/mock/staticmock/Person.java | 2 +- .../mock/staticmock/Person_Roo_Entity.aj | 2 +- .../CallCountingTransactionManager.java | 2 +- .../aspectj/ClassWithPrivateAnnotatedMember.java | 4 +--- .../ClassWithProtectedAnnotatedMember.java | 4 +--- .../transaction/aspectj/ITransactional.java | 16 ++++++++++++++++ .../MethodAnnotationOnClassWithNoInterface.java | 16 ++++++++++++++++ .../aspectj/TransactionAspectTests.java | 2 +- ...onalAnnotationOnlyOnClassWithNoInterface.java | 16 ++++++++++++++++ .../beans/BeanInstantiationException.java | 2 +- .../beans/BeanMetadataAttribute.java | 2 +- .../beans/BeanMetadataAttributeAccessor.java | 2 +- .../beans/BeanMetadataElement.java | 2 +- .../org/springframework/beans/BeanWrapper.java | 2 +- .../springframework/beans/BeansException.java | 2 +- .../beans/ConversionNotSupportedException.java | 2 +- .../beans/FatalBeanException.java | 2 +- .../GenericTypeAwarePropertyDescriptor.java | 2 +- .../beans/InvalidPropertyException.java | 2 +- .../org/springframework/beans/Mergeable.java | 2 +- .../beans/MethodInvocationException.java | 2 +- .../beans/MutablePropertyValues.java | 2 +- .../beans/NotReadablePropertyException.java | 2 +- .../beans/NotWritablePropertyException.java | 2 +- .../beans/NullValueInNestedPathException.java | 2 +- .../beans/PropertyAccessException.java | 2 +- .../springframework/beans/PropertyAccessor.java | 2 +- .../beans/PropertyAccessorUtils.java | 2 +- .../beans/PropertyBatchUpdateException.java | 2 +- .../beans/PropertyEditorRegistrar.java | 2 +- .../beans/PropertyEditorRegistry.java | 2 +- .../beans/PropertyEditorRegistrySupport.java | 2 +- .../springframework/beans/PropertyMatches.java | 2 +- .../org/springframework/beans/PropertyValue.java | 2 +- .../springframework/beans/PropertyValues.java | 2 +- .../beans/TypeMismatchException.java | 2 +- .../beans/factory/BeanClassLoaderAware.java | 2 +- .../beans/factory/BeanCreationException.java | 2 +- .../factory/BeanCreationNotAllowedException.java | 2 +- .../BeanCurrentlyInCreationException.java | 2 +- .../factory/BeanDefinitionStoreException.java | 2 +- .../beans/factory/BeanExpressionException.java | 2 +- .../beans/factory/BeanFactory.java | 2 +- .../beans/factory/BeanFactoryAware.java | 2 +- .../factory/BeanInitializationException.java | 2 +- .../beans/factory/BeanIsAbstractException.java | 2 +- .../factory/BeanIsNotAFactoryException.java | 2 +- .../factory/BeanNotOfRequiredTypeException.java | 2 +- .../factory/CannotLoadBeanClassException.java | 2 +- .../beans/factory/DisposableBean.java | 2 +- .../beans/factory/FactoryBean.java | 2 +- .../FactoryBeanNotInitializedException.java | 2 +- .../beans/factory/HierarchicalBeanFactory.java | 2 +- .../beans/factory/InitializingBean.java | 2 +- .../beans/factory/ListableBeanFactory.java | 2 +- .../beans/factory/ObjectFactory.java | 2 +- .../beans/factory/SmartFactoryBean.java | 2 +- .../factory/UnsatisfiedDependencyException.java | 2 +- .../beans/factory/access/BeanFactoryLocator.java | 2 +- .../factory/access/BeanFactoryReference.java | 2 +- .../beans/factory/access/BootstrapException.java | 2 +- .../access/SingletonBeanFactoryLocator.java | 2 +- .../factory/access/el/SpringBeanELResolver.java | 2 +- .../annotation/AnnotatedBeanDefinition.java | 2 +- .../beans/factory/annotation/Configurable.java | 2 +- .../beans/factory/annotation/Required.java | 2 +- .../factory/config/AbstractFactoryBean.java | 2 +- .../config/AutowireCapableBeanFactory.java | 2 +- .../beans/factory/config/BeanDefinition.java | 2 +- .../factory/config/BeanDefinitionHolder.java | 2 +- .../factory/config/BeanFactoryPostProcessor.java | 2 +- .../beans/factory/config/BeanPostProcessor.java | 2 +- .../beans/factory/config/BeanReference.java | 2 +- .../factory/config/BeanReferenceFactoryBean.java | 2 +- .../factory/config/CommonsLogFactoryBean.java | 2 +- .../config/ConfigurableListableBeanFactory.java | 2 +- .../config/ConstructorArgumentValues.java | 2 +- .../factory/config/CustomEditorConfigurer.java | 2 +- .../DestructionAwareBeanPostProcessor.java | 2 +- .../config/FieldRetrievingFactoryBean.java | 2 +- .../InstantiationAwareBeanPostProcessor.java | 2 +- .../beans/factory/config/ListFactoryBean.java | 2 +- .../config/MethodInvokingFactoryBean.java | 2 +- .../config/PreferencesPlaceholderConfigurer.java | 2 +- .../factory/config/PropertyPathFactoryBean.java | 2 +- .../config/PropertyPlaceholderConfigurer.java | 2 +- .../factory/config/RuntimeBeanNameReference.java | 2 +- .../factory/config/RuntimeBeanReference.java | 2 +- .../beans/factory/config/Scope.java | 2 +- .../config/ServiceLocatorFactoryBean.java | 2 +- .../factory/config/SingletonBeanRegistry.java | 2 +- ...SmartInstantiationAwareBeanPostProcessor.java | 2 +- .../beans/factory/config/TypedStringValue.java | 2 +- .../beans/factory/parsing/AliasDefinition.java | 2 +- .../factory/parsing/BeanComponentDefinition.java | 2 +- .../parsing/BeanDefinitionParsingException.java | 2 +- .../factory/parsing/ComponentDefinition.java | 2 +- .../parsing/ConstructorArgumentEntry.java | 2 +- .../factory/parsing/FailFastProblemReporter.java | 2 +- .../beans/factory/parsing/ImportDefinition.java | 2 +- .../beans/factory/parsing/Location.java | 2 +- .../factory/parsing/NullSourceExtractor.java | 2 +- .../beans/factory/parsing/ParseState.java | 2 +- .../parsing/PassThroughSourceExtractor.java | 2 +- .../beans/factory/parsing/Problem.java | 2 +- .../beans/factory/parsing/ProblemReporter.java | 2 +- .../beans/factory/parsing/PropertyEntry.java | 2 +- .../beans/factory/parsing/QualifierEntry.java | 2 +- .../beans/factory/parsing/SourceExtractor.java | 2 +- .../support/AbstractBeanDefinitionReader.java | 2 +- .../support/AutowireCandidateQualifier.java | 2 +- .../support/AutowireCandidateResolver.java | 2 +- .../beans/factory/support/AutowireUtils.java | 2 +- .../factory/support/BeanDefinitionBuilder.java | 2 +- .../factory/support/BeanDefinitionDefaults.java | 2 +- .../factory/support/BeanDefinitionReader.java | 2 +- .../support/BeanDefinitionReaderUtils.java | 2 +- .../factory/support/BeanDefinitionRegistry.java | 2 +- .../factory/support/BeanDefinitionResource.java | 2 +- .../BeanDefinitionValidationException.java | 2 +- .../factory/support/ChildBeanDefinition.java | 2 +- .../factory/support/ConstructorResolver.java | 2 +- .../factory/support/GenericBeanDefinition.java | 2 +- .../factory/support/InstantiationStrategy.java | 2 +- .../beans/factory/support/LookupOverride.java | 2 +- .../beans/factory/support/ManagedArray.java | 2 +- .../beans/factory/support/ManagedList.java | 2 +- .../beans/factory/support/ManagedMap.java | 2 +- .../beans/factory/support/ManagedProperties.java | 2 +- .../beans/factory/support/ManagedSet.java | 2 +- .../beans/factory/support/MethodOverride.java | 2 +- .../beans/factory/support/MethodOverrides.java | 2 +- .../beans/factory/support/MethodReplacer.java | 2 +- .../support/PropertiesBeanDefinitionReader.java | 2 +- .../beans/factory/support/ReplaceOverride.java | 2 +- .../factory/support/SecurityContextProvider.java | 2 +- .../support/SimpleSecurityContextProvider.java | 2 +- .../factory/wiring/BeanConfigurerSupport.java | 2 +- .../beans/factory/wiring/BeanWiringInfo.java | 2 +- .../factory/wiring/BeanWiringInfoResolver.java | 2 +- .../xml/AbstractBeanDefinitionParser.java | 2 +- .../xml/AbstractSimpleBeanDefinitionParser.java | 2 +- .../xml/AbstractSingleBeanDefinitionParser.java | 2 +- .../factory/xml/BeanDefinitionDecorator.java | 2 +- .../xml/BeanDefinitionDocumentReader.java | 2 +- .../beans/factory/xml/BeansDtdResolver.java | 2 +- .../xml/DefaultBeanDefinitionDocumentReader.java | 2 +- .../factory/xml/DelegatingEntityResolver.java | 2 +- .../factory/xml/DocumentDefaultsDefinition.java | 2 +- .../beans/factory/xml/DocumentLoader.java | 2 +- .../beans/factory/xml/NamespaceHandler.java | 2 +- .../factory/xml/NamespaceHandlerResolver.java | 2 +- .../xml/SimpleConstructorNamespaceHandler.java | 2 +- .../xml/SimplePropertyNamespaceHandler.java | 2 +- .../beans/factory/xml/UtilNamespaceHandler.java | 2 +- .../factory/xml/XmlBeanDefinitionReader.java | 2 +- .../xml/XmlBeanDefinitionStoreException.java | 2 +- .../beans/factory/xml/XmlBeanFactory.java | 2 +- .../beans/propertyeditors/CharacterEditor.java | 2 +- .../beans/propertyeditors/CharsetEditor.java | 2 +- .../beans/propertyeditors/ClassArrayEditor.java | 2 +- .../beans/propertyeditors/ClassEditor.java | 2 +- .../beans/propertyeditors/CurrencyEditor.java | 2 +- .../propertyeditors/CustomBooleanEditor.java | 2 +- .../propertyeditors/CustomCollectionEditor.java | 2 +- .../beans/propertyeditors/CustomDateEditor.java | 2 +- .../beans/propertyeditors/CustomMapEditor.java | 2 +- .../propertyeditors/CustomNumberEditor.java | 2 +- .../beans/propertyeditors/FileEditor.java | 2 +- .../beans/propertyeditors/InputSourceEditor.java | 2 +- .../beans/propertyeditors/InputStreamEditor.java | 2 +- .../beans/propertyeditors/LocaleEditor.java | 2 +- .../beans/propertyeditors/PatternEditor.java | 2 +- .../beans/propertyeditors/PropertiesEditor.java | 2 +- .../propertyeditors/ResourceBundleEditor.java | 2 +- .../StringArrayPropertyEditor.java | 2 +- .../propertyeditors/StringTrimmerEditor.java | 2 +- .../beans/propertyeditors/TimeZoneEditor.java | 2 +- .../beans/propertyeditors/URIEditor.java | 2 +- .../beans/propertyeditors/URLEditor.java | 2 +- .../beans/propertyeditors/UUIDEditor.java | 2 +- .../support/ArgumentConvertingMethodInvoker.java | 2 +- .../beans/support/MutableSortDefinition.java | 2 +- .../beans/support/PagedListHolder.java | 2 +- .../beans/support/PropertyComparator.java | 2 +- .../beans/support/SortDefinition.java | 2 +- .../foo/ComponentBeanDefinitionParserTest.java | 2 +- .../beans/AbstractPropertyValuesTests.java | 2 +- .../springframework/beans/BeanUtilsTests.java | 2 +- .../beans/BeanWrapperAutoGrowingTests.java | 2 +- .../beans/BeanWrapperGenericsTests.java | 2 +- .../beans/ConcurrentBeanWrapperTests.java | 2 +- .../beans/MutablePropertyValuesTests.java | 2 +- ...RequiredAnnotationBeanPostProcessorTests.java | 2 +- .../factory/ConcurrentBeanFactoryTests.java | 2 +- .../beans/factory/FactoryBeanLookupTests.java | 2 +- .../beans/factory/FactoryBeanTests.java | 2 +- .../beans/factory/SharedBeanRegistryTests.java | 2 +- .../CustomAutowireConfigurerTests.java | 2 +- .../config/CustomEditorConfigurerTests.java | 2 +- .../config/CustomScopeConfigurerTests.java | 2 +- .../config/FieldRetrievingFactoryBeanTests.java | 2 +- .../config/MethodInvokingFactoryBeanTests.java | 2 +- .../ObjectFactoryCreatingFactoryBeanTests.java | 2 +- .../config/PropertiesFactoryBeanTests.java | 2 +- .../config/PropertyPathFactoryBeanTests.java | 2 +- .../config/ServiceLocatorFactoryBeanTests.java | 2 +- .../beans/factory/config/SimpleScopeTests.java | 2 +- .../beans/factory/config/TestTypes.java | 2 +- .../parsing/CustomProblemReporterTests.java | 2 +- .../parsing/FailFastProblemReporterTests.java | 2 +- .../parsing/PassThroughSourceExtractorTests.java | 2 +- .../DefinitionMetadataEqualsHashCodeTests.java | 2 +- .../beans/factory/support/ManagedListTests.java | 2 +- .../beans/factory/support/ManagedSetTests.java | 2 +- .../PropertiesBeanDefinitionReaderTests.java | 2 +- ...lifierAnnotationAutowireBeanFactoryTests.java | 2 +- .../security/support/ConstructorBean.java | 2 +- .../security/support/CustomCallbackBean.java | 2 +- .../security/support/CustomFactoryBean.java | 2 +- .../support/security/support/DestroyBean.java | 2 +- .../support/security/support/FactoryBean.java | 2 +- .../support/security/support/InitBean.java | 2 +- .../support/security/support/PropertyBean.java | 2 +- .../wiring/BeanConfigurerSupportTests.java | 2 +- .../factory/xml/AbstractBeanFactoryTests.java | 2 +- .../factory/xml/BeanNameGenerationTests.java | 2 +- .../xml/CollectingReaderEventListener.java | 2 +- .../factory/xml/CollectionMergingTests.java | 2 +- .../factory/xml/ConstructorDependenciesBean.java | 2 +- .../beans/factory/xml/CountingFactory.java | 2 +- .../xml/DefaultLifecycleMethodsTests.java | 2 +- .../xml/DelegatingEntityResolverTests.java | 2 +- .../beans/factory/xml/DependenciesBean.java | 2 +- .../beans/factory/xml/DummyReferencer.java | 2 +- .../beans/factory/xml/DuplicateBeanIdTests.java | 2 +- .../beans/factory/xml/EventPublicationTests.java | 2 +- .../beans/factory/xml/FactoryMethods.java | 2 +- .../beans/factory/xml/GeneratedNameBean.java | 2 +- .../beans/factory/xml/InstanceFactory.java | 2 +- .../factory/xml/MetadataAttachmentTests.java | 2 +- .../xml/ProfileXmlBeanDefinitionTests.java | 2 +- .../factory/xml/ProtectedLifecycleBean.java | 2 +- .../SimpleConstructorNamespaceHandlerTests.java | 2 +- .../beans/factory/xml/TestBeanCreator.java | 2 +- .../factory/xml/UtilNamespaceHandlerTests.java | 2 +- .../xml/XmlBeanDefinitionReaderTests.java | 2 +- .../factory/xml/XmlListableBeanFactoryTests.java | 2 +- .../DefaultNamespaceHandlerResolverTests.java | 2 +- .../beans/propertyeditors/BeanInfoTests.java | 2 +- .../ByteArrayPropertyEditorTests.java | 2 +- .../beans/propertyeditors/CustomEditorTests.java | 2 +- .../propertyeditors/PropertiesEditorTests.java | 2 +- .../beans/support/PagedListHolderTests.java | 2 +- .../beans/support/PropertyComparatorTests.java | 2 +- .../test/java/test/beans/BooleanTestBean.java | 2 +- .../src/test/java/test/beans/Colour.java | 2 +- .../test/java/test/beans/DerivedTestBean.java | 2 +- .../src/test/java/test/beans/DummyBean.java | 2 +- .../src/test/java/test/beans/DummyFactory.java | 2 +- .../test/java/test/beans/INestedTestBean.java | 2 +- .../src/test/java/test/beans/IOther.java | 2 +- .../src/test/java/test/beans/LifecycleBean.java | 2 +- .../src/test/java/test/beans/NestedTestBean.java | 2 +- .../src/test/java/test/beans/NumberTestBean.java | 2 +- .../java/test/beans/PackageLevelVisibleBean.java | 2 +- .../src/test/java/test/beans/TestBean.java | 2 +- .../test/java/test/util/TestResourceUtils.java | 2 +- .../mail/MailAuthenticationException.java | 2 +- .../org/springframework/mail/MailException.java | 2 +- .../springframework/mail/MailParseException.java | 2 +- .../mail/MailPreparationException.java | 2 +- .../springframework/mail/MailSendException.java | 2 +- .../org/springframework/mail/MailSender.java | 2 +- .../springframework/mail/SimpleMailMessage.java | 2 +- .../javamail/ConfigurableMimeFileTypeMap.java | 2 +- .../mail/javamail/InternetAddressEditor.java | 2 +- .../mail/javamail/JavaMailSender.java | 2 +- .../mail/javamail/JavaMailSenderImpl.java | 2 +- .../mail/javamail/MimeMessageHelper.java | 2 +- .../mail/javamail/MimeMessagePreparator.java | 2 +- .../mail/javamail/SmartMimeMessage.java | 2 +- .../commonj/ScheduledTimerListener.java | 2 +- .../scheduling/commonj/TimerManagerAccessor.java | 2 +- .../scheduling/quartz/CronTriggerBean.java | 2 +- .../scheduling/quartz/JobDetailAwareTrigger.java | 2 +- .../scheduling/quartz/JobDetailBean.java | 2 +- .../JobMethodInvocationFailedException.java | 2 +- .../quartz/LocalDataSourceJobStore.java | 2 +- .../quartz/LocalTaskExecutorThreadPool.java | 2 +- .../scheduling/quartz/QuartzJobBean.java | 2 +- .../quartz/ResourceLoaderClassLoadHelper.java | 2 +- .../scheduling/quartz/SchedulerFactoryBean.java | 2 +- .../scheduling/quartz/SimpleTriggerBean.java | 2 +- .../scheduling/quartz/SpringBeanJobFactory.java | 2 +- .../FreeMarkerConfigurationFactory.java | 2 +- .../ui/freemarker/FreeMarkerTemplateUtils.java | 2 +- .../ui/velocity/VelocityEngineFactory.java | 2 +- .../java/org/springframework/beans/Colour.java | 2 +- .../springframework/beans/INestedTestBean.java | 2 +- .../java/org/springframework/beans/IOther.java | 2 +- .../springframework/beans/NestedTestBean.java | 2 +- .../java/org/springframework/beans/TestBean.java | 2 +- .../javamail/InternetAddressEditorTests.java | 2 +- .../mail/javamail/JavaMailSenderTests.java | 2 +- .../scheduling/quartz/CronTriggerBeanTests.java | 2 +- .../scheduling/quartz/QuartzSupportTests.java | 2 +- .../java/org/springframework/cache/Cache.java | 2 +- .../cache/annotation/Cacheable.java | 2 +- .../cache/interceptor/CacheAspectSupport.java | 2 +- .../cache/support/SimpleValueWrapper.java | 2 +- .../context/ApplicationContext.java | 2 +- .../context/ApplicationContextAware.java | 2 +- .../context/ApplicationContextException.java | 2 +- .../context/ApplicationEvent.java | 2 +- .../context/ApplicationListener.java | 2 +- .../context/HierarchicalMessageSource.java | 2 +- .../org/springframework/context/Lifecycle.java | 2 +- .../springframework/context/MessageSource.java | 2 +- .../context/MessageSourceResolvable.java | 2 +- .../context/NoSuchMessageException.java | 2 +- .../java/org/springframework/context/Phased.java | 2 +- .../context/ResourceLoaderAware.java | 2 +- .../access/ContextBeanFactoryReference.java | 2 +- .../access/ContextJndiBeanFactoryLocator.java | 2 +- .../ContextSingletonBeanFactoryLocator.java | 2 +- .../context/access/DefaultLocatorFactory.java | 2 +- .../context/annotation/AutoProxyRegistrar.java | 2 +- .../ClassPathBeanDefinitionScanner.java | 2 +- .../context/annotation/Scope.java | 2 +- .../context/annotation/ScopeMetadata.java | 2 +- .../annotation/ScopeMetadataResolver.java | 2 +- .../context/config/ContextNamespaceHandler.java | 2 +- .../PropertyOverrideBeanDefinitionParser.java | 2 +- .../context/event/ApplicationContextEvent.java | 2 +- .../context/event/ContextClosedEvent.java | 2 +- .../context/event/ContextRefreshedEvent.java | 2 +- .../context/event/ContextStartedEvent.java | 2 +- .../context/event/ContextStoppedEvent.java | 2 +- .../event/EventPublicationInterceptor.java | 2 +- .../event/SimpleApplicationEventMulticaster.java | 2 +- .../context/expression/MapAccessor.java | 2 +- .../context/i18n/LocaleContextHolder.java | 2 +- .../context/i18n/SimpleLocaleContext.java | 2 +- .../context/support/AbstractMessageSource.java | 2 +- .../AbstractRefreshableApplicationContext.java | 2 +- ...tractRefreshableConfigApplicationContext.java | 2 +- .../support/AbstractXmlApplicationContext.java | 2 +- .../ApplicationContextAwareProcessor.java | 2 +- .../support/ApplicationObjectSupport.java | 2 +- .../support/ContextTypeMatchClassLoader.java | 2 +- .../support/ConversionServiceFactoryBean.java | 2 +- .../support/DefaultMessageSourceResolvable.java | 2 +- .../support/GenericApplicationContext.java | 2 +- .../support/GenericXmlApplicationContext.java | 2 +- .../context/support/MessageSourceAccessor.java | 2 +- .../support/MessageSourceResourceBundle.java | 2 +- .../context/support/SimpleThreadScope.java | 2 +- .../weaving/DefaultContextLoadTimeWeaver.java | 2 +- .../context/weaving/LoadTimeWeaverAware.java | 2 +- .../weaving/LoadTimeWeaverAwareProcessor.java | 2 +- .../AbstractRemoteSlsbInvokerInterceptor.java | 2 +- .../access/AbstractSlsbInvokerInterceptor.java | 2 +- .../ejb/access/EjbAccessException.java | 2 +- .../ejb/access/LocalSlsbInvokerInterceptor.java | 2 +- .../LocalStatelessSessionProxyFactoryBean.java | 2 +- .../SimpleRemoteSlsbInvokerInterceptor.java | 2 +- ...leRemoteStatelessSessionProxyFactoryBean.java | 2 +- .../ejb/config/JeeNamespaceHandler.java | 2 +- .../config/JndiLookupBeanDefinitionParser.java | 2 +- ...ocalStatelessSessionBeanDefinitionParser.java | 2 +- ...moteStatelessSessionBeanDefinitionParser.java | 2 +- .../SpringBeanAutowiringInterceptor.java | 2 +- .../ejb/support/AbstractEnterpriseBean.java | 2 +- .../support/AbstractJmsMessageDrivenBean.java | 2 +- .../ejb/support/AbstractMessageDrivenBean.java | 2 +- .../ejb/support/AbstractSessionBean.java | 2 +- .../ejb/support/AbstractStatefulSessionBean.java | 2 +- .../support/AbstractStatelessSessionBean.java | 2 +- .../format/AnnotationFormatterFactory.java | 2 +- .../org/springframework/format/Formatter.java | 2 +- .../format/FormatterRegistrar.java | 2 +- .../format/FormatterRegistry.java | 2 +- .../java/org/springframework/format/Parser.java | 2 +- .../java/org/springframework/format/Printer.java | 2 +- .../format/annotation/NumberFormat.java | 2 +- .../format/datetime/joda/JodaTimeContext.java | 2 +- .../datetime/joda/JodaTimeContextHolder.java | 2 +- .../format/number/AbstractNumberFormatter.java | 2 +- .../NumberFormatAnnotationFormatterFactory.java | 2 +- .../FormattingConversionServiceFactoryBean.java | 2 +- .../InstrumentationLoadTimeWeaver.java | 2 +- .../instrument/classloading/LoadTimeWeaver.java | 2 +- .../classloading/ReflectiveLoadTimeWeaver.java | 2 +- .../ResourceOverridingShadowingClassLoader.java | 2 +- .../SimpleInstrumentableClassLoader.java | 2 +- .../classloading/SimpleLoadTimeWeaver.java | 2 +- .../glassfish/GlassFishClassLoaderAdapter.java | 2 +- .../glassfish/GlassFishLoadTimeWeaver.java | 2 +- .../classloading/jboss/JBossMCAdapter.java | 2 +- .../jboss/JBossMCTranslatorAdapter.java | 2 +- .../oc4j/OC4JClassLoaderAdapter.java | 2 +- .../oc4j/OC4JClassPreprocessorAdapter.java | 2 +- .../weblogic/WebLogicClassLoaderAdapter.java | 2 +- .../WebLogicClassPreProcessorAdapter.java | 2 +- .../weblogic/WebLogicLoadTimeWeaver.java | 2 +- .../websphere/WebSphereClassPreDefinePlugin.java | 2 +- .../websphere/WebSphereLoadTimeWeaver.java | 2 +- .../org/springframework/jmx/JmxException.java | 2 +- .../jmx/MBeanServerNotFoundException.java | 2 +- .../jmx/access/ConnectorDelegate.java | 2 +- .../jmx/access/InvalidInvocationException.java | 2 +- .../jmx/access/InvocationFailureException.java | 2 +- .../jmx/access/MBeanClientInterceptor.java | 2 +- .../jmx/access/MBeanConnectFailureException.java | 2 +- .../jmx/access/MBeanInfoRetrievalException.java | 2 +- .../jmx/access/MBeanProxyFactoryBean.java | 2 +- .../access/NotificationListenerRegistrar.java | 2 +- .../jmx/export/MBeanExportException.java | 2 +- .../jmx/export/MBeanExporter.java | 2 +- .../jmx/export/MBeanExporterListener.java | 2 +- .../export/UnableToRegisterMBeanException.java | 2 +- .../jmx/export/annotation/ManagedMetric.java | 2 +- .../annotation/ManagedOperationParameter.java | 2 +- .../annotation/ManagedOperationParameters.java | 2 +- .../jmx/export/annotation/ManagedResource.java | 2 +- .../assembler/AbstractMBeanInfoAssembler.java | 2 +- .../AutodetectCapableMBeanInfoAssembler.java | 2 +- .../InterfaceBasedMBeanInfoAssembler.java | 2 +- .../jmx/export/assembler/MBeanInfoAssembler.java | 2 +- .../assembler/MetadataMBeanInfoAssembler.java | 2 +- .../MethodExclusionMBeanInfoAssembler.java | 2 +- .../MethodNameBasedMBeanInfoAssembler.java | 2 +- .../SimpleReflectiveMBeanInfoAssembler.java | 2 +- .../metadata/InvalidMetadataException.java | 2 +- .../jmx/export/metadata/JmxAttributeSource.java | 2 +- .../jmx/export/metadata/ManagedResource.java | 2 +- .../export/naming/IdentityNamingStrategy.java | 2 +- .../jmx/export/naming/KeyNamingStrategy.java | 2 +- .../export/naming/MetadataNamingStrategy.java | 2 +- .../jmx/export/naming/ObjectNamingStrategy.java | 2 +- .../jmx/export/naming/SelfNaming.java | 2 +- .../ModelMBeanNotificationPublisher.java | 2 +- .../notification/NotificationPublisher.java | 2 +- .../UnableToSendNotificationException.java | 2 +- .../jmx/support/ConnectorServerFactoryBean.java | 2 +- .../springframework/jmx/support/JmxUtils.java | 2 +- .../MBeanServerConnectionFactoryBean.java | 2 +- .../jmx/support/MBeanServerFactoryBean.java | 2 +- .../jmx/support/NotificationListenerHolder.java | 2 +- .../jmx/support/ObjectNameManager.java | 2 +- .../support/WebSphereMBeanServerFactoryBean.java | 2 +- .../org/springframework/jndi/JndiCallback.java | 2 +- .../jndi/JndiLocatorDelegate.java | 2 +- .../jndi/JndiLookupFailureException.java | 2 +- .../jndi/JndiObjectTargetSource.java | 2 +- .../org/springframework/jndi/JndiTemplate.java | 2 +- .../springframework/jndi/JndiTemplateEditor.java | 2 +- .../jndi/TypeMismatchNamingException.java | 2 +- .../jndi/support/SimpleJndiBeanFactory.java | 2 +- .../remoting/RemoteConnectFailureException.java | 2 +- .../RemoteInvocationFailureException.java | 2 +- .../remoting/RemoteLookupFailureException.java | 2 +- .../remoting/RemoteProxyFailureException.java | 2 +- .../rmi/CodebaseAwareObjectInputStream.java | 2 +- .../remoting/rmi/JndiRmiClientInterceptor.java | 2 +- .../remoting/rmi/JndiRmiProxyFactoryBean.java | 2 +- .../remoting/rmi/JndiRmiServiceExporter.java | 2 +- .../rmi/RemoteInvocationSerializingExporter.java | 2 +- .../remoting/rmi/RmiBasedExporter.java | 2 +- .../remoting/rmi/RmiClientInterceptor.java | 2 +- .../remoting/rmi/RmiClientInterceptorUtils.java | 2 +- .../remoting/rmi/RmiInvocationHandler.java | 2 +- .../remoting/rmi/RmiInvocationWrapper.java | 2 +- .../remoting/rmi/RmiProxyFactoryBean.java | 2 +- .../remoting/rmi/RmiRegistryFactoryBean.java | 2 +- .../remoting/rmi/RmiServiceExporter.java | 2 +- .../remoting/soap/SoapFaultException.java | 2 +- .../remoting/support/RemoteAccessor.java | 2 +- .../remoting/support/RemoteExporter.java | 2 +- .../remoting/support/RemoteInvocation.java | 2 +- .../support/RemoteInvocationBasedAccessor.java | 2 +- .../remoting/support/RemoteInvocationResult.java | 2 +- .../remoting/support/RemoteInvocationUtils.java | 2 +- .../remoting/support/RemotingSupport.java | 2 +- .../scheduling/SchedulingAwareRunnable.java | 2 +- .../scheduling/SchedulingException.java | 2 +- .../scheduling/SchedulingTaskExecutor.java | 2 +- .../scheduling/TaskScheduler.java | 2 +- .../org/springframework/scheduling/Trigger.java | 2 +- .../scheduling/TriggerContext.java | 2 +- .../scheduling/annotation/AsyncResult.java | 2 +- .../scheduling/annotation/EnableAsync.java | 2 +- .../ConcurrentTaskExecutor.java | 2 +- .../CustomizableThreadFactory.java | 2 +- .../ThreadPoolTaskExecutor.java | 2 +- .../concurrent/ConcurrentTaskExecutor.java | 2 +- .../concurrent/ConcurrentTaskScheduler.java | 2 +- .../concurrent/CustomizableThreadFactory.java | 2 +- .../concurrent/ExecutorConfigurationSupport.java | 2 +- .../concurrent/ScheduledExecutorFactoryBean.java | 2 +- .../concurrent/ScheduledExecutorTask.java | 2 +- .../ThreadPoolExecutorFactoryBean.java | 2 +- .../concurrent/ThreadPoolTaskExecutor.java | 2 +- .../concurrent/ThreadPoolTaskScheduler.java | 2 +- .../AnnotationDrivenBeanDefinitionParser.java | 2 +- .../config/SchedulerBeanDefinitionParser.java | 2 +- .../scheduling/config/TaskNamespaceHandler.java | 2 +- .../support/CronSequenceGenerator.java | 2 +- .../scheduling/support/CronTrigger.java | 2 +- .../scheduling/support/PeriodicTrigger.java | 2 +- .../scheduling/support/TaskUtils.java | 2 +- .../scheduling/timer/DelegatingTimerTask.java | 2 +- .../MethodInvokingTimerTaskFactoryBean.java | 2 +- .../scheduling/timer/ScheduledTimerTask.java | 2 +- .../scheduling/timer/TimerFactoryBean.java | 2 +- .../scheduling/timer/TimerTaskExecutor.java | 2 +- .../scripting/ScriptCompilationException.java | 2 +- .../springframework/scripting/ScriptFactory.java | 2 +- .../springframework/scripting/ScriptSource.java | 2 +- .../scripting/bsh/BshScriptFactory.java | 2 +- .../scripting/bsh/BshScriptUtils.java | 2 +- .../scripting/config/LangNamespaceHandler.java | 2 +- .../config/ScriptBeanDefinitionParser.java | 2 +- .../config/ScriptingDefaultsParser.java | 2 +- .../scripting/groovy/GroovyObjectCustomizer.java | 2 +- .../scripting/groovy/GroovyScriptFactory.java | 2 +- .../scripting/jruby/JRubyScriptUtils.java | 2 +- .../support/RefreshableScriptTargetSource.java | 2 +- .../scripting/support/ResourceScriptSource.java | 2 +- .../scripting/support/StaticScriptSource.java | 2 +- .../org/springframework/ui/ExtendedModelMap.java | 2 +- .../main/java/org/springframework/ui/Model.java | 2 +- .../java/org/springframework/ui/ModelMap.java | 2 +- .../ui/context/HierarchicalThemeSource.java | 2 +- .../org/springframework/ui/context/Theme.java | 2 +- .../springframework/ui/context/ThemeSource.java | 2 +- .../support/ResourceBundleThemeSource.java | 2 +- .../support/UiApplicationContextUtils.java | 2 +- .../validation/AbstractErrors.java | 2 +- .../AbstractPropertyBindingResult.java | 2 +- .../validation/BeanPropertyBindingResult.java | 2 +- .../validation/BindingErrorProcessor.java | 2 +- .../validation/BindingResultUtils.java | 2 +- .../validation/DefaultBindingErrorProcessor.java | 2 +- .../org/springframework/validation/Errors.java | 2 +- .../springframework/validation/FieldError.java | 2 +- .../validation/MessageCodesResolver.java | 2 +- .../springframework/validation/ObjectError.java | 2 +- .../validation/ValidationUtils.java | 2 +- .../springframework/validation/Validator.java | 2 +- .../validation/support/BindingAwareModelMap.java | 2 +- .../scannable/AutowiredQualifierFooService.java | 2 +- .../java/example/scannable/FooServiceImpl.java | 2 +- .../test/java/example/scannable/MessageBean.java | 2 +- .../example/scannable/ScopedProxyTestBean.java | 2 +- .../scannable/ServiceInvocationCounter.java | 2 +- .../test/java/example/scannable/StubFooDao.java | 2 +- .../aop/aspectj/AfterAdviceBindingTests.java | 2 +- .../AfterReturningAdviceBindingTests.java | 2 +- .../aspectj/AfterThrowingAdviceBindingTests.java | 2 +- .../aop/aspectj/AroundAdviceBindingTests.java | 2 +- .../aspectj/AspectAndAdvicePrecedenceTests.java | 2 +- .../AspectJExpressionPointcutAdvisorTests.java | 2 +- .../aspectj/BeanNamePointcutAtAspectTests.java | 2 +- .../aop/aspectj/BeanNamePointcutTests.java | 2 +- .../aop/aspectj/BeforeAdviceBindingTests.java | 2 +- .../DeclarationOrderIndependenceTests.java | 2 +- .../aspectj/DeclareParentsDelegateRefTests.java | 2 +- .../aop/aspectj/DeclareParentsTests.java | 2 +- ...ImplicitJPArgumentMatchingAtAspectJTests.java | 2 +- .../aspectj/ImplicitJPArgumentMatchingTests.java | 2 +- .../aop/aspectj/OverloadedAdviceTests.java | 2 +- .../aop/aspectj/ProceedTests.java | 2 +- .../aspectj/PropertyDependentAspectTests.java | 2 +- .../SharedPointcutWithArgsMismatchTests.java | 2 +- .../aspectj/SubtypeSensitiveMatchingTests.java | 2 +- .../aspectj/TargetPointcutSelectionTests.java | 2 +- ...rgetSelectionOnlyPointcutsAtAspectJTests.java | 2 +- ...ThisAndTargetSelectionOnlyPointcutsTests.java | 2 +- .../springframework/aop/aspectj/_TestTypes.java | 2 +- .../autoproxy/AnnotationBindingTests.java | 2 +- .../autoproxy/AnnotationPointcutTests.java | 2 +- .../AspectImplementingInterfaceTests.java | 2 +- ...ProxyCreatorAndLazyInitTargetSourceTests.java | 2 +- .../autoproxy/AspectJAutoProxyCreatorTests.java | 2 +- .../AtAspectJAnnotationBindingTests.java | 2 +- .../aop/aspectj/autoproxy/_TestTypes.java | 2 +- .../autoproxy/benchmark/BenchmarkTests.java | 2 +- .../aspectj/autoproxy/spr3064/SPR3064Tests.java | 2 +- .../AfterReturningGenericTypeMatchingTests.java | 2 +- .../GenericBridgeMethodMatchingTests.java | 2 +- .../generic/GenericParameterMatchingTests.java | 2 +- .../AopNamespaceHandlerAdviceTypeTests.java | 2 +- .../config/AopNamespaceHandlerArgNamesTests.java | 2 +- .../AopNamespaceHandlerReturningTests.java | 2 +- .../config/AopNamespaceHandlerThrowingTests.java | 2 +- .../config/MethodLocatingFactoryBeanTests.java | 2 +- .../aop/framework/JdkDynamicProxyTests.java | 2 +- .../aop/framework/ProxyFactoryBeanTests.java | 2 +- .../autoproxy/AdvisorAutoProxyCreatorTests.java | 2 +- .../BeanNameAutoProxyCreatorInitTests.java | 2 +- .../autoproxy/BeanNameAutoProxyCreatorTests.java | 2 +- .../aop/scope/ScopedProxyTests.java | 2 +- .../aop/target/CommonsPoolTargetSourceTests.java | 2 +- .../java/org/springframework/beans/Colour.java | 2 +- .../springframework/beans/DerivedTestBean.java | 2 +- .../springframework/beans/INestedTestBean.java | 2 +- .../java/org/springframework/beans/IOther.java | 2 +- .../springframework/beans/IndexedTestBean.java | 2 +- .../springframework/beans/NestedTestBean.java | 2 +- .../java/org/springframework/beans/Person.java | 2 +- .../beans/SerializablePerson.java | 2 +- .../java/org/springframework/beans/TestBean.java | 2 +- .../beans/factory/AbstractBeanFactoryTests.java | 2 +- .../beans/factory/DummyFactory.java | 2 +- .../springframework/beans/factory/HasMap.java | 2 +- .../beans/factory/LifecycleBean.java | 2 +- .../beans/factory/MustBeInitialized.java | 2 +- .../access/SingletonBeanFactoryLocatorTests.java | 2 +- .../beans/factory/access/TestBean.java | 2 +- .../annotation/BridgeMethodAutowiringTests.java | 2 +- .../beans/factory/config/SimpleMapScope.java | 2 +- .../parsing/CollectingReaderEventListener.java | 2 +- .../InjectAnnotationAutowireContextTests.java | 2 +- .../beans/factory/xml/DependenciesBean.java | 2 +- .../LookupMethodWrappedByCglibProxyTests.java | 2 +- .../factory/xml/QualifierAnnotationTests.java | 2 +- .../xml/support/CustomNamespaceHandlerTests.java | 2 +- .../config/AnnotatedClassCacheableService.java | 2 +- .../cache/config/CacheableService.java | 2 +- .../cache/config/DefaultCacheableService.java | 2 +- .../cache/config/EnableCachingTests.java | 2 +- .../org/springframework/context/ACATester.java | 2 +- .../context/AbstractApplicationContextTests.java | 2 +- .../context/BeanThatBroadcasts.java | 2 +- .../springframework/context/BeanThatListens.java | 2 +- .../context/LifecycleContextBean.java | 2 +- .../springframework/context/TestListener.java | 2 +- .../access/ContextBeanFactoryReferenceTests.java | 2 +- .../ContextJndiBeanFactoryLocatorTests.java | 2 +- .../ContextSingletonBeanFactoryLocatorTests.java | 2 +- .../access/DefaultLocatorFactoryTests.java | 2 +- .../AbstractCircularImportDetectionTests.java | 2 +- .../AnnotationConfigApplicationContextTests.java | 2 +- .../AnnotationProcessorPerformanceTests.java | 2 +- .../AnnotationScopeMetadataResolverTests.java | 2 +- .../AsmCircularImportDetectionTests.java | 2 +- ...assPathFactoryBeanDefinitionScannerTests.java | 2 +- .../annotation/ComponentScanParserTests.java | 2 +- ...ScanParserWithUserDefinedStrategiesTests.java | 2 +- .../ConfigurationClassAndBFPPTests.java | 2 +- ...urationWithFactoryBeanAndAutowiringTests.java | 2 +- ...urationWithFactoryBeanAndParametersTests.java | 2 +- .../annotation/DestroyMethodInferenceTests.java | 2 +- .../annotation/EnableLoadTimeWeavingTests.java | 2 +- .../annotation/FooServiceDependentConverter.java | 2 +- .../NestedConfigurationClassTests.java | 2 +- .../context/annotation/SimpleConfigTests.java | 2 +- .../context/annotation/SimpleScanTests.java | 2 +- .../Spr3775InitDestroyLifecycleTests.java | 2 +- .../context/annotation/Spr6602Tests.java | 2 +- .../annotation/TestBeanNameGenerator.java | 2 +- .../annotation/TestScopeMetadataResolver.java | 2 +- .../AutowiredConfigurationTests.java | 2 +- .../BeanAnnotationAttributePropagationTests.java | 2 +- ...ConfigurationClassAspectIntegrationTests.java | 2 +- ...ionClassCglibCallbackDeregistrationTests.java | 2 +- .../configuration/ImportResourceTests.java | 2 +- .../annotation/configuration/ImportTests.java | 2 +- ...portedConfigurationClassEnhancementTests.java | 2 +- .../annotation/configuration/ScopingTests.java | 2 +- .../annotation/configuration/Spr7167Tests.java | 2 +- .../context/annotation/spr8761/Spr8761Tests.java | 2 +- .../context/annotation3/StubFooDao.java | 2 +- .../context/annotation5/OtherFooDao.java | 2 +- .../context/conversionservice/Bar.java | 2 +- .../ConversionServiceContextConfigTests.java | 2 +- .../conversionservice/StringToBarConverter.java | 2 +- .../event/ApplicationContextEventTests.java | 2 +- .../event/EventPublicationInterceptorTests.java | 2 +- .../context/event/LifecycleEventTests.java | 2 +- .../ApplicationContextExpressionTests.java | 2 +- .../context/support/Assembler.java | 2 +- .../context/support/AutowiredService.java | 2 +- .../support/BeanFactoryPostProcessorTests.java | 2 +- .../ClassPathXmlApplicationContextTests.java | 2 +- .../ConversionServiceFactoryBeanTests.java | 2 +- .../support/DefaultLifecycleProcessorTests.java | 2 +- .../context/support/LifecycleTestBean.java | 2 +- .../springframework/context/support/Logic.java | 2 +- .../context/support/NoOpAdvice.java | 2 +- ...opertyResourceConfigurerIntegrationTests.java | 2 +- ...ropertySourcesPlaceholderConfigurerTests.java | 2 +- .../context/support/ResourceConverter.java | 2 +- .../springframework/context/support/Service.java | 2 +- .../context/support/SimpleThreadScopeTest.java | 2 +- .../context/support/Spr7283Tests.java | 2 +- .../context/support/Spr7816Tests.java | 2 +- ...StaticApplicationContextMulticasterTests.java | 2 +- .../support/StaticApplicationContextTests.java | 2 +- .../support/StaticMessageSourceTests.java | 2 +- .../springframework/context/support/TestIF.java | 2 +- .../springframework/core/task/NoOpRunnable.java | 2 +- .../access/LocalSlsbInvokerInterceptorTests.java | 2 +- ...calStatelessSessionProxyFactoryBeanTests.java | 2 +- .../SimpleRemoteSlsbInvokerInterceptorTests.java | 2 +- ...oteStatelessSessionProxyFactoryBeanTests.java | 2 +- .../format/number/CurrencyFormatterTests.java | 2 +- .../format/number/NumberFormattingTests.java | 2 +- ...mattingConversionServiceFactoryBeanTests.java | 2 +- .../ReflectiveLoadTimeWeaverTests.java | 2 +- ...ourceOverridingShadowingClassLoaderTests.java | 2 +- .../glassfish/GlassFishLoadTimeWeaverTests.java | 2 +- .../springframework/jmx/AbstractJmxTests.java | 2 +- .../jmx/AbstractMBeanServerTests.java | 2 +- .../org/springframework/jmx/IJmxTestBean.java | 2 +- .../org/springframework/jmx/JmxTestBean.java | 2 +- .../jmx/access/MBeanClientInterceptorTests.java | 2 +- .../RemoteMBeanClientInterceptorTestsIgnore.java | 2 +- .../jmx/export/CustomEditorConfigurerTests.java | 2 +- .../springframework/jmx/export/DateRange.java | 2 +- .../jmx/export/ExceptionOnInitBean.java | 2 +- .../jmx/export/MBeanExporterOperationsTests.java | 2 +- .../jmx/export/NotificationListenerTests.java | 2 +- .../jmx/export/NotificationPublisherTests.java | 2 +- .../PropertyPlaceholderConfigurerTests.java | 2 +- .../jmx/export/TestDynamicMBean.java | 2 +- .../AnnotationMetadataAssemblerTests.java | 2 +- .../export/annotation/AnnotationTestBean.java | 2 +- .../export/annotation/AnnotationTestSubBean.java | 2 +- .../annotation/JmxUtilsAnnotationTests.java | 2 +- .../assembler/AbstractJmxAssemblerTests.java | 2 +- ...AbstractMetadataAssemblerAutodetectTests.java | 2 +- .../AbstractMetadataAssemblerTests.java | 2 +- .../jmx/export/assembler/ICustomJmxBean.java | 2 +- ...erfaceBasedMBeanInfoAssemblerCustomTests.java | 2 +- ...erfaceBasedMBeanInfoAssemblerMappedTests.java | 2 +- .../InterfaceBasedMBeanInfoAssemblerTests.java | 2 +- ...hodExclusionMBeanInfoAssemblerComboTests.java | 2 +- ...odExclusionMBeanInfoAssemblerMappedTests.java | 2 +- ...xclusionMBeanInfoAssemblerNotMappedTests.java | 2 +- .../MethodExclusionMBeanInfoAssemblerTests.java | 2 +- ...odNameBasedMBeanInfoAssemblerMappedTests.java | 2 +- .../MethodNameBasedMBeanInfoAssemblerTests.java | 2 +- .../assembler/ReflectiveAssemblerTests.java | 2 +- .../export/naming/KeyNamingStrategyTests.java | 2 +- .../PropertiesFileNamingStrategyTests.java | 2 +- .../naming/PropertiesNamingStrategyTests.java | 2 +- .../ModelMBeanNotificationPublisherTests.java | 2 +- .../jmx/support/JmxUtilsTests.java | 2 +- .../MBeanServerConnectionFactoryBeanTests.java | 2 +- .../jndi/JndiObjectFactoryBeanTests.java | 2 +- .../jndi/JndiTemplateEditorTests.java | 2 +- .../springframework/jndi/JndiTemplateTests.java | 2 +- .../jndi/SimpleNamingContextTests.java | 2 +- .../mock/jndi/ExpectedLookupTemplate.java | 2 +- .../mock/jndi/SimpleNamingContext.java | 2 +- .../mock/jndi/SimpleNamingContextBuilder.java | 2 +- .../remoting/rmi/RmiSupportTests.java | 2 +- .../AsyncAnnotationBeanPostProcessorTests.java | 2 +- .../ScheduledExecutorFactoryBeanTests.java | 2 +- .../concurrent/ThreadPoolTaskSchedulerTests.java | 2 +- .../ExecutorBeanDefinitionParserTests.java | 2 +- .../scheduling/support/PeriodicTriggerTests.java | 2 +- .../scheduling/timer/TimerSupportTests.java | 2 +- .../scheduling/timer/TimerTaskExecutorTests.java | 2 +- .../springframework/scripting/ScriptBean.java | 2 +- .../scripting/bsh/BshScriptFactoryTests.java | 2 +- .../scripting/config/OtherTestBean.java | 2 +- .../scripting/config/ScriptingDefaultsTests.java | 2 +- .../scripting/groovy/ConcreteMessenger.java | 2 +- .../groovy/GroovyClassLoadingTests.java | 2 +- .../groovy/GroovyScriptFactoryTests.java | 2 +- .../scripting/groovy/TestException.java | 2 +- .../scripting/jruby/JRubyScriptFactoryTests.java | 2 +- .../scripting/jruby/WrapperAdder.java | 2 +- .../RefreshableScriptTargetSourceTests.java | 2 +- .../support/ResourceScriptSourceTests.java | 2 +- .../support/ScriptFactoryPostProcessorTests.java | 2 +- .../scripting/support/StubMessenger.java | 2 +- .../org/springframework/ui/ModelMapTests.java | 2 +- .../util/SerializationTestUtils.java | 2 +- .../validation/DataBinderFieldAccessTests.java | 2 +- .../validation/DataBinderTests.java | 2 +- .../validation/ValidationUtilsTests.java | 2 +- .../beanvalidation/MethodValidationTests.java | 2 +- .../advice/CountingAfterReturningAdvice.java | 2 +- .../java/test/advice/CountingBeforeAdvice.java | 2 +- .../src/test/java/test/advice/MethodCounter.java | 2 +- .../advice/TimestampIntroductionAdvisor.java | 2 +- .../src/test/java/test/beans/CustomScope.java | 2 +- .../src/test/java/test/beans/Employee.java | 2 +- .../src/test/java/test/beans/FactoryMethods.java | 2 +- .../src/test/java/test/beans/ITestBean.java | 2 +- .../src/test/java/test/beans/NestedTestBean.java | 2 +- .../src/test/java/test/beans/SideEffectBean.java | 2 +- .../src/test/java/test/beans/TestBean.java | 2 +- .../java/test/interceptor/NopInterceptor.java | 2 +- .../interceptor/SerializableNopInterceptor.java | 2 +- .../TimestampIntroductionInterceptor.java | 2 +- .../test/java/test/mixin/DefaultLockable.java | 2 +- .../src/test/java/test/mixin/LockMixin.java | 2 +- .../test/java/test/mixin/LockMixinAdvisor.java | 2 +- .../src/test/java/test/mixin/Lockable.java | 2 +- .../test/java/test/mixin/LockedException.java | 2 +- .../src/test/java/test/util/TimeStamped.java | 2 +- .../springframework/core/AttributeAccessor.java | 2 +- .../core/AttributeAccessorSupport.java | 2 +- .../core/BridgeMethodResolver.java | 2 +- .../core/ConfigurableObjectInputStream.java | 2 +- .../springframework/core/ConstantException.java | 2 +- .../org/springframework/core/ControlFlow.java | 2 +- .../org/springframework/core/Conventions.java | 2 +- .../org/springframework/core/ErrorCoded.java | 2 +- .../core/GenericCollectionTypeResolver.java | 2 +- .../core/InfrastructureProxy.java | 2 +- .../org/springframework/core/JdkVersion.java | 2 +- .../core/NestedCheckedException.java | 2 +- .../springframework/core/NestedIOException.java | 2 +- .../core/NestedRuntimeException.java | 2 +- .../java/org/springframework/core/Ordered.java | 2 +- .../core/OverridingClassLoader.java | 2 +- .../core/PrioritizedParameterNameDiscoverer.java | 2 +- .../springframework/core/SmartClassLoader.java | 2 +- .../org/springframework/core/SpringVersion.java | 2 +- .../springframework/core/annotation/Order.java | 2 +- .../support/ConversionServiceFactory.java | 2 +- .../convert/support/IdToEntityConverter.java | 2 +- .../convert/support/ObjectToObjectConverter.java | 2 +- .../AbstractCachingLabeledEnumResolver.java | 2 +- .../core/enums/AbstractGenericLabeledEnum.java | 2 +- .../core/enums/AbstractLabeledEnum.java | 2 +- .../springframework/core/enums/LabeledEnum.java | 2 +- .../core/enums/LabeledEnumResolver.java | 2 +- .../core/enums/LetterCodedLabeledEnum.java | 2 +- .../core/enums/ShortCodedLabeledEnum.java | 2 +- .../core/enums/StaticLabeledEnum.java | 2 +- .../core/enums/StaticLabeledEnumResolver.java | 2 +- .../core/enums/StringCodedLabeledEnum.java | 2 +- .../core/env/EnvironmentCapable.java | 2 +- .../core/io/ByteArrayResource.java | 2 +- .../core/io/ClassRelativeResourceLoader.java | 2 +- .../core/io/DefaultResourceLoader.java | 2 +- .../core/io/DescriptiveResource.java | 2 +- .../core/io/InputStreamResource.java | 2 +- .../springframework/core/io/ResourceEditor.java | 2 +- .../springframework/core/io/ResourceLoader.java | 2 +- .../core/io/WritableResource.java | 2 +- .../core/io/support/EncodedResource.java | 2 +- .../core/io/support/LocalizedResourceHelper.java | 2 +- .../io/support/ResourceArrayPropertyEditor.java | 2 +- .../core/io/support/ResourcePatternUtils.java | 2 +- .../core/serializer/DefaultDeserializer.java | 2 +- .../core/serializer/DefaultSerializer.java | 2 +- .../core/serializer/Deserializer.java | 2 +- .../core/serializer/Serializer.java | 2 +- .../support/SerializationFailedException.java | 2 +- .../core/style/DefaultToStringStyler.java | 2 +- .../core/style/DefaultValueStyler.java | 2 +- .../springframework/core/style/StylerUtils.java | 2 +- .../core/style/ToStringCreator.java | 2 +- .../core/style/ToStringStyler.java | 2 +- .../core/task/AsyncTaskExecutor.java | 2 +- .../core/task/SimpleAsyncTaskExecutor.java | 2 +- .../core/task/SyncTaskExecutor.java | 2 +- .../springframework/core/task/TaskExecutor.java | 2 +- .../core/task/TaskRejectedException.java | 2 +- .../core/task/TaskTimeoutException.java | 2 +- .../task/support/ExecutorServiceAdapter.java | 2 +- .../core/task/support/TaskExecutorAdapter.java | 2 +- .../core/type/AnnotationMetadata.java | 2 +- .../springframework/core/type/ClassMetadata.java | 2 +- .../core/type/MethodMetadata.java | 2 +- .../core/type/StandardClassMetadata.java | 2 +- .../type/classreading/MetadataReaderFactory.java | 2 +- .../AbstractTypeHierarchyTraversingFilter.java | 2 +- .../core/type/filter/AnnotationTypeFilter.java | 2 +- .../core/type/filter/AssignableTypeFilter.java | 2 +- .../springframework/util/AutoPopulatingList.java | 2 +- .../util/CachingMapDecorator.java | 2 +- .../springframework/util/CollectionUtils.java | 2 +- .../springframework/util/CommonsLogWriter.java | 2 +- .../util/ConcurrencyThrottleSupport.java | 2 +- .../util/CustomizableThreadCreator.java | 2 +- .../util/DefaultPropertiesPersister.java | 2 +- .../org/springframework/util/DigestUtils.java | 2 +- .../org/springframework/util/FileCopyUtils.java | 2 +- .../springframework/util/FileSystemUtils.java | 2 +- .../springframework/util/Log4jConfigurer.java | 2 +- .../org/springframework/util/MethodInvoker.java | 2 +- .../org/springframework/util/MultiValueMap.java | 2 +- .../org/springframework/util/NumberUtils.java | 2 +- .../org/springframework/util/ObjectUtils.java | 2 +- .../org/springframework/util/PathMatcher.java | 2 +- .../util/PropertiesPersister.java | 2 +- .../java/org/springframework/util/StopWatch.java | 2 +- .../util/SystemPropertyUtils.java | 2 +- .../java/org/springframework/util/TypeUtils.java | 2 +- .../util/comparator/BooleanComparator.java | 2 +- .../util/xml/AbstractStaxContentHandler.java | 2 +- .../util/xml/AbstractStaxXMLReader.java | 2 +- .../util/xml/AbstractXMLReader.java | 2 +- .../util/xml/AbstractXMLStreamReader.java | 2 +- .../util/xml/DomContentHandler.java | 2 +- .../org/springframework/util/xml/DomUtils.java | 2 +- .../util/xml/SimpleNamespaceContext.java | 2 +- .../util/xml/SimpleSaxErrorHandler.java | 2 +- .../util/xml/SimpleTransformErrorListener.java | 2 +- .../util/xml/StaxEventXMLReader.java | 2 +- .../org/springframework/util/xml/StaxResult.java | 2 +- .../org/springframework/util/xml/StaxSource.java | 2 +- .../util/xml/StaxStreamContentHandler.java | 2 +- .../util/xml/StaxStreamXMLReader.java | 2 +- .../util/xml/TransformerUtils.java | 2 +- .../java/org/springframework/beans/Colour.java | 2 +- .../springframework/beans/DerivedTestBean.java | 2 +- .../springframework/beans/INestedTestBean.java | 2 +- .../java/org/springframework/beans/IOther.java | 2 +- .../springframework/beans/NestedTestBean.java | 2 +- .../java/org/springframework/beans/TestBean.java | 2 +- .../core/AbstractControlFlowTests.java | 2 +- .../core/AttributeAccessorSupportTests.java | 2 +- .../core/BridgeMethodResolverTests.java | 2 +- .../springframework/core/ConventionsTests.java | 2 +- .../core/DefaultControlFlowTests.java | 2 +- .../core/ExceptionDepthComparatorTests.java | 2 +- .../core/GenericCollectionTypeResolverTests.java | 2 +- .../core/Jdk14ControlFlowTests.java | 2 +- ...ariableTableParameterNameDiscovererTests.java | 2 +- .../core/NestedExceptionTests.java | 2 +- .../core/OrderComparatorTests.java | 2 +- .../PrioritizedParameterNameDiscovererTests.java | 2 +- .../CollectionToCollectionConverterTests.java | 2 +- .../convert/support/DefaultConversionTests.java | 2 +- .../core/enums/LabeledEnumTests.java | 2 +- .../core/env/PropertySourceTests.java | 2 +- ...PathMatchingResourcePatternResolverTests.java | 2 +- .../ResourceArrayPropertyEditorTests.java | 2 +- .../core/style/ToStringCreatorTests.java | 2 +- .../core/task/SimpleAsyncTaskExecutorTests.java | 2 +- .../core/type/AssignableTypeFilterTests.java | 2 +- .../core/type/CachingMetadataReaderLeakTest.java | 2 +- .../org/springframework/util/AssertTests.java | 2 +- .../util/AutoPopulatingListTests.java | 2 +- .../util/CachingMapDecoratorTests.java | 2 +- .../springframework/util/ClassUtilsTests.java | 2 +- .../util/CollectionUtilsTests.java | 2 +- .../util/FileSystemUtilsTests.java | 2 +- .../util/Log4jConfigurerTests.java | 2 +- .../springframework/util/MethodInvokerTests.java | 2 +- .../springframework/util/MockLog4jAppender.java | 2 +- .../util/ReflectionUtilsTests.java | 2 +- .../springframework/util/ResourceUtilsTests.java | 2 +- .../util/SerializationUtilsTests.java | 2 +- .../org/springframework/util/StopWatchTests.java | 2 +- .../util/xml/AbstractStaxXMLReaderTestCase.java | 2 +- .../util/xml/StaxEventXMLReaderTests.java | 2 +- .../util/xml/StaxStreamXMLReaderTests.java | 2 +- .../expression/AccessException.java | 2 +- .../springframework/expression/BeanResolver.java | 2 +- .../expression/ConstructorExecutor.java | 2 +- .../expression/ConstructorResolver.java | 2 +- .../expression/EvaluationException.java | 2 +- .../springframework/expression/Expression.java | 2 +- .../expression/ExpressionException.java | 2 +- .../ExpressionInvocationTargetException.java | 2 +- .../springframework/expression/MethodFilter.java | 2 +- .../expression/MethodResolver.java | 2 +- .../springframework/expression/Operation.java | 2 +- .../expression/OperatorOverloader.java | 2 +- .../expression/ParseException.java | 2 +- .../expression/ParserContext.java | 2 +- .../expression/PropertyAccessor.java | 2 +- .../expression/TypeComparator.java | 2 +- .../springframework/expression/TypedValue.java | 2 +- .../common/CompositeStringExpression.java | 2 +- .../expression/common/LiteralExpression.java | 2 +- .../expression/common/TemplateParserContext.java | 2 +- .../expression/spel/InternalParseException.java | 2 +- .../expression/spel/SpelEvaluationException.java | 2 +- .../expression/spel/SpelParseException.java | 2 +- .../expression/spel/ast/AstUtils.java | 2 +- .../expression/spel/ast/BeanReference.java | 2 +- .../spel/ast/ConstructorReference.java | 2 +- .../expression/spel/ast/FormatHelper.java | 2 +- .../expression/spel/ast/FunctionReference.java | 2 +- .../expression/spel/ast/InlineList.java | 2 +- .../expression/spel/ast/IntLiteral.java | 2 +- .../expression/spel/ast/LongLiteral.java | 2 +- .../expression/spel/ast/Operator.java | 2 +- .../expression/spel/ast/OperatorBetween.java | 2 +- .../expression/spel/ast/OperatorInstanceof.java | 2 +- .../expression/spel/ast/RealLiteral.java | 2 +- .../expression/spel/ast/TypeCode.java | 2 +- .../spel/standard/SpelExpressionParser.java | 2 +- .../expression/spel/standard/Token.java | 2 +- .../spel/support/BooleanTypedValue.java | 2 +- .../spel/support/ReflectionHelper.java | 2 +- .../support/ReflectiveConstructorResolver.java | 2 +- .../spel/support/StandardTypeComparator.java | 2 +- .../spel/support/StandardTypeConverter.java | 2 +- .../spel/support/StandardTypeLocator.java | 2 +- .../expression/spel/ArrayConstructorTests.java | 2 +- .../spel/ConstructorInvocationTests.java | 2 +- .../spel/DefaultComparatorUnitTests.java | 2 +- .../spel/ExpressionLanguageScenarioTests.java | 2 +- .../expression/spel/ExpressionStateTests.java | 2 +- ...xpressionTestsUsingCoreConversionService.java | 2 +- .../expression/spel/ListTests.java | 2 +- .../expression/spel/LiteralExpressionTests.java | 2 +- .../expression/spel/MapAccessTests.java | 2 +- .../expression/spel/OperatorOverloaderTests.java | 2 +- .../expression/spel/ParsingTests.java | 2 +- .../expression/spel/PerformanceTests.java | 2 +- .../spel/ScenariosForSpringSecurity.java | 2 +- .../expression/spel/SetValueTests.java | 2 +- .../expression/spel/SpelDocumentationTests.java | 2 +- .../expression/spel/SpelUtilities.java | 2 +- .../spel/StandardTypeLocatorTests.java | 2 +- .../spel/TemplateExpressionParsingTests.java | 2 +- .../spel/VariableAndFunctionTests.java | 2 +- .../expression/spel/ast/FormatHelperTests.java | 2 +- .../spel/support/ReflectionHelperTests.java | 2 +- .../spel/support/StandardComponentsTests.java | 2 +- .../spel/testresources/ArrayContainer.java | 2 +- .../tomcat/TomcatInstrumentableClassLoader.java | 2 +- .../instrument/InstrumentationSavingAgent.java | 2 +- .../jdbc/BadSqlGrammarException.java | 2 +- .../jdbc/CannotGetJdbcConnectionException.java | 2 +- .../IncorrectResultSetColumnCountException.java | 2 +- .../jdbc/InvalidResultSetAccessException.java | 2 +- ...teAffectedIncorrectNumberOfRowsException.java | 2 +- .../jdbc/LobRetrievalFailureException.java | 2 +- .../jdbc/SQLWarningException.java | 2 +- .../jdbc/UncategorizedSQLException.java | 2 +- .../jdbc/config/SortedResourcesFactoryBean.java | 2 +- .../jdbc/core/BatchPreparedStatementSetter.java | 2 +- .../jdbc/core/BeanPropertyRowMapper.java | 2 +- .../jdbc/core/CallableStatementCallback.java | 2 +- .../jdbc/core/CallableStatementCreator.java | 2 +- .../core/CallableStatementCreatorFactory.java | 2 +- .../jdbc/core/ConnectionCallback.java | 2 +- ...nterruptibleBatchPreparedStatementSetter.java | 2 +- .../jdbc/core/JdbcOperations.java | 2 +- .../jdbc/core/ParameterMapper.java | 2 +- .../jdbc/core/PreparedStatementCallback.java | 2 +- .../jdbc/core/PreparedStatementCreator.java | 2 +- .../core/PreparedStatementCreatorFactory.java | 2 +- .../jdbc/core/PreparedStatementSetter.java | 2 +- .../jdbc/core/ResultSetExtractor.java | 2 +- .../core/ResultSetSupportingSqlParameter.java | 2 +- .../jdbc/core/RowCallbackHandler.java | 2 +- .../jdbc/core/RowCountCallbackHandler.java | 2 +- .../org/springframework/jdbc/core/RowMapper.java | 2 +- .../jdbc/core/RowMapperResultSetExtractor.java | 2 +- .../jdbc/core/SingleColumnRowMapper.java | 2 +- .../jdbc/core/SqlInOutParameter.java | 2 +- .../springframework/jdbc/core/SqlParameter.java | 2 +- .../jdbc/core/SqlParameterValue.java | 2 +- .../springframework/jdbc/core/SqlProvider.java | 2 +- .../jdbc/core/SqlReturnResultSet.java | 2 +- .../springframework/jdbc/core/SqlReturnType.java | 2 +- .../springframework/jdbc/core/SqlTypeValue.java | 2 +- .../jdbc/core/StatementCallback.java | 2 +- .../jdbc/core/StatementCreatorUtils.java | 2 +- .../metadata/CallMetaDataProviderFactory.java | 2 +- .../metadata/GenericCallMetaDataProvider.java | 2 +- .../core/metadata/HsqlTableMetaDataProvider.java | 2 +- .../metadata/OracleCallMetaDataProvider.java | 2 +- .../metadata/OracleTableMetaDataProvider.java | 2 +- .../core/metadata/TableMetaDataProvider.java | 2 +- .../namedparam/AbstractSqlParameterSource.java | 2 +- .../core/namedparam/MapSqlParameterSource.java | 2 +- .../namedparam/NamedParameterJdbcDaoSupport.java | 2 +- .../namedparam/NamedParameterJdbcOperations.java | 2 +- .../namedparam/NamedParameterJdbcTemplate.java | 2 +- .../jdbc/core/namedparam/SqlParameterSource.java | 2 +- .../core/namedparam/SqlParameterSourceUtils.java | 2 +- .../jdbc/core/simple/AbstractJdbcCall.java | 2 +- .../jdbc/core/simple/AbstractJdbcInsert.java | 2 +- .../ParameterizedBeanPropertyRowMapper.java | 2 +- .../ParameterizedSingleColumnRowMapper.java | 2 +- .../jdbc/core/simple/SimpleJdbcCall.java | 2 +- .../core/simple/SimpleJdbcCallOperations.java | 2 +- .../jdbc/core/simple/SimpleJdbcDaoSupport.java | 2 +- .../jdbc/core/simple/SimpleJdbcInsert.java | 2 +- .../core/simple/SimpleJdbcInsertOperations.java | 2 +- .../jdbc/core/simple/SimpleJdbcOperations.java | 2 +- .../jdbc/core/simple/SimpleJdbcTemplate.java | 2 +- ...nterruptibleBatchPreparedStatementSetter.java | 2 +- ...ractLobCreatingPreparedStatementCallback.java | 2 +- .../AbstractLobStreamingResultSetExtractor.java | 2 +- .../jdbc/core/support/AbstractSqlTypeValue.java | 2 +- .../core/support/JdbcBeanDefinitionReader.java | 2 +- .../jdbc/core/support/JdbcDaoSupport.java | 2 +- .../jdbc/core/support/SqlLobValue.java | 2 +- .../AbstractDriverBasedDataSource.java | 2 +- .../jdbc/datasource/ConnectionHolder.java | 2 +- .../jdbc/datasource/ConnectionProxy.java | 2 +- .../datasource/DataSourceTransactionManager.java | 2 +- .../jdbc/datasource/DriverManagerDataSource.java | 2 +- .../IsolationLevelDataSourceAdapter.java | 2 +- .../jdbc/datasource/SimpleDriverDataSource.java | 2 +- .../datasource/SingleConnectionDataSource.java | 2 +- .../jdbc/datasource/SmartDataSource.java | 2 +- .../TransactionAwareDataSourceProxy.java | 2 +- .../UserCredentialsDataSourceAdapter.java | 2 +- .../datasource/WebSphereDataSourceAdapter.java | 2 +- .../DerbyEmbeddedDatabaseConfigurer.java | 2 +- .../embedded/EmbeddedDatabaseConfigurer.java | 2 +- .../embedded/EmbeddedDatabaseFactory.java | 2 +- .../embedded/EmbeddedDatabaseType.java | 2 +- .../embedded/SimpleDriverDataSourceFactory.java | 2 +- .../jdbc/datasource/init/DatabasePopulator.java | 2 +- .../lookup/BeanFactoryDataSourceLookup.java | 2 +- .../jdbc/datasource/lookup/DataSourceLookup.java | 2 +- .../lookup/DataSourceLookupFailureException.java | 2 +- .../datasource/lookup/JndiDataSourceLookup.java | 2 +- .../datasource/lookup/MapDataSourceLookup.java | 2 +- .../jdbc/object/BatchSqlUpdate.java | 2 +- .../jdbc/object/GenericSqlQuery.java | 2 +- .../jdbc/object/GenericStoredProcedure.java | 2 +- .../object/MappingSqlQueryWithParameters.java | 2 +- .../jdbc/object/RdbmsOperation.java | 2 +- .../org/springframework/jdbc/object/SqlCall.java | 2 +- .../springframework/jdbc/object/SqlFunction.java | 2 +- .../jdbc/object/SqlOperation.java | 2 +- .../springframework/jdbc/object/SqlQuery.java | 2 +- .../springframework/jdbc/object/SqlUpdate.java | 2 +- .../jdbc/object/StoredProcedure.java | 2 +- .../jdbc/object/UpdatableSqlQuery.java | 2 +- .../AbstractFallbackSQLExceptionTranslator.java | 2 +- .../jdbc/support/DatabaseMetaDataCallback.java | 2 +- .../jdbc/support/JdbcAccessor.java | 2 +- .../springframework/jdbc/support/JdbcUtils.java | 2 +- .../springframework/jdbc/support/KeyHolder.java | 2 +- .../jdbc/support/MetaDataAccessException.java | 2 +- .../SQLErrorCodeSQLExceptionTranslator.java | 2 +- .../support/SQLExceptionSubclassTranslator.java | 2 +- .../jdbc/support/SQLExceptionTranslator.java | 2 +- .../springframework/jdbc/support/SqlValue.java | 2 +- .../AbstractDataFieldMaxValueIncrementer.java | 2 +- .../AbstractSequenceMaxValueIncrementer.java | 2 +- .../incrementer/DerbyMaxValueIncrementer.java | 2 +- .../SybaseAnywhereMaxValueIncrementer.java | 2 +- .../incrementer/SybaseMaxValueIncrementer.java | 2 +- .../jdbc/support/lob/DefaultLobHandler.java | 2 +- .../lob/JtaLobCreatorSynchronization.java | 2 +- .../jdbc/support/lob/LobCreatorUtils.java | 2 +- .../jdbc/support/lob/LobHandler.java | 2 +- .../lob/SpringLobCreatorSynchronization.java | 2 +- .../nativejdbc/C3P0NativeJdbcExtractor.java | 2 +- .../CommonsDbcpNativeJdbcExtractor.java | 2 +- .../nativejdbc/Jdbc4NativeJdbcExtractor.java | 2 +- .../support/nativejdbc/NativeJdbcExtractor.java | 2 +- .../nativejdbc/NativeJdbcExtractorAdapter.java | 2 +- .../OracleJdbc4NativeJdbcExtractor.java | 2 +- .../nativejdbc/SimpleNativeJdbcExtractor.java | 2 +- .../nativejdbc/WebLogicNativeJdbcExtractor.java | 2 +- .../rowset/ResultSetWrappingSqlRowSet.java | 2 +- .../ResultSetWrappingSqlRowSetMetaData.java | 2 +- .../jdbc/support/rowset/SqlRowSet.java | 2 +- .../jdbc/support/rowset/SqlRowSetMetaData.java | 2 +- .../jdbc/support/xml/Jdbc4SqlXmlHandler.java | 2 +- .../SqlXmlFeatureNotImplementedException.java | 2 +- .../jdbc/support/xml/SqlXmlHandler.java | 2 +- .../support/xml/SqlXmlObjectMappingHandler.java | 2 +- .../support/xml/XmlBinaryStreamProvider.java | 2 +- .../support/xml/XmlCharacterStreamProvider.java | 2 +- .../jdbc/support/xml/XmlResultProvider.java | 2 +- .../java/org/springframework/beans/Colour.java | 2 +- .../springframework/beans/INestedTestBean.java | 2 +- .../java/org/springframework/beans/IOther.java | 2 +- .../springframework/beans/NestedTestBean.java | 2 +- .../java/org/springframework/beans/TestBean.java | 2 +- .../build/test/hamcrest/Matchers.java | 2 +- .../InitializeDatabaseIntegrationTests.java | 2 +- .../jdbc/core/AbstractRowMapperTests.java | 2 +- .../jdbc/core/BeanPropertyRowMapperTests.java | 2 +- .../jdbc/core/JdbcTemplateTests.java | 2 +- .../jdbc/core/RowMapperTests.java | 2 +- .../jdbc/core/SimpleRowCountCallbackHandler.java | 2 +- .../jdbc/core/StatementCreatorUtilsTests.java | 2 +- .../NamedParameterJdbcTemplateTests.java | 2 +- .../namedparam/NamedParameterQueryTests.java | 2 +- .../ParameterizedBeanPropertyRowMapperTests.java | 2 +- .../jdbc/core/simple/SimpleJdbcCallTests.java | 2 +- .../jdbc/core/simple/SimpleJdbcInsertTests.java | 2 +- .../core/simple/SimpleJdbcTemplateTests.java | 2 +- .../support/JdbcBeanDefinitionReaderTests.java | 2 +- .../jdbc/core/support/JdbcDaoSupportTests.java | 2 +- .../jdbc/core/support/LobSupportTests.java | 2 +- .../jdbc/core/support/SqlLobValueTests.java | 2 +- .../DataSourceJtaTransactionTests.java | 2 +- .../DataSourceTransactionManagerTests.java | 2 +- .../datasource/DriverManagerDataSourceTests.java | 2 +- .../UserCredentialsDataSourceAdapterTests.java | 2 +- .../lookup/BeanFactoryDataSourceLookupTests.java | 2 +- .../lookup/JndiDataSourceLookupTests.java | 2 +- .../jdbc/datasource/lookup/StubDataSource.java | 2 +- .../jdbc/object/BatchSqlUpdateTests.java | 2 +- .../jdbc/object/GenericSqlQueryTests.java | 2 +- .../jdbc/object/GenericStoredProcedureTests.java | 2 +- .../jdbc/object/RdbmsOperationTests.java | 2 +- .../jdbc/object/SqlQueryTests.java | 2 +- .../jdbc/object/SqlUpdateTests.java | 2 +- .../jdbc/object/StoredProcedureTests.java | 2 +- .../jdbc/support/CustomErrorCodeException.java | 2 +- .../support/CustomSqlExceptionTranslator.java | 2 +- .../DataFieldMaxValueIncrementerTests.java | 2 +- .../jdbc/support/DefaultLobHandlerTests.java | 2 +- .../jdbc/support/KeyHolderTests.java | 2 +- .../jdbc/support/NativeJdbcExtractorTests.java | 2 +- .../SQLErrorCodeSQLExceptionTranslatorTests.java | 2 +- .../SQLStateExceptionTranslatorTests.java | 2 +- .../rowset/ResultSetWrappingRowSetTests.java | 2 +- .../jms/IllegalStateException.java | 2 +- .../jms/InvalidClientIDException.java | 2 +- .../jms/InvalidDestinationException.java | 2 +- .../jms/InvalidSelectorException.java | 2 +- .../org/springframework/jms/JmsException.java | 2 +- .../jms/JmsSecurityException.java | 2 +- .../springframework/jms/MessageEOFException.java | 2 +- .../jms/MessageFormatException.java | 2 +- .../jms/MessageNotReadableException.java | 2 +- .../jms/MessageNotWriteableException.java | 2 +- .../jms/ResourceAllocationException.java | 2 +- .../jms/TransactionInProgressException.java | 2 +- .../jms/TransactionRolledBackException.java | 2 +- .../jms/UncategorizedJmsException.java | 2 +- .../config/AbstractListenerContainerParser.java | 2 +- .../jms/config/JmsNamespaceHandler.java | 2 +- .../jms/connection/ConnectionFactoryUtils.java | 2 +- .../connection/DelegatingConnectionFactory.java | 2 +- .../jms/connection/JmsResourceHolder.java | 2 +- .../jms/connection/JmsTransactionManager.java | 2 +- .../jms/connection/JmsTransactionManager102.java | 2 +- .../jms/connection/SessionProxy.java | 2 +- .../jms/connection/SingleConnectionFactory.java | 2 +- .../connection/SingleConnectionFactory102.java | 2 +- .../jms/connection/SmartConnectionFactory.java | 2 +- .../SynchedLocalTransactionFailedException.java | 2 +- .../TransactionAwareConnectionFactoryProxy.java | 2 +- .../UserCredentialsConnectionFactoryAdapter.java | 2 +- .../jms/core/BrowserCallback.java | 2 +- .../springframework/jms/core/JmsOperations.java | 2 +- .../springframework/jms/core/JmsTemplate102.java | 2 +- .../springframework/jms/core/MessageCreator.java | 2 +- .../jms/core/ProducerCallback.java | 2 +- .../jms/core/SessionCallback.java | 2 +- .../jms/core/support/JmsGatewaySupport.java | 2 +- .../DefaultMessageListenerContainer102.java | 2 +- .../listener/SessionAwareMessageListener.java | 2 +- .../SimpleMessageListenerContainer102.java | 2 +- .../ListenerExecutionFailedException.java | 2 +- .../listener/adapter/MessageListenerAdapter.java | 2 +- .../DefaultJmsActivationSpecFactory.java | 2 +- .../endpoint/JmsMessageEndpointFactory.java | 2 +- .../StandardJmsActivationSpecFactory.java | 2 +- .../remoting/JmsInvokerClientInterceptor.java | 2 +- .../jms/remoting/JmsInvokerProxyFactoryBean.java | 2 +- .../jms/remoting/JmsInvokerServiceExporter.java | 2 +- .../springframework/jms/support/JmsAccessor.java | 2 +- .../springframework/jms/support/JmsUtils.java | 2 +- .../converter/MarshallingMessageConverter.java | 2 +- .../converter/MessageConversionException.java | 2 +- .../converter/SimpleMessageConverter.java | 2 +- .../converter/SimpleMessageConverter102.java | 2 +- .../BeanFactoryDestinationResolver.java | 2 +- .../DestinationResolutionException.java | 2 +- .../support/destination/DestinationResolver.java | 2 +- .../destination/DynamicDestinationResolver.java | 2 +- .../destination/JmsDestinationAccessor.java | 2 +- .../java/org/springframework/beans/Colour.java | 2 +- .../springframework/beans/INestedTestBean.java | 2 +- .../java/org/springframework/beans/IOther.java | 2 +- .../springframework/beans/NestedTestBean.java | 2 +- .../java/org/springframework/beans/TestBean.java | 2 +- .../core/task/StubTaskExecutor.java | 2 +- .../springframework/jca/StubActivationSpec.java | 2 +- .../springframework/jca/StubResourceAdapter.java | 2 +- .../jms/StubConnectionFactory.java | 2 +- .../java/org/springframework/jms/StubQueue.java | 2 +- .../java/org/springframework/jms/StubTopic.java | 2 +- .../jms/config/JmsNamespaceHandlerTests.java | 2 +- .../connection/JmsTransactionManagerTests.java | 2 +- .../jms/connection/TestConnection.java | 2 +- .../jms/connection/TestExceptionListener.java | 2 +- .../jms/core/JmsTemplate102JtaTests.java | 2 +- .../jms/core/JmsTemplate102Tests.java | 2 +- .../jms/core/JmsTemplate102TransactedTests.java | 2 +- .../jms/core/JmsTemplateJtaTests.java | 2 +- .../jms/core/JmsTemplateTests.java | 2 +- .../jms/core/JmsTemplateTransactedTests.java | 2 +- .../jms/core/support/JmsGatewaySupportTests.java | 2 +- .../AbstractMessageListenerContainerTests.java | 2 +- .../SimpleMessageListenerContainerTests.java | 2 +- .../adapter/MessageListenerAdapter102Tests.java | 2 +- .../adapter/MessageListenerAdapterTests.java | 2 +- ...veJmsTextMessageReturningMessageDelegate.java | 2 +- .../adapter/StubMessageListenerAdapter.java | 2 +- .../adapter/StubMessageListenerAdapter102.java | 2 +- .../DefaultJmsActivationSpecFactoryTests.java | 2 +- .../endpoint/StubJmsActivationSpecFactory.java | 2 +- .../jms/remoting/JmsInvokerTests.java | 2 +- .../support/SimpleMessageConverter102Tests.java | 2 +- .../jms/support/SimpleMessageConverterTests.java | 2 +- .../MappingJacksonMessageConverterTests.java | 2 +- .../JndiDestinationResolverTests.java | 2 +- .../CallCountingTransactionManager.java | 2 +- .../mock/web/DelegatingServletInputStream.java | 2 +- .../mock/web/DelegatingServletOutputStream.java | 2 +- .../mock/web/HeaderValueHolder.java | 2 +- .../mock/web/MockFilterConfig.java | 2 +- .../mock/web/MockServletConfig.java | 2 +- .../mock/web/PassThroughFilterChain.java | 2 +- .../ObjectOptimisticLockingFailureException.java | 2 +- .../orm/ObjectRetrievalFailureException.java | 2 +- .../hibernate3/AbstractSessionFactoryBean.java | 2 +- .../orm/hibernate3/HibernateCallback.java | 2 +- .../orm/hibernate3/HibernateInterceptor.java | 2 +- .../orm/hibernate3/HibernateJdbcException.java | 2 +- ...HibernateObjectRetrievalFailureException.java | 2 +- .../orm/hibernate3/HibernateOperations.java | 2 +- ...bernateOptimisticLockingFailureException.java | 2 +- .../orm/hibernate3/HibernateQueryException.java | 2 +- .../orm/hibernate3/HibernateSystemException.java | 2 +- .../orm/hibernate3/HibernateTemplate.java | 2 +- .../hibernate3/HibernateTransactionManager.java | 2 +- .../orm/hibernate3/LocalCacheProviderProxy.java | 2 +- .../LocalJtaDataSourceConnectionProvider.java | 2 +- .../orm/hibernate3/LocalRegionFactoryProxy.java | 2 +- .../LocalTransactionManagerLookup.java | 2 +- .../orm/hibernate3/SpringSessionContext.java | 2 +- ...sactionAwareDataSourceConnectionProvider.java | 2 +- .../annotation/AnnotationSessionFactoryBean.java | 2 +- .../orm/hibernate3/support/AbstractLobType.java | 2 +- .../hibernate3/support/BlobByteArrayType.java | 2 +- .../hibernate3/support/BlobSerializableType.java | 2 +- .../orm/hibernate3/support/BlobStringType.java | 2 +- .../orm/hibernate3/support/ClobStringType.java | 2 +- .../hibernate3/support/HibernateDaoSupport.java | 2 +- .../IdTransferringMergeEventListener.java | 2 +- .../support/ScopedBeanInterceptor.java | 2 +- .../orm/ibatis/SqlMapClientCallback.java | 2 +- .../orm/ibatis/SqlMapClientFactoryBean.java | 2 +- .../orm/ibatis/SqlMapClientOperations.java | 2 +- .../orm/ibatis/SqlMapClientTemplate.java | 2 +- .../ibatis/support/AbstractLobTypeHandler.java | 2 +- .../orm/jdo/DefaultJdoDialect.java | 2 +- .../org/springframework/orm/jdo/JdoAccessor.java | 2 +- .../org/springframework/orm/jdo/JdoCallback.java | 2 +- .../org/springframework/orm/jdo/JdoDialect.java | 2 +- .../springframework/orm/jdo/JdoInterceptor.java | 2 +- .../jdo/JdoObjectRetrievalFailureException.java | 2 +- .../JdoOptimisticLockingFailureException.java | 2 +- .../orm/jdo/JdoResourceFailureException.java | 2 +- .../orm/jdo/JdoSystemException.java | 2 +- .../org/springframework/orm/jdo/JdoTemplate.java | 2 +- .../orm/jdo/JdoTransactionManager.java | 2 +- .../orm/jdo/JdoUsageException.java | 2 +- .../jdo/LocalPersistenceManagerFactoryBean.java | 2 +- .../orm/jdo/PersistenceManagerFactoryUtils.java | 2 +- ...ctionAwarePersistenceManagerFactoryProxy.java | 2 +- .../orm/jdo/support/JdoDaoSupport.java | 2 +- .../OpenPersistenceManagerInViewFilter.java | 2 +- .../SpringPersistenceManagerProxyBean.java | 2 +- .../jpa/AbstractEntityManagerFactoryBean.java | 2 +- .../orm/jpa/DefaultJpaDialect.java | 2 +- .../orm/jpa/EntityManagerFactoryAccessor.java | 2 +- .../orm/jpa/EntityManagerFactoryInfo.java | 2 +- .../orm/jpa/EntityManagerProxy.java | 2 +- .../orm/jpa/ExtendedEntityManagerCreator.java | 2 +- .../org/springframework/orm/jpa/JpaAccessor.java | 2 +- .../org/springframework/orm/jpa/JpaCallback.java | 2 +- .../org/springframework/orm/jpa/JpaDialect.java | 2 +- .../springframework/orm/jpa/JpaInterceptor.java | 2 +- .../jpa/JpaObjectRetrievalFailureException.java | 2 +- .../springframework/orm/jpa/JpaOperations.java | 2 +- .../JpaOptimisticLockingFailureException.java | 2 +- .../orm/jpa/JpaSystemException.java | 2 +- .../org/springframework/orm/jpa/JpaTemplate.java | 2 +- .../orm/jpa/JpaTransactionManager.java | 2 +- .../orm/jpa/JpaVendorAdapter.java | 2 +- .../orm/jpa/LocalEntityManagerFactoryBean.java | 2 +- .../orm/jpa/SharedEntityManagerCreator.java | 2 +- .../ClassFileTransformerAdapter.java | 2 +- .../persistenceunit/PersistenceUnitManager.java | 2 +- .../PersistenceUnitPostProcessor.java | 2 +- .../orm/jpa/support/JpaDaoSupport.java | 2 +- .../orm/jpa/support/SharedEntityManagerBean.java | 2 +- .../orm/jpa/vendor/AbstractJpaVendorAdapter.java | 2 +- .../springframework/orm/jpa/vendor/Database.java | 2 +- .../jpa/vendor/EclipseLinkJpaVendorAdapter.java | 2 +- .../orm/jpa/vendor/HibernateJpaDialect.java | 2 +- .../vendor/HibernateJpaSessionFactoryBean.java | 2 +- .../jpa/vendor/HibernateJpaVendorAdapter.java | 2 +- .../orm/jpa/vendor/OpenJpaDialect.java | 2 +- .../orm/jpa/vendor/OpenJpaVendorAdapter.java | 2 +- .../orm/jpa/vendor/TopLinkJpaVendorAdapter.java | 2 +- .../java/org/springframework/beans/Colour.java | 2 +- .../springframework/beans/INestedTestBean.java | 2 +- .../java/org/springframework/beans/IOther.java | 2 +- .../springframework/beans/NestedTestBean.java | 2 +- .../java/org/springframework/beans/TestBean.java | 2 +- .../beans/factory/config/SimpleMapScope.java | 2 +- .../mock/jndi/ExpectedLookupTemplate.java | 2 +- .../mock/jndi/SimpleNamingContext.java | 2 +- .../mock/jndi/SimpleNamingContextBuilder.java | 2 +- .../hibernate3/HibernateInterceptorTests.java | 2 +- .../hibernate3/HibernateJtaTransactionTests.java | 2 +- .../orm/hibernate3/HibernateTemplateTests.java | 2 +- .../HibernateTransactionManagerTests.java | 2 +- .../hibernate3/LocalSessionFactoryBeanTests.java | 2 +- .../support/HibernateDaoSupportTests.java | 2 +- .../orm/hibernate3/support/LobTypeTests.java | 2 +- .../support/ScopedBeanInterceptorTests.java | 2 +- .../orm/ibatis/SqlMapClientTests.java | 2 +- .../orm/ibatis/support/LobTypeHandlerTests.java | 2 +- .../orm/jdo/JdoInterceptorTests.java | 2 +- .../orm/jdo/JdoTemplateTests.java | 2 +- .../orm/jdo/JdoTransactionManagerTests.java | 2 +- .../jdo/LocalPersistenceManagerFactoryTests.java | 2 +- .../orm/jdo/support/JdoDaoSupportTests.java | 2 +- ...inerEntityManagerFactoryIntegrationTests.java | 2 +- .../AbstractEntityManagerFactoryBeanTests.java | 2 +- ...ractEntityManagerFactoryIntegrationTests.java | 2 +- ...tionManagedEntityManagerIntegrationTests.java | 2 +- ...inerManagedEntityManagerIntegrationTests.java | 2 +- .../orm/jpa/DefaultJpaDialectTests.java | 2 +- .../EntityManagerFactoryBeanSupportTests.java | 2 +- .../orm/jpa/EntityManagerFactoryUtilsTests.java | 2 +- .../orm/jpa/JpaInterceptorTests.java | 2 +- .../orm/jpa/JpaTemplateTests.java | 2 +- .../orm/jpa/JpaTransactionManagerTests.java | 2 +- ...alContainerEntityManagerFactoryBeanTests.java | 2 +- .../jpa/LocalEntityManagerFactoryBeanTests.java | 2 +- .../orm/jpa/domain/DriversLicense.java | 2 +- .../springframework/orm/jpa/domain/Person.java | 2 +- ...LinkEntityManagerFactoryIntegrationTests.java | 2 +- ...nateEntityManagerFactoryIntegrationTests.java | 2 +- ...nJpaEntityManagerFactoryIntegrationTests.java | 2 +- .../orm/jpa/support/JpaDaoSupportTests.java | 2 +- .../jpa/support/PersistenceInjectionTests.java | 2 +- .../support/SharedEntityManagerFactoryTests.java | 2 +- ...LinkEntityManagerFactoryIntegrationTests.java | 2 +- ...actDependencyInjectionSpringContextTests.java | 2 +- .../test/AbstractSingleSpringContextTests.java | 2 +- .../test/AbstractSpringContextTests.java | 2 +- ...ransactionalDataSourceSpringContextTests.java | 2 +- .../AbstractTransactionalSpringContextTests.java | 2 +- .../test/ConditionalTestCase.java | 2 +- ...bstractAnnotationAwareTransactionalTests.java | 2 +- .../test/annotation/DirtiesContext.java | 2 +- .../test/annotation/IfProfileValue.java | 2 +- .../test/annotation/ProfileValueSource.java | 2 +- .../test/annotation/ProfileValueUtils.java | 2 +- .../test/annotation/Rollback.java | 2 +- .../annotation/SystemProfileValueSource.java | 2 +- .../springframework/test/jdbc/JdbcTestUtils.java | 2 +- .../test/jpa/AbstractJpaTests.java | 2 +- .../OrmXmlOverridingShadowingClassLoader.java | 2 +- .../transaction/MockJtaTransaction.java | 2 +- .../springframework/oxm/GenericMarshaller.java | 2 +- .../springframework/oxm/GenericUnmarshaller.java | 2 +- .../java/org/springframework/oxm/Marshaller.java | 2 +- .../oxm/MarshallingException.java | 2 +- .../oxm/MarshallingFailureException.java | 2 +- .../oxm/UncategorizedMappingException.java | 2 +- .../org/springframework/oxm/Unmarshaller.java | 2 +- .../oxm/UnmarshallingFailureException.java | 2 +- .../oxm/ValidationFailureException.java | 2 +- .../springframework/oxm/XmlMappingException.java | 2 +- .../oxm/castor/CastorMappingException.java | 2 +- .../CastorMarshallerBeanDefinitionParser.java | 2 +- .../Jaxb2MarshallerBeanDefinitionParser.java | 2 +- .../JibxMarshallerBeanDefinitionParser.java | 2 +- .../oxm/config/OxmNamespaceHandler.java | 2 +- .../XmlBeansMarshallerBeanDefinitionParser.java | 2 +- .../springframework/oxm/mime/MimeContainer.java | 2 +- .../oxm/support/AbstractMarshaller.java | 2 +- .../oxm/support/MarshallingSource.java | 2 +- .../oxm/support/SaxResourceUtils.java | 2 +- .../oxm/xmlbeans/XmlBeansMarshaller.java | 2 +- .../oxm/xmlbeans/XmlOptionsFactoryBean.java | 2 +- .../oxm/xstream/XStreamUtils.java | 2 +- .../oxm/castor/CastorMarshallerTests.java | 2 +- .../oxm/config/OxmNamespaceHandlerTests.java | 2 +- .../springframework/oxm/jaxb/BinaryObject.java | 2 +- .../org/springframework/oxm/jaxb/Primitives.java | 2 +- .../oxm/jaxb/StandardClasses.java | 2 +- .../org/springframework/oxm/jibx/Flights.java | 2 +- .../oxm/xmlbeans/XmlOptionsFactoryBeanTests.java | 2 +- .../org/springframework/oxm/xstream/Flight.java | 2 +- .../oxm/xstream/XStreamMarshallerTests.java | 2 +- .../view/tiles/ComponentControllerSupport.java | 2 +- .../web/servlet/view/tiles/TilesConfigurer.java | 2 +- .../web/servlet/view/tiles/TilesJstlView.java | 2 +- .../web/servlet/view/tiles/TilesView.java | 2 +- .../web/struts/ActionServletAwareProcessor.java | 2 +- .../web/struts/ActionSupport.java | 2 +- .../web/struts/AutowiringRequestProcessor.java | 2 +- .../struts/AutowiringTilesRequestProcessor.java | 2 +- .../web/struts/ContextLoaderPlugIn.java | 2 +- .../web/struts/DelegatingActionProxy.java | 2 +- .../web/struts/DelegatingActionUtils.java | 2 +- .../web/struts/DelegatingRequestProcessor.java | 2 +- .../struts/DelegatingTilesRequestProcessor.java | 2 +- .../web/struts/DispatchActionSupport.java | 2 +- .../web/struts/LookupDispatchActionSupport.java | 2 +- .../web/struts/MappingDispatchActionSupport.java | 2 +- .../web/struts/SpringBindingActionForm.java | 2 +- .../view/tiles/TestComponentController.java | 2 +- .../web/servlet/view/tiles/TilesViewTests.java | 2 +- .../web/struts/StrutsSupportTests.java | 2 +- .../springframework/web/struts/TestAction.java | 2 +- .../mock/jndi/SimpleNamingContext.java | 2 +- .../mock/jndi/SimpleNamingContextBuilder.java | 2 +- .../mock/web/DelegatingServletInputStream.java | 2 +- .../mock/web/DelegatingServletOutputStream.java | 2 +- .../mock/web/HeaderValueHolder.java | 2 +- .../mock/web/MockExpressionEvaluator.java | 2 +- .../mock/web/MockPageContext.java | 2 +- .../mock/web/portlet/MockPortletConfig.java | 2 +- .../mock/web/portlet/MockPortletContext.java | 2 +- .../mock/web/portlet/MockPortletRequest.java | 2 +- .../mock/web/portlet/MockPortletSession.java | 2 +- ...actDependencyInjectionSpringContextTests.java | 2 +- .../test/AbstractSingleSpringContextTests.java | 2 +- .../test/AbstractSpringContextTests.java | 2 +- ...ransactionalDataSourceSpringContextTests.java | 2 +- .../AbstractTransactionalSpringContextTests.java | 2 +- .../org/springframework/test/AssertThrows.java | 2 +- ...bstractAnnotationAwareTransactionalTests.java | 2 +- .../test/annotation/DirtiesContext.java | 2 +- .../test/annotation/ExpectedException.java | 2 +- .../test/annotation/IfProfileValue.java | 2 +- .../test/annotation/NotTransactional.java | 2 +- .../test/annotation/ProfileValueSource.java | 2 +- .../ProfileValueSourceConfiguration.java | 2 +- .../test/annotation/ProfileValueUtils.java | 2 +- .../springframework/test/annotation/Repeat.java | 2 +- .../test/annotation/Rollback.java | 2 +- .../springframework/test/annotation/Timed.java | 2 +- .../test/context/TestContext.java | 2 +- .../test/context/TestExecutionListener.java | 2 +- .../test/context/TestExecutionListeners.java | 2 +- .../AbstractJUnit38SpringContextTests.java | 2 +- ...ctTransactionalJUnit38SpringContextTests.java | 2 +- .../context/junit4/SpringJUnit4ClassRunner.java | 2 +- .../statements/RunAfterTestClassCallbacks.java | 2 +- .../statements/RunBeforeTestClassCallbacks.java | 2 +- .../statements/RunBeforeTestMethodCallbacks.java | 2 +- .../junit4/statements/SpringFailOnTimeout.java | 2 +- .../context/junit4/statements/SpringRepeat.java | 2 +- .../support/AbstractTestExecutionListener.java | 2 +- ...DependencyInjectionTestExecutionListener.java | 2 +- .../DirtiesContextTestExecutionListener.java | 2 +- .../support/GenericPropertiesContextLoader.java | 2 +- .../context/support/GenericXmlContextLoader.java | 2 +- .../context/transaction/AfterTransaction.java | 2 +- .../context/transaction/BeforeTransaction.java | 2 +- .../test/jpa/AbstractAspectjJpaTests.java | 2 +- .../test/jpa/AbstractJpaTests.java | 2 +- .../OrmXmlOverridingShadowingClassLoader.java | 2 +- .../test/web/AbstractModelAndViewTests.java | 2 +- .../java/org/springframework/beans/Employee.java | 2 +- .../springframework/beans/INestedTestBean.java | 2 +- .../java/org/springframework/beans/IOther.java | 2 +- .../springframework/beans/NestedTestBean.java | 2 +- .../java/org/springframework/beans/TestBean.java | 2 +- .../mock/web/MockPageContextTests.java | 2 +- .../AbstractSpr3350SingleSpringContextTests.java | 2 +- ...tiesBasedSpr3350SingleSpringContextTests.java | 2 +- ...264DependencyInjectionSpringContextTests.java | 2 +- .../test/Spr3264SingleSpringContextTests.java | 2 +- .../XmlBasedSpr3350SingleSpringContextTests.java | 2 +- .../test/annotation/ProfileValueUtilsTests.java | 2 +- .../context/ClassLevelDirtiesContextTests.java | 2 +- .../test/context/TestContextCacheKeyTests.java | 2 +- .../test/context/TestContextManagerTests.java | 2 +- ...tendingPropertiesAndInheritedLoaderTests.java | 2 +- ...onWithPropertiesExtendingPropertiesTests.java | 2 +- ...teTransactionalJUnit38SpringContextTests.java | 2 +- .../ProfileValueJUnit38SpringContextTests.java | 2 +- ...tePathSpringJUnit4ClassRunnerAppCtxTests.java | 2 +- .../AbstractTransactionalSpringRunnerTests.java | 2 +- .../ClassLevelDisabledSpringRunnerTests.java | 2 +- ...ClassLevelTransactionalSpringRunnerTests.java | 2 +- ...sourceSpringJUnit4ClassRunnerAppCtxTests.java | 2 +- ...eteTransactionalJUnit4SpringContextTests.java | 2 +- ...faultContextLoaderClassSpringRunnerTests.java | 2 +- ...lbackFalseTransactionalSpringRunnerTests.java | 2 +- ...llbackTrueTransactionalSpringRunnerTests.java | 2 +- .../EnabledAndIgnoredSpringRunnerTests.java | 2 +- ...CodedProfileValueSourceSpringRunnerTests.java | 2 +- ...ethodLevelTransactionalSpringRunnerTests.java | 2 +- ...ourcesSpringJUnit4ClassRunnerAppCtxTests.java | 2 +- ...sBasedSpringJUnit4ClassRunnerAppCtxTests.java | 2 +- ...llbackTrueTransactionalSpringRunnerTests.java | 2 +- .../SpringJUnit47ClassRunnerRuleTests.java | 2 +- .../SpringJUnit4ClassRunnerAppCtxTests.java | 2 +- .../context/junit4/SpringJUnit4SuiteTests.java | 2 +- .../TimedTransactionalSpringRunnerTests.java | 2 +- .../test/context/junit4/TrackingRunListener.java | 2 +- ...ConfigSpringJUnit4ClassRunnerAppCtxTests.java | 2 +- ...ridingDefaultConfigClassesInheritedTests.java | 2 +- ...idingExplicitConfigClassesInheritedTests.java | 2 +- .../DefaultConfigClassesBaseTests.java | 2 +- .../DefaultConfigClassesInheritedTests.java | 2 +- ...ridingDefaultConfigClassesInheritedTests.java | 2 +- ...idingExplicitConfigClassesInheritedTests.java | 2 +- ...faultLoaderDefaultConfigClassesBaseTests.java | 2 +- ...LoaderDefaultConfigClassesInheritedTests.java | 2 +- ...aultLoaderExplicitConfigClassesBaseTests.java | 2 +- ...oaderExplicitConfigClassesInheritedTests.java | 2 +- .../ExplicitConfigClassesBaseTests.java | 2 +- .../ExplicitConfigClassesInheritedTests.java | 2 +- .../junit4/annotation/PojoAndStringConfig.java | 2 +- .../junit4/orm/domain/DriversLicense.java | 2 +- .../test/context/junit4/orm/domain/Person.java | 2 +- .../junit4/orm/repository/PersonRepository.java | 2 +- .../hibernate/HibernatePersonRepository.java | 2 +- .../junit4/orm/service/PersonService.java | 2 +- .../orm/service/impl/StandardPersonService.java | 2 +- .../junit4/spr6128/AutowiredQualifierTests.java | 2 +- .../AnnotatedFooConfigInnerClassTestCase.java | 2 +- .../AnnotationConfigContextLoaderTests.java | 2 +- .../ContextConfigurationInnerClassTestCase.java | 2 +- .../CustomizedGenericXmlContextLoaderTests.java | 2 +- .../support/FinalConfigInnerClassTestCase.java | 2 +- ...icXmlContextLoaderResourceLocationsTests.java | 2 +- ...ltipleStaticConfigurationClassesTestCase.java | 2 +- .../NonStaticConfigInnerClassesTestCase.java | 2 +- .../PlainVanillaFooConfigInnerClassTestCase.java | 2 +- ...eteTransactionalTestNGSpringContextTests.java | 2 +- .../FailingBeforeAndAfterMethodsTests.java | 2 +- ...medTransactionalTestNGSpringContextTests.java | 2 +- .../test/transaction/TransactionTestUtils.java | 2 +- .../test/util/subpackage/Person.java | 2 +- .../dao/CannotAcquireLockException.java | 2 +- .../dao/CannotSerializeTransactionException.java | 2 +- .../dao/CleanupFailureDataAccessException.java | 2 +- .../dao/ConcurrencyFailureException.java | 2 +- .../springframework/dao/DataAccessException.java | 2 +- .../dao/DataAccessResourceFailureException.java | 2 +- .../dao/DataIntegrityViolationException.java | 2 +- .../dao/DataRetrievalFailureException.java | 2 +- .../dao/DeadlockLoserDataAccessException.java | 2 +- .../dao/DuplicateKeyException.java | 2 +- ...orrectUpdateSemanticsDataAccessException.java | 2 +- .../dao/InvalidDataAccessApiUsageException.java | 2 +- .../InvalidDataAccessResourceUsageException.java | 2 +- .../dao/NonTransientDataAccessException.java | 2 +- .../NonTransientDataAccessResourceException.java | 2 +- .../dao/OptimisticLockingFailureException.java | 2 +- .../dao/PermissionDeniedDataAccessException.java | 2 +- .../dao/PessimisticLockingFailureException.java | 2 +- .../dao/RecoverableDataAccessException.java | 2 +- .../dao/TransientDataAccessException.java | 2 +- .../TransientDataAccessResourceException.java | 2 +- .../dao/TypeMismatchDataAccessException.java | 2 +- .../dao/UncategorizedDataAccessException.java | 2 +- .../PersistenceExceptionTranslationAdvisor.java | 2 +- .../ChainedPersistenceExceptionTranslator.java | 2 +- .../springframework/dao/support/DaoSupport.java | 2 +- .../dao/support/DataAccessUtils.java | 2 +- ...rsistenceExceptionTranslationInterceptor.java | 2 +- .../support/PersistenceExceptionTranslator.java | 2 +- .../jca/cci/CannotCreateRecordException.java | 2 +- .../jca/cci/CannotGetCciConnectionException.java | 2 +- .../cci/CciOperationNotSupportedException.java | 2 +- .../jca/cci/InvalidResultSetAccessException.java | 2 +- .../jca/cci/RecordTypeNotSupportedException.java | 2 +- .../connection/CciLocalTransactionManager.java | 2 +- .../cci/connection/ConnectionFactoryUtils.java | 2 +- .../jca/cci/connection/ConnectionHolder.java | 2 +- .../ConnectionSpecConnectionFactoryAdapter.java | 2 +- .../connection/DelegatingConnectionFactory.java | 2 +- .../connection/NotSupportedRecordFactory.java | 2 +- .../cci/connection/SingleConnectionFactory.java | 2 +- .../TransactionAwareConnectionFactoryProxy.java | 2 +- .../jca/cci/core/CciTemplate.java | 2 +- .../jca/cci/core/ConnectionCallback.java | 2 +- .../jca/cci/core/InteractionCallback.java | 2 +- .../jca/cci/core/RecordCreator.java | 2 +- .../jca/cci/core/RecordExtractor.java | 2 +- .../jca/cci/core/support/CciDaoSupport.java | 2 +- .../jca/cci/core/support/CommAreaRecord.java | 2 +- .../jca/cci/object/MappingCommAreaOperation.java | 2 +- .../jca/cci/object/MappingRecordOperation.java | 2 +- .../jca/cci/object/SimpleRecordOperation.java | 2 +- .../jca/context/BootstrapContextAware.java | 2 +- .../context/SpringContextResourceAdapter.java | 2 +- .../endpoint/AbstractMessageEndpointFactory.java | 2 +- .../endpoint/GenericMessageEndpointFactory.java | 2 +- .../jca/support/SimpleBootstrapContext.java | 2 +- .../CannotCreateTransactionException.java | 2 +- .../HeuristicCompletionException.java | 2 +- .../IllegalTransactionStateException.java | 2 +- .../InvalidIsolationLevelException.java | 2 +- .../transaction/InvalidTimeoutException.java | 2 +- .../NestedTransactionNotSupportedException.java | 2 +- .../transaction/NoTransactionException.java | 2 +- .../transaction/PlatformTransactionManager.java | 2 +- .../transaction/SavepointManager.java | 2 +- .../transaction/TransactionDefinition.java | 2 +- .../transaction/TransactionException.java | 2 +- ...ansactionSuspensionNotSupportedException.java | 2 +- .../transaction/TransactionSystemException.java | 2 +- .../TransactionTimedOutException.java | 2 +- .../transaction/TransactionUsageException.java | 2 +- .../transaction/UnexpectedRollbackException.java | 2 +- .../transaction/annotation/Isolation.java | 2 +- .../transaction/annotation/Propagation.java | 2 +- .../annotation/TransactionAnnotationParser.java | 2 +- .../transaction/annotation/Transactional.java | 2 +- .../AnnotationDrivenBeanDefinitionParser.java | 2 +- .../transaction/config/TxNamespaceHandler.java | 2 +- ...FactoryTransactionAttributeSourceAdvisor.java | 2 +- .../CompositeTransactionAttributeSource.java | 2 +- .../interceptor/DefaultTransactionAttribute.java | 2 +- .../DelegatingTransactionAttribute.java | 2 +- .../MatchAlwaysTransactionAttributeSource.java | 2 +- .../MethodMapTransactionAttributeSource.java | 2 +- .../NameMatchTransactionAttributeSource.java | 2 +- .../interceptor/NoRollbackRuleAttribute.java | 2 +- .../interceptor/RollbackRuleAttribute.java | 2 +- .../RuleBasedTransactionAttribute.java | 2 +- .../interceptor/TransactionAttribute.java | 2 +- .../interceptor/TransactionAttributeEditor.java | 2 +- .../TransactionAttributeSourceAdvisor.java | 2 +- .../TransactionAttributeSourceEditor.java | 2 +- .../TransactionAttributeSourcePointcut.java | 2 +- .../interceptor/TransactionInterceptor.java | 2 +- .../jta/JtaAfterCompletionSynchronization.java | 2 +- .../transaction/jta/JtaTransactionManager.java | 2 +- .../jta/SpringJtaSynchronizationAdapter.java | 2 +- .../transaction/jta/TransactionFactory.java | 2 +- .../jta/WebLogicJtaTransactionManager.java | 2 +- .../jta/WebSphereUowTransactionManager.java | 2 +- .../AbstractPlatformTransactionManager.java | 2 +- .../support/AbstractTransactionStatus.java | 2 +- ...backPreferringPlatformTransactionManager.java | 2 +- .../support/DefaultTransactionDefinition.java | 2 +- .../support/DefaultTransactionStatus.java | 2 +- .../support/DelegatingTransactionDefinition.java | 2 +- .../support/ResourceHolderSynchronization.java | 2 +- .../support/ResourceTransactionManager.java | 2 +- .../support/SimpleTransactionStatus.java | 2 +- .../transaction/support/TransactionCallback.java | 2 +- .../TransactionCallbackWithoutResult.java | 2 +- .../support/TransactionOperations.java | 2 +- .../support/TransactionSynchronization.java | 2 +- .../TransactionSynchronizationManager.java | 2 +- .../support/TransactionSynchronizationUtils.java | 2 +- .../transaction/support/TransactionTemplate.java | 2 +- .../java/org/springframework/beans/Colour.java | 2 +- .../springframework/beans/DerivedTestBean.java | 2 +- .../springframework/beans/INestedTestBean.java | 2 +- .../java/org/springframework/beans/IOther.java | 2 +- .../springframework/beans/NestedTestBean.java | 2 +- .../java/org/springframework/beans/TestBean.java | 2 +- .../parsing/CollectingReaderEventListener.java | 2 +- ...sistenceExceptionTranslationAdvisorTests.java | 2 +- ...ceExceptionTranslationPostProcessorTests.java | 2 +- ...ainedPersistenceExceptionTranslatorTests.java | 2 +- .../dao/support/DataAccessUtilsTests.java | 2 +- .../jca/cci/CciLocalTransactionTests.java | 2 +- .../jca/cci/CciTemplateTests.java | 2 +- .../jca/cci/EisOperationTests.java | 2 +- .../mock/jndi/ExpectedLookupTemplate.java | 2 +- .../mock/jndi/SimpleNamingContext.java | 2 +- .../mock/jndi/SimpleNamingContextBuilder.java | 2 +- .../CallCountingTransactionManager.java | 2 +- .../JndiJtaTransactionManagerTests.java | 2 +- .../transaction/JtaTransactionManagerTests.java | 2 +- ...MockCallbackPreferringTransactionManager.java | 2 +- .../transaction/MockJtaTransaction.java | 2 +- .../transaction/TestTransactionManager.java | 2 +- .../transaction/TransactionSupportTests.java | 2 +- .../TxNamespaceHandlerEventTests.java | 2 +- .../transaction/TxNamespaceHandlerTests.java | 2 +- ...nnotationTransactionAttributeSourceTests.java | 2 +- .../AnnotationTransactionInterceptorTests.java | 2 +- ...notationTransactionNamespaceHandlerTests.java | 2 +- .../EnableTransactionManagementTests.java | 2 +- .../config/AnnotationDrivenTests.java | 2 +- .../transaction/config/TransactionalService.java | 2 +- .../AbstractTransactionAspectTests.java | 2 +- .../interceptor/ImplementsNoInterfaces.java | 2 +- .../MapTransactionAttributeSource.java | 2 +- .../interceptor/MyRuntimeException.java | 2 +- .../PlatformTransactionManagerFacade.java | 2 +- .../interceptor/RollbackRuleTests.java | 2 +- .../TransactionAttributeEditorTests.java | 2 +- .../TransactionAttributeSourceAdvisorTests.java | 2 +- .../TransactionAttributeSourceEditorTests.java | 2 +- .../interceptor/TransactionInterceptorTests.java | 2 +- .../transaction/jta/MockUOWManager.java | 2 +- .../jta/WebSphereUowTransactionManagerTests.java | 2 +- .../JtaTransactionManagerSerializationTests.java | 2 +- .../springframework/http/MediaTypeEditor.java | 2 +- .../http/client/ClientHttpRequest.java | 2 +- .../client/HttpComponentsClientHttpRequest.java | 2 +- .../client/InterceptingClientHttpRequest.java | 2 +- .../converter/AbstractHttpMessageConverter.java | 2 +- .../converter/ByteArrayHttpMessageConverter.java | 2 +- .../HttpMessageConversionException.java | 2 +- .../HttpMessageNotReadableException.java | 2 +- .../HttpMessageNotWritableException.java | 2 +- .../xml/MarshallingHttpMessageConverter.java | 2 +- .../xml/XmlAwareFormHttpMessageConverter.java | 2 +- .../remoting/caucho/BurlapClientInterceptor.java | 2 +- .../caucho/HessianClientInterceptor.java | 2 +- .../remoting/caucho/HessianExporter.java | 2 +- .../AbstractHttpInvokerRequestExecutor.java | 2 +- .../HttpInvokerClientConfiguration.java | 2 +- .../HttpInvokerClientInterceptor.java | 2 +- .../jaxrpc/JaxRpcPortClientInterceptor.java | 2 +- .../jaxrpc/JaxRpcPortProxyFactoryBean.java | 2 +- .../jaxrpc/JaxRpcSoapFaultException.java | 2 +- .../jaxrpc/LocalJaxRpcServiceFactory.java | 2 +- .../jaxrpc/LocalJaxRpcServiceFactoryBean.java | 2 +- .../remoting/jaxrpc/ServletEndpointSupport.java | 2 +- .../remoting/jaxws/JaxWsSoapFaultException.java | 2 +- .../web/HttpMediaTypeException.java | 2 +- .../web/HttpMediaTypeNotAcceptableException.java | 2 +- .../springframework/web/HttpRequestHandler.java | 2 +- .../HttpRequestMethodNotSupportedException.java | 2 +- .../web/HttpSessionRequiredException.java | 2 +- .../springframework/web/bind/EscapedErrors.java | 2 +- .../bind/MethodArgumentNotValidException.java | 2 +- .../MissingServletRequestParameterException.java | 2 +- .../web/bind/ServletRequestBindingException.java | 2 +- .../web/bind/ServletRequestDataBinder.java | 2 +- .../ServletRequestParameterPropertyValues.java | 2 +- .../web/bind/ServletRequestUtils.java | 2 +- ...atisfiedServletRequestParameterException.java | 2 +- .../springframework/web/bind/WebDataBinder.java | 2 +- .../web/bind/annotation/CookieValue.java | 2 +- .../web/bind/annotation/ExceptionHandler.java | 2 +- .../web/bind/annotation/InitBinder.java | 2 +- .../web/bind/annotation/MatrixVariable.java | 2 +- .../web/bind/annotation/RequestHeader.java | 2 +- .../web/bind/annotation/RequestParam.java | 2 +- .../web/bind/annotation/RequestPart.java | 2 +- .../web/bind/annotation/SessionAttributes.java | 2 +- .../web/bind/annotation/ValueConstants.java | 2 +- .../HandlerMethodInvocationException.java | 2 +- .../annotation/support/HandlerMethodInvoker.java | 2 +- .../bind/support/DefaultDataBinderFactory.java | 2 +- .../web/bind/support/SessionAttributeStore.java | 2 +- .../web/bind/support/SimpleSessionStatus.java | 2 +- .../web/bind/support/WebArgumentResolver.java | 2 +- .../web/bind/support/WebDataBinderFactory.java | 2 +- .../web/bind/support/WebRequestDataBinder.java | 2 +- .../client/HttpMessageConverterExtractor.java | 2 +- .../web/client/ResponseErrorHandler.java | 2 +- .../web/context/WebApplicationContext.java | 2 +- .../request/AbstractRequestAttributesScope.java | 2 +- .../DestructionCallbackBindingListener.java | 2 +- .../context/request/FacesRequestAttributes.java | 2 +- .../web/context/request/FacesWebRequest.java | 2 +- .../web/context/request/NativeWebRequest.java | 2 +- .../web/context/request/RequestAttributes.java | 2 +- .../context/request/RequestContextHolder.java | 2 +- .../context/request/RequestContextListener.java | 2 +- .../web/context/request/RequestScope.java | 2 +- .../web/context/request/SessionScope.java | 2 +- .../web/context/request/WebRequest.java | 2 +- .../context/request/WebRequestInterceptor.java | 2 +- .../support/HttpRequestHandlerServlet.java | 2 +- .../web/context/support/RequestHandledEvent.java | 2 +- .../ServletContextParameterFactoryBean.java | 2 +- ...vletContextPropertyPlaceholderConfigurer.java | 2 +- .../support/ServletContextPropertySource.java | 2 +- .../ServletContextResourcePatternResolver.java | 2 +- .../web/context/support/ServletContextScope.java | 2 +- .../support/ServletRequestHandledEvent.java | 2 +- .../support/SpringBeanAutowiringSupport.java | 2 +- .../support/WebApplicationObjectSupport.java | 2 +- .../web/filter/CompositeFilter.java | 2 +- .../web/filter/GenericFilterBean.java | 2 +- .../web/filter/HiddenHttpMethodFilter.java | 2 +- .../jsf/DelegatingPhaseListenerMulticaster.java | 2 +- .../web/jsf/DelegatingVariableResolver.java | 2 +- .../web/jsf/FacesContextUtils.java | 2 +- .../WebApplicationContextVariableResolver.java | 2 +- .../web/jsf/el/SpringBeanFacesELResolver.java | 2 +- .../el/WebApplicationContextFacesELResolver.java | 2 +- .../web/method/HandlerMethodSelector.java | 2 +- ...bstractCookieValueMethodArgumentResolver.java | 2 +- .../ExpressionValueMethodArgumentResolver.java | 2 +- .../annotation/InitBinderDataBinderFactory.java | 2 +- .../web/method/annotation/ModelFactory.java | 2 +- .../RequestHeaderMethodArgumentResolver.java | 2 +- .../support/HandlerMethodArgumentResolver.java | 2 +- .../support/HandlerMethodReturnValueHandler.java | 2 +- .../MaxUploadSizeExceededException.java | 2 +- .../web/multipart/MultipartException.java | 2 +- .../web/multipart/MultipartFile.java | 2 +- .../web/multipart/MultipartRequest.java | 2 +- .../web/multipart/MultipartResolver.java | 2 +- .../commons/CommonsFileUploadSupport.java | 2 +- .../multipart/commons/CommonsMultipartFile.java | 2 +- .../commons/CommonsMultipartResolver.java | 2 +- .../DefaultMultipartHttpServletRequest.java | 2 +- .../web/multipart/support/MultipartFilter.java | 2 +- .../RequestPartServletServerHttpRequest.java | 2 +- .../support/StringMultipartFileEditor.java | 2 +- .../web/util/HtmlCharacterEntityReferences.java | 2 +- .../org/springframework/web/util/HtmlUtils.java | 2 +- .../web/util/HttpSessionMutexListener.java | 2 +- .../web/util/IntrospectorCleanupListener.java | 2 +- .../web/util/Log4jConfigListener.java | 2 +- .../web/util/NestedServletException.java | 2 +- .../org/springframework/web/util/TagUtils.java | 2 +- .../springframework/web/util/UriTemplate.java | 2 +- .../web/util/WebAppRootListener.java | 2 +- .../org/springframework/web/util/WebUtils.java | 2 +- .../java/org/springframework/beans/Colour.java | 2 +- .../springframework/beans/DerivedTestBean.java | 2 +- .../springframework/beans/INestedTestBean.java | 2 +- .../java/org/springframework/beans/IOther.java | 2 +- .../springframework/beans/NestedTestBean.java | 2 +- .../java/org/springframework/beans/Person.java | 2 +- .../beans/SerializablePerson.java | 2 +- .../java/org/springframework/beans/TestBean.java | 2 +- .../beans/factory/DummyFactory.java | 2 +- .../springframework/core/task/MockRunnable.java | 2 +- .../http/MockHttpInputMessage.java | 2 +- .../http/MockHttpOutputMessage.java | 2 +- .../http/client/FreePortScanner.java | 2 +- .../StreamingSimpleHttpRequestFactoryTests.java | 2 +- .../converter/FormHttpMessageConverterTests.java | 2 +- .../converter/HttpMessageConverterTests.java | 2 +- .../StringHttpMessageConverterTests.java | 2 +- ...Jaxb2RootElementHttpMessageConverterTest.java | 2 +- .../xml/SourceHttpMessageConverterTests.java | 2 +- .../remoting/caucho/CauchoRemotingTests.java | 2 +- .../remoting/jaxws/OrderNotFoundException.java | 2 +- .../remoting/jaxws/OrderServiceImpl.java | 2 +- .../web/client/RestTemplateIntegrationTests.java | 2 +- .../web/filter/CompositeFilterTests.java | 2 +- .../web/filter/DelegatingFilterProxyTests.java | 2 +- .../web/filter/HiddenHttpMethodFilterTest.java | 2 +- .../web/jsf/DelegatingPhaseListenerTests.java | 2 +- .../web/jsf/DelegatingVariableResolverTests.java | 2 +- .../web/jsf/MockFacesContext.java | 2 +- .../springframework/web/jsf/MockLifecycle.java | 2 +- .../ExceptionHandlerMethodResolverTests.java | 2 +- ...dlerMethodArgumentResolverCompositeTests.java | 2 +- ...erMethodReturnValueHandlerCompositeTests.java | 2 +- .../support/ModelAndViewContainerTests.java | 2 +- .../web/method/support/StubArgumentResolver.java | 2 +- .../method/support/StubReturnValueHandler.java | 2 +- .../web/util/MockLog4jAppender.java | 2 +- .../springframework/web/util/TagUtilsTests.java | 2 +- .../springframework/web/util/UriUtilsTests.java | 2 +- .../web/portlet/GenericPortletBean.java | 2 +- .../web/portlet/HandlerAdapter.java | 2 +- .../web/portlet/HandlerExceptionResolver.java | 2 +- .../web/portlet/HandlerExecutionChain.java | 2 +- .../web/portlet/HandlerInterceptor.java | 2 +- .../web/portlet/HandlerMapping.java | 2 +- .../web/portlet/ModelAndView.java | 2 +- .../portlet/ModelAndViewDefiningException.java | 2 +- .../web/portlet/NoHandlerFoundException.java | 2 +- .../MissingPortletRequestParameterException.java | 2 +- .../bind/PortletRequestBindingException.java | 2 +- .../portlet/bind/PortletRequestDataBinder.java | 2 +- .../PortletRequestParameterPropertyValues.java | 2 +- .../web/portlet/bind/PortletRequestUtils.java | 2 +- .../portlet/bind/annotation/ActionMapping.java | 2 +- .../ConfigurablePortletApplicationContext.java | 2 +- .../context/PortletApplicationObjectSupport.java | 2 +- .../web/portlet/context/PortletConfigAware.java | 2 +- .../web/portlet/context/PortletContextAware.java | 2 +- .../context/PortletContextAwareProcessor.java | 2 +- .../PortletContextResourcePatternResolver.java | 2 +- .../web/portlet/context/PortletContextScope.java | 2 +- .../context/PortletRequestAttributes.java | 2 +- .../context/PortletRequestHandledEvent.java | 2 +- .../web/portlet/context/PortletWebRequest.java | 2 +- .../context/StaticPortletApplicationContext.java | 2 +- .../AbstractHandlerExceptionResolver.java | 2 +- .../handler/HandlerInterceptorAdapter.java | 2 +- .../portlet/handler/ParameterHandlerMapping.java | 2 +- .../handler/ParameterMappingInterceptor.java | 2 +- .../portlet/handler/PortletContentGenerator.java | 2 +- .../handler/PortletModeHandlerMapping.java | 2 +- .../PortletModeParameterHandlerMapping.java | 2 +- ...ortletRequestMethodNotSupportedException.java | 2 +- .../handler/PortletSessionRequiredException.java | 2 +- .../handler/SimpleMappingExceptionResolver.java | 2 +- .../handler/SimplePortletHandlerAdapter.java | 2 +- .../handler/SimplePortletPostProcessor.java | 2 +- .../WebRequestHandlerInterceptorAdapter.java | 2 +- .../CommonsPortletMultipartResolver.java | 2 +- .../multipart/DefaultMultipartActionRequest.java | 2 +- .../multipart/PortletMultipartResolver.java | 2 +- .../portlet/mvc/AbstractCommandController.java | 2 +- .../web/portlet/mvc/AbstractController.java | 2 +- .../web/portlet/mvc/AbstractFormController.java | 2 +- .../mvc/AbstractWizardFormController.java | 2 +- .../web/portlet/mvc/BaseCommandController.java | 2 +- .../web/portlet/mvc/Controller.java | 2 +- .../mvc/ParameterizableViewController.java | 2 +- .../portlet/mvc/PortletWrappingController.java | 2 +- .../web/portlet/mvc/ResourceAwareController.java | 2 +- .../web/portlet/mvc/SimpleFormController.java | 2 +- .../web/portlet/util/PortletUtils.java | 2 +- .../java/org/springframework/beans/Colour.java | 2 +- .../springframework/beans/DerivedTestBean.java | 2 +- .../springframework/beans/INestedTestBean.java | 2 +- .../java/org/springframework/beans/IOther.java | 2 +- .../springframework/beans/NestedTestBean.java | 2 +- .../java/org/springframework/beans/TestBean.java | 2 +- .../beans/factory/AbstractBeanFactoryTests.java | 2 +- .../beans/factory/DummyFactory.java | 2 +- .../beans/factory/LifecycleBean.java | 2 +- .../beans/factory/MustBeInitialized.java | 2 +- .../org/springframework/context/ACATester.java | 2 +- .../context/AbstractApplicationContextTests.java | 2 +- .../context/BeanThatBroadcasts.java | 2 +- .../springframework/context/BeanThatListens.java | 2 +- .../mock/web/DelegatingServletOutputStream.java | 2 +- .../mock/web/HeaderValueHolder.java | 2 +- .../mock/web/MockMultipartFile.java | 2 +- .../mock/web/portlet/MockActionResponse.java | 2 +- .../mock/web/portlet/MockBaseURL.java | 2 +- .../mock/web/portlet/MockCacheControl.java | 2 +- .../mock/web/portlet/MockClientDataRequest.java | 2 +- .../mock/web/portlet/MockEvent.java | 2 +- .../mock/web/portlet/MockEventRequest.java | 2 +- .../mock/web/portlet/MockEventResponse.java | 2 +- .../mock/web/portlet/MockMimeResponse.java | 2 +- .../web/portlet/MockMultipartActionRequest.java | 2 +- .../mock/web/portlet/MockPortalContext.java | 2 +- .../mock/web/portlet/MockPortletConfig.java | 2 +- .../mock/web/portlet/MockPortletContext.java | 2 +- .../mock/web/portlet/MockPortletRequest.java | 2 +- .../portlet/MockPortletRequestDispatcher.java | 2 +- .../mock/web/portlet/MockPortletResponse.java | 2 +- .../mock/web/portlet/MockPortletSession.java | 2 +- .../mock/web/portlet/MockPortletURL.java | 2 +- .../mock/web/portlet/MockRenderRequest.java | 2 +- .../mock/web/portlet/MockRenderResponse.java | 2 +- .../mock/web/portlet/MockResourceRequest.java | 2 +- .../mock/web/portlet/MockResourceResponse.java | 2 +- .../mock/web/portlet/MockResourceURL.java | 2 +- .../mock/web/portlet/MockStateAwareResponse.java | 2 +- .../portlet/ServletWrappingPortletContext.java | 2 +- .../ComplexPortletApplicationContext.java | 2 +- .../web/portlet/GenericPortletBeanTests.java | 2 +- .../bind/PortletRequestDataBinderTests.java | 2 +- ...rtletRequestParameterPropertyValuesTests.java | 2 +- .../AbstractXmlWebApplicationContextTests.java | 2 +- .../portlet/context/PortletConfigAwareBean.java | 2 +- .../portlet/context/PortletContextAwareBean.java | 2 +- .../PortletContextAwareProcessorTests.java | 2 +- .../portlet/context/PortletWebRequestTests.java | 2 +- .../XmlPortletApplicationContextTests.java | 2 +- .../handler/ParameterHandlerMappingTests.java | 2 +- .../ParameterMappingInterceptorTests.java | 2 +- .../handler/PortletModeHandlerMappingTests.java | 2 +- .../PortletModeParameterHandlerMappingTests.java | 2 +- .../SimpleMappingExceptionResolverTests.java | 2 +- .../UserRoleAuthorizationInterceptorTests.java | 2 +- .../web/portlet/mvc/CommandControllerTests.java | 2 +- .../mvc/ParameterizableViewControllerTests.java | 2 +- .../mvc/PortletModeNameViewControllerTests.java | 2 +- .../mvc/PortletWrappingControllerTests.java | 2 +- .../PortletAnnotationControllerTests.java | 2 +- .../web/portlet/util/PortletUtilsTests.java | 2 +- .../web/servlet/HandlerAdapter.java | 2 +- .../web/servlet/HandlerExceptionResolver.java | 2 +- .../web/servlet/HandlerInterceptor.java | 2 +- .../web/servlet/HandlerMapping.java | 2 +- .../web/servlet/LocaleResolver.java | 2 +- .../web/servlet/ModelAndView.java | 2 +- .../servlet/ModelAndViewDefiningException.java | 2 +- .../web/servlet/RequestToViewNameTranslator.java | 2 +- .../web/servlet/ResourceServlet.java | 2 +- .../springframework/web/servlet/SmartView.java | 2 +- .../web/servlet/ThemeResolver.java | 2 +- .../web/servlet/ViewRendererServlet.java | 2 +- .../web/servlet/ViewResolver.java | 2 +- ...efaultServletHandlerBeanDefinitionParser.java | 2 +- .../web/servlet/config/MvcNamespaceHandler.java | 2 +- .../web/servlet/config/MvcNamespaceUtils.java | 2 +- .../config/ResourcesBeanDefinitionParser.java | 2 +- .../ViewControllerBeanDefinitionParser.java | 2 +- .../DefaultServletHandlerConfigurer.java | 2 +- .../servlet/config/annotation/EnableWebMvc.java | 2 +- .../annotation/ResourceHandlerRegistration.java | 2 +- .../annotation/ResourceHandlerRegistry.java | 2 +- .../annotation/ViewControllerRegistration.java | 2 +- .../annotation/ViewControllerRegistry.java | 2 +- .../AbstractDetectingUrlHandlerMapping.java | 2 +- .../AbstractHandlerExceptionResolver.java | 2 +- .../servlet/handler/AbstractHandlerMapping.java | 2 +- .../AbstractHandlerMethodExceptionResolver.java | 2 +- .../ConversionServiceExposingInterceptor.java | 2 +- .../HandlerExceptionResolverComposite.java | 2 +- .../handler/SimpleServletHandlerAdapter.java | 2 +- .../handler/SimpleServletPostProcessor.java | 2 +- .../servlet/handler/SimpleUrlHandlerMapping.java | 2 +- .../servlet/i18n/AcceptHeaderLocaleResolver.java | 2 +- .../web/servlet/i18n/CookieLocaleResolver.java | 2 +- .../web/servlet/i18n/FixedLocaleResolver.java | 2 +- .../web/servlet/i18n/SessionLocaleResolver.java | 2 +- .../servlet/mvc/AbstractCommandController.java | 2 +- .../web/servlet/mvc/AbstractController.java | 2 +- .../web/servlet/mvc/AbstractFormController.java | 2 +- .../servlet/mvc/AbstractUrlViewController.java | 2 +- .../mvc/AbstractWizardFormController.java | 2 +- .../web/servlet/mvc/BaseCommandController.java | 2 +- .../servlet/mvc/CancellableFormController.java | 2 +- .../web/servlet/mvc/Controller.java | 2 +- .../web/servlet/mvc/LastModified.java | 2 +- .../mvc/ParameterizableViewController.java | 2 +- .../servlet/mvc/ServletForwardingController.java | 2 +- .../servlet/mvc/ServletWrappingController.java | 2 +- .../web/servlet/mvc/SimpleFormController.java | 2 +- .../web/servlet/mvc/WebContentInterceptor.java | 2 +- ...AnnotationMethodHandlerExceptionResolver.java | 2 +- .../ResponseStatusExceptionResolver.java | 2 +- .../ServletAnnotationMappingUtils.java | 2 +- .../condition/AbstractNameValueExpression.java | 2 +- .../mvc/condition/AbstractRequestCondition.java | 2 +- .../mvc/condition/HeadersRequestCondition.java | 2 +- .../mvc/condition/MediaTypeExpression.java | 2 +- .../mvc/condition/NameValueExpression.java | 2 +- .../mvc/condition/ParamsRequestCondition.java | 2 +- .../mvc/method/AbstractHandlerMethodAdapter.java | 2 +- .../servlet/mvc/method/RequestMappingInfo.java | 2 +- ...ctMessageConverterMethodArgumentResolver.java | 2 +- ...ServletCookieValueMethodArgumentResolver.java | 2 +- .../ServletWebArgumentResolverAdapter.java | 2 +- .../AbstractUrlMethodNameResolver.java | 2 +- .../mvc/multiaction/MethodNameResolver.java | 2 +- .../NoSuchRequestHandlingMethodException.java | 2 +- .../multiaction/ParameterMethodNameResolver.java | 2 +- .../PropertiesMethodNameResolver.java | 2 +- .../AbstractControllerUrlHandlerMapping.java | 2 +- .../AnnotationControllerTypePredicate.java | 2 +- .../ControllerBeanNameHandlerMapping.java | 2 +- .../ControllerClassNameHandlerMapping.java | 2 +- .../servlet/mvc/support/RedirectAttributes.java | 2 +- .../mvc/support/RedirectAttributesModelMap.java | 2 +- .../resource/ResourceHttpRequestHandler.java | 2 +- .../web/servlet/support/BindStatus.java | 2 +- .../servlet/support/JspAwareRequestContext.java | 2 +- .../web/servlet/support/JstlUtils.java | 2 +- .../web/servlet/support/RequestContext.java | 2 +- .../support/RequestDataValueProcessor.java | 2 +- .../web/servlet/support/WebContentGenerator.java | 2 +- .../web/servlet/tags/BindErrorsTag.java | 2 +- .../web/servlet/tags/BindTag.java | 2 +- .../web/servlet/tags/EditorAwareTag.java | 2 +- .../web/servlet/tags/EscapeBodyTag.java | 2 +- .../web/servlet/tags/EvalTag.java | 2 +- .../web/servlet/tags/HtmlEscapeTag.java | 2 +- .../web/servlet/tags/HtmlEscapingAwareTag.java | 2 +- .../web/servlet/tags/MessageTag.java | 2 +- .../web/servlet/tags/NestedPathTag.java | 2 +- .../springframework/web/servlet/tags/Param.java | 2 +- .../web/servlet/tags/ParamAware.java | 2 +- .../web/servlet/tags/ParamTag.java | 2 +- .../web/servlet/tags/RequestContextAwareTag.java | 2 +- .../web/servlet/tags/ThemeTag.java | 2 +- .../web/servlet/tags/TransformTag.java | 2 +- .../springframework/web/servlet/tags/UrlTag.java | 2 +- .../tags/form/AbstractCheckedElementTag.java | 2 +- .../form/AbstractDataBoundFormElementTag.java | 2 +- .../web/servlet/tags/form/AbstractFormTag.java | 2 +- .../tags/form/AbstractHtmlElementBodyTag.java | 2 +- .../tags/form/AbstractHtmlElementTag.java | 2 +- .../tags/form/AbstractHtmlInputElementTag.java | 2 +- .../form/AbstractMultiCheckedElementTag.java | 2 +- .../form/AbstractSingleCheckedElementTag.java | 2 +- .../web/servlet/tags/form/ButtonTag.java | 2 +- .../web/servlet/tags/form/CheckboxTag.java | 2 +- .../web/servlet/tags/form/CheckboxesTag.java | 2 +- .../web/servlet/tags/form/ErrorsTag.java | 2 +- .../web/servlet/tags/form/FormTag.java | 2 +- .../web/servlet/tags/form/HiddenInputTag.java | 2 +- .../web/servlet/tags/form/InputTag.java | 2 +- .../web/servlet/tags/form/LabelTag.java | 2 +- .../web/servlet/tags/form/OptionTag.java | 2 +- .../web/servlet/tags/form/OptionWriter.java | 2 +- .../web/servlet/tags/form/OptionsTag.java | 2 +- .../web/servlet/tags/form/PasswordInputTag.java | 2 +- .../web/servlet/tags/form/RadioButtonTag.java | 2 +- .../web/servlet/tags/form/RadioButtonsTag.java | 2 +- .../web/servlet/tags/form/SelectTag.java | 2 +- .../tags/form/SelectedValueComparator.java | 2 +- .../web/servlet/tags/form/TagIdGenerator.java | 2 +- .../web/servlet/tags/form/TagWriter.java | 2 +- .../web/servlet/tags/form/TextareaTag.java | 2 +- .../web/servlet/tags/form/ValueFormatter.java | 2 +- .../web/servlet/theme/CookieThemeResolver.java | 2 +- .../web/servlet/theme/FixedThemeResolver.java | 2 +- .../web/servlet/theme/SessionThemeResolver.java | 2 +- .../web/servlet/view/AbstractUrlBasedView.java | 2 +- .../web/servlet/view/BeanNameViewResolver.java | 2 +- .../view/DefaultRequestToViewNameTranslator.java | 2 +- .../web/servlet/view/InternalResourceView.java | 2 +- .../view/InternalResourceViewResolver.java | 2 +- .../web/servlet/view/JstlView.java | 2 +- .../servlet/view/ResourceBundleViewResolver.java | 2 +- .../web/servlet/view/UrlBasedViewResolver.java | 2 +- .../web/servlet/view/XmlViewResolver.java | 2 +- .../view/document/AbstractJExcelView.java | 2 +- .../servlet/view/document/AbstractPdfView.java | 2 +- .../servlet/view/freemarker/FreeMarkerView.java | 2 +- .../ConfigurableJasperReportsView.java | 2 +- .../view/jasperreports/JasperReportsCsvView.java | 2 +- .../jasperreports/JasperReportsHtmlView.java | 2 +- .../JasperReportsMultiFormatView.java | 2 +- .../view/jasperreports/JasperReportsPdfView.java | 2 +- .../jasperreports/JasperReportsViewResolver.java | 2 +- .../view/jasperreports/JasperReportsXlsView.java | 2 +- .../tiles2/AbstractSpringPreparerFactory.java | 2 +- .../web/servlet/view/tiles2/TilesConfigurer.java | 2 +- .../servlet/view/velocity/VelocityConfig.java | 2 +- .../view/velocity/VelocityConfigurer.java | 2 +- .../view/velocity/VelocityLayoutView.java | 2 +- .../velocity/VelocityLayoutViewResolver.java | 2 +- .../web/servlet/view/velocity/VelocityView.java | 2 +- .../view/velocity/VelocityViewResolver.java | 2 +- .../web/servlet/view/xml/MarshallingView.java | 2 +- .../web/servlet/view/xslt/AbstractXsltView.java | 2 +- .../web/servlet/view/xslt/XsltView.java | 2 +- .../web/servlet/view/xslt/XsltViewResolver.java | 2 +- .../java/org/springframework/beans/Colour.java | 2 +- .../springframework/beans/DerivedTestBean.java | 2 +- .../springframework/beans/INestedTestBean.java | 2 +- .../java/org/springframework/beans/IOther.java | 2 +- .../springframework/beans/NestedTestBean.java | 2 +- .../java/org/springframework/beans/Person.java | 2 +- .../beans/SerializablePerson.java | 2 +- .../java/org/springframework/beans/TestBean.java | 2 +- .../beans/factory/DummyFactory.java | 2 +- .../beans/factory/LifecycleBean.java | 2 +- .../beans/factory/MustBeInitialized.java | 2 +- .../beans/factory/access/TestBean.java | 2 +- .../org/springframework/context/ACATester.java | 2 +- .../context/BeanThatBroadcasts.java | 2 +- .../springframework/context/BeanThatListens.java | 2 +- .../http/client/FreePortScanner.java | 2 +- .../web/context/AbstractBeanFactoryTests.java | 2 +- .../web/context/ServletConfigAwareBean.java | 2 +- .../web/context/ServletContextAwareBean.java | 2 +- .../servlet/ComplexWebApplicationContext.java | 2 +- .../web/servlet/FlashMapTests.java | 2 +- .../web/servlet/SimpleWebApplicationContext.java | 2 +- ...nnotationDrivenBeanDefinitionParserTests.java | 2 +- .../annotation/ViewControllerRegistryTests.java | 2 +- .../web/servlet/mvc/mapping/Controller.java | 2 +- .../servlet/mvc/mapping/WelcomeController.java | 2 +- .../annotation/RequestPartIntegrationTests.java | 2 +- .../support/RedirectAttributesModelMapTests.java | 2 +- .../RequestDataValueProcessorWrapper.java | 2 +- .../BindTagOutsideDispatcherServletTests.java | 2 +- .../web/servlet/tags/BindTagTests.java | 2 +- ...mlEscapeTagOutsideDispatcherServletTests.java | 2 +- .../MessageTagOutsideDispatcherServletTests.java | 2 +- .../web/servlet/tags/ParamTagTests.java | 2 +- .../web/servlet/tags/ParamTests.java | 2 +- .../web/servlet/tags/ThemeTagTests.java | 2 +- .../web/servlet/tags/UrlTagTests.java | 2 +- .../web/servlet/tags/form/ButtonTagTests.java | 2 +- .../web/servlet/tags/form/CheckboxTagTests.java | 2 +- .../servlet/tags/form/CheckboxesTagTests.java | 2 +- .../servlet/tags/form/HiddenInputTagTests.java | 2 +- .../web/servlet/tags/form/InputTagTests.java | 2 +- .../web/servlet/tags/form/ItemPet.java | 2 +- .../servlet/tags/form/OptionTagEnumTests.java | 2 +- .../servlet/tags/form/PasswordInputTagTests.java | 2 +- .../servlet/tags/form/RadioButtonTagTests.java | 2 +- .../servlet/tags/form/RadioButtonsTagTests.java | 2 +- .../web/servlet/tags/form/SimpleFloatEditor.java | 2 +- .../web/servlet/tags/form/TagWriterTests.java | 2 +- .../web/servlet/tags/form/TextareaTagTests.java | 2 +- .../ResourceBundleViewResolverNoCacheTests.java | 2 +- .../freemarker/FreeMarkerConfigurerTests.java | 2 +- ...igurableJasperReportsViewWithStreamTests.java | 2 +- ...igurableJasperReportsViewWithWriterTests.java | 2 +- .../jasperreports/JasperReportsCsvViewTests.java | 2 +- .../JasperReportsMultiFormatViewTests.java | 2 +- ...tsMultiFormatViewWithCustomMappingsTests.java | 2 +- .../jasperreports/JasperReportsPdfViewTests.java | 2 +- .../jasperreports/JasperReportsXlsViewTests.java | 2 +- .../view/velocity/TestVelocityEngine.java | 2 +- .../view/velocity/VelocityConfigurerTests.java | 2 +- ...AopNamespaceHandlerScopeIntegrationTests.java | 2 +- .../AdvisorAutoProxyCreatorIntegrationTests.java | 2 +- .../EnableCachingIntegrationTests.java | 2 +- ...nitionScannerJsr330ScopeIntegrationTests.java | 2 +- .../ltw/ComponentScanningWithLTWTests.java | 2 +- ...anDefinitionScannerScopeIntegrationTests.java | 2 +- .../core/env/EnvironmentIntegrationTests.java | 2 +- ...derConfigurerEnvironmentIntegrationTests.java | 2 +- .../spel/support/BeanFactoryTypeConverter.java | 2 +- .../expression/spel/support/Spr7538Tests.java | 16 ++++++++++++++++ .../CallCountingTransactionManager.java | 5 +++-- ...bleTransactionManagementIntegrationTests.java | 2 +- .../ProxyAnnotationDiscoveryTests.java | 2 +- .../advice/CountingAfterReturningAdvice.java | 2 +- .../java/test/advice/CountingBeforeAdvice.java | 2 +- src/test/java/test/advice/MethodCounter.java | 2 +- src/test/java/test/beans/Colour.java | 2 +- src/test/java/test/beans/INestedTestBean.java | 2 +- src/test/java/test/beans/IOther.java | 2 +- src/test/java/test/beans/ITestBean.java | 2 +- src/test/java/test/beans/IndexedTestBean.java | 2 +- src/test/java/test/beans/NestedTestBean.java | 2 +- src/test/java/test/beans/Pet.java | 2 +- src/test/java/test/beans/TestBean.java | 2 +- .../java/test/interceptor/NopInterceptor.java | 2 +- .../interceptor/SerializableNopInterceptor.java | 2 +- .../java/test/util/SerializationTestUtils.java | 2 +- 2569 files changed, 2646 insertions(+), 2568 deletions(-) diff --git a/spring-aop/src/main/java/org/springframework/aop/Advisor.java b/spring-aop/src/main/java/org/springframework/aop/Advisor.java index 8fe320c0329..8959552925b 100644 --- a/spring-aop/src/main/java/org/springframework/aop/Advisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/Advisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/AfterReturningAdvice.java b/spring-aop/src/main/java/org/springframework/aop/AfterReturningAdvice.java index f79397741ee..46362c2b132 100644 --- a/spring-aop/src/main/java/org/springframework/aop/AfterReturningAdvice.java +++ b/spring-aop/src/main/java/org/springframework/aop/AfterReturningAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/AopInvocationException.java b/spring-aop/src/main/java/org/springframework/aop/AopInvocationException.java index 404a1d08452..8c38ff4b81a 100644 --- a/spring-aop/src/main/java/org/springframework/aop/AopInvocationException.java +++ b/spring-aop/src/main/java/org/springframework/aop/AopInvocationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/DynamicIntroductionAdvice.java b/spring-aop/src/main/java/org/springframework/aop/DynamicIntroductionAdvice.java index 37f9cb75006..17f7645e7c3 100644 --- a/spring-aop/src/main/java/org/springframework/aop/DynamicIntroductionAdvice.java +++ b/spring-aop/src/main/java/org/springframework/aop/DynamicIntroductionAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/IntroductionAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/IntroductionAdvisor.java index aa49595d51a..b576aa4b219 100644 --- a/spring-aop/src/main/java/org/springframework/aop/IntroductionAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/IntroductionAdvisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java index 0ab9dd6b9b2..ffefed7eeec 100644 --- a/spring-aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java +++ b/spring-aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/IntroductionInfo.java b/spring-aop/src/main/java/org/springframework/aop/IntroductionInfo.java index 36ac7ea99be..6ba69a833da 100644 --- a/spring-aop/src/main/java/org/springframework/aop/IntroductionInfo.java +++ b/spring-aop/src/main/java/org/springframework/aop/IntroductionInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/MethodBeforeAdvice.java b/spring-aop/src/main/java/org/springframework/aop/MethodBeforeAdvice.java index cf3c87d2d1d..fb8b08e220c 100644 --- a/spring-aop/src/main/java/org/springframework/aop/MethodBeforeAdvice.java +++ b/spring-aop/src/main/java/org/springframework/aop/MethodBeforeAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/MethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/MethodMatcher.java index af2fb26fc1a..15526c1fc8a 100644 --- a/spring-aop/src/main/java/org/springframework/aop/MethodMatcher.java +++ b/spring-aop/src/main/java/org/springframework/aop/MethodMatcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/Pointcut.java b/spring-aop/src/main/java/org/springframework/aop/Pointcut.java index 05addda78bb..489e7beb820 100644 --- a/spring-aop/src/main/java/org/springframework/aop/Pointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/Pointcut.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/PointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/PointcutAdvisor.java index 6fb4d884974..7b7c1e78647 100644 --- a/spring-aop/src/main/java/org/springframework/aop/PointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/PointcutAdvisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/ProxyMethodInvocation.java b/spring-aop/src/main/java/org/springframework/aop/ProxyMethodInvocation.java index e49c697f3c0..935f745de46 100644 --- a/spring-aop/src/main/java/org/springframework/aop/ProxyMethodInvocation.java +++ b/spring-aop/src/main/java/org/springframework/aop/ProxyMethodInvocation.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/TargetClassAware.java b/spring-aop/src/main/java/org/springframework/aop/TargetClassAware.java index 53f308b332c..e2eccfac577 100644 --- a/spring-aop/src/main/java/org/springframework/aop/TargetClassAware.java +++ b/spring-aop/src/main/java/org/springframework/aop/TargetClassAware.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/TargetSource.java b/spring-aop/src/main/java/org/springframework/aop/TargetSource.java index bd3185952f2..9633b4b33b1 100644 --- a/spring-aop/src/main/java/org/springframework/aop/TargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/TargetSource.java @@ -1,5 +1,5 @@ /*< - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java index 2d09d4f6906..248e2f64167 100644 --- a/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java +++ b/spring-aop/src/main/java/org/springframework/aop/TrueClassFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java index a97872ab320..a8bf94dcae4 100644 --- a/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java +++ b/spring-aop/src/main/java/org/springframework/aop/TrueMethodMatcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java b/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java index 4416fe866db..553b0e9d6dd 100644 --- a/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/TruePointcut.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectInstanceFactory.java index 3c169119775..2f1e7aaa6bc 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectInstanceFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectInstanceFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java index 0ef76eba69d..42a2c6f729f 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java index 7f869ed80d1..fd5b0d64c4a 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAfterAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAopUtils.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAopUtils.java index 16308507e17..2155c81cd54 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAopUtils.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAopUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java index c4ddcaab9ab..7e101ea57d6 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java index 49fa6da5eb7..70b6575076b 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java index 8d80da138c5..3463e8cc613 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJProxyUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJWeaverMessageHandler.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJWeaverMessageHandler.java index c8329e413ad..4505e6f3300 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJWeaverMessageHandler.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJWeaverMessageHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java index 3838c7bda6c..27618c9b466 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/DeclareParentsAdvisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java index a2e8a6a64ca..fbdcf093131 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java index 4cc0b44f744..fa470759cdd 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/RuntimeTestWalker.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java index 3316e765824..40049e978e0 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/SimpleAspectInstanceFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java index 58173805d74..7f550a333d1 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/SingletonAspectInstanceFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java index 1ae00d24210..adb8c4db372 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/TypePatternClassFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java index 92721d5c778..5b3f48bce87 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AnnotationAwareAspectJAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AnnotationAwareAspectJAutoProxyCreator.java index 62d14147178..9eff81682b2 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AnnotationAwareAspectJAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AnnotationAwareAspectJAutoProxyCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorFactory.java index a85a138ca26..36bf1151052 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java index 3aefe815c94..ccf2aa610bf 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectInstanceFactory.java index fecd7b2e2a8..81a6c2a3ad1 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectInstanceFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/BeanFactoryAspectInstanceFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java index bf1856b6a43..b9863ab67ad 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/InstantiationModelAwarePointcutAdvisorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/NotAnAtAspectException.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/NotAnAtAspectException.java index c4401b17cc9..1c45cbc2f65 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/NotAnAtAspectException.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/NotAnAtAspectException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SimpleMetadataAwareAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SimpleMetadataAwareAspectInstanceFactory.java index 5bea20f88f4..bb623b372b7 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SimpleMetadataAwareAspectInstanceFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SimpleMetadataAwareAspectInstanceFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SingletonMetadataAwareAspectInstanceFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SingletonMetadataAwareAspectInstanceFactory.java index 8478f7390db..ef9014a1445 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SingletonMetadataAwareAspectInstanceFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/SingletonMetadataAwareAspectInstanceFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java index 9f70ed53a07..dbfcbd380e3 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java index d05e67b5dad..0dd176354eb 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java b/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java index e8decbf4697..6e58344f80f 100644 --- a/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java +++ b/spring-aop/src/main/java/org/springframework/aop/config/AbstractInterceptorDrivenBeanDefinitionDecorator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AdviceEntry.java b/spring-aop/src/main/java/org/springframework/aop/config/AdviceEntry.java index 180ea636a36..85e59523a76 100644 --- a/spring-aop/src/main/java/org/springframework/aop/config/AdviceEntry.java +++ b/spring-aop/src/main/java/org/springframework/aop/config/AdviceEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java b/spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java index b28e6d3e03a..374e40290a6 100644 --- a/spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java +++ b/spring-aop/src/main/java/org/springframework/aop/config/AdvisorComponentDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AdvisorEntry.java b/spring-aop/src/main/java/org/springframework/aop/config/AdvisorEntry.java index dc3b4f9ea8e..13be36d8f3f 100644 --- a/spring-aop/src/main/java/org/springframework/aop/config/AdvisorEntry.java +++ b/spring-aop/src/main/java/org/springframework/aop/config/AdvisorEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java b/spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java index 6d97412f9d5..3da1f13f0a2 100644 --- a/spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java +++ b/spring-aop/src/main/java/org/springframework/aop/config/AopConfigUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java b/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java index b250bf747e6..611376efb92 100644 --- a/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java +++ b/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java b/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java index 9d19ec544b2..73ff37197c0 100644 --- a/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java +++ b/spring-aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java b/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java index d9e5b43615b..aa3d70d11e7 100644 --- a/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java +++ b/spring-aop/src/main/java/org/springframework/aop/config/AspectJAutoProxyBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java b/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java index f97d8230eb5..9f75cba9be9 100644 --- a/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java +++ b/spring-aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/config/PointcutEntry.java b/spring-aop/src/main/java/org/springframework/aop/config/PointcutEntry.java index e1cf5f65f32..10f6327e5c1 100644 --- a/spring-aop/src/main/java/org/springframework/aop/config/PointcutEntry.java +++ b/spring-aop/src/main/java/org/springframework/aop/config/PointcutEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java b/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java index 797b5f66987..0d2daf364f5 100644 --- a/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java +++ b/spring-aop/src/main/java/org/springframework/aop/config/ScopedProxyBeanDefinitionDecorator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/Advised.java b/spring-aop/src/main/java/org/springframework/aop/framework/Advised.java index ffc317ce376..3c822cf2da5 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/Advised.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/Advised.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java index 63d87112690..e5f89177b60 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AopConfigException.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopConfigException.java index 33e09ae1d6b..26a45a46571 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/AopConfigException.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/AopConfigException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AopContext.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopContext.java index ca61dcc557b..13a86ecb899 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/AopContext.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/AopContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxy.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxy.java index c002e43a517..80c66905643 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxy.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyFactory.java index 595eb35c65d..9a2e2298e4f 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java index a602cefe37c..5ac4ed7f664 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java index defb0bada9e..90eeef7b48c 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/DefaultAdvisorChainFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyConfig.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyConfig.java index e8decfcf94c..fc7ae7b878a 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyConfig.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java index 4adef07407e..e1867efd7e3 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyCreatorSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java index 257f2f2190b..a369f56c824 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java b/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java index 5062a916c5b..c9ac099b484 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/ReflectiveMethodInvocation.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapter.java index b1f5a6396d2..425c3f87c4c 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapter.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistry.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistry.java index 1c69281c708..9eacf479bad 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistry.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java index 07257fecb72..a921e6e5095 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java index 9b6dfa3fd95..9f8f698faf5 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/AfterReturningAdviceInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java index da5f7025edf..136f004586b 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/DefaultAdvisorAdapterRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java index 222a63129d6..6fc3cdef5ed 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java index 3aebd504845..83d7b8e851a 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/MethodBeforeAdviceInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java index 386d3a75df1..687a6d5f8ba 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java index 32f3d2d44d1..69b0bd1cc57 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java index c0e840b055b..e95e513caaa 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/adapter/UnknownAdviceTypeException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java index c9aae651d56..035442282de 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAdvisorAutoProxyCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AutoProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AutoProxyUtils.java index b48ae0905ea..88a75e877a6 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AutoProxyUtils.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AutoProxyUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.java index ab056cd6884..e417f92df02 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanFactoryAdvisorRetrievalHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java index 7b517282c8d..e91f9db74a4 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java index f84bf4f55db..953a751d320 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/DefaultAdvisorAutoProxyCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/InfrastructureAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/InfrastructureAdvisorAutoProxyCreator.java index d48716f9d00..90034eafbba 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/InfrastructureAdvisorAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/InfrastructureAdvisorAutoProxyCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/ProxyCreationContext.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/ProxyCreationContext.java index 0adb7d7e2a2..ce350d651b5 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/ProxyCreationContext.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/ProxyCreationContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/TargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/TargetSourceCreator.java index 5acae865f49..67f9638ce45 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/TargetSourceCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/TargetSourceCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java index 510b6d8da1d..c1ef00cbe28 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java index 9667931793f..d972b95cf16 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/QuickTargetSourceCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java index 82db223aa35..0159d307a16 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractMonitoringInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java index 438fa3cff76..7c29c775bce 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java index 4298008d9be..8f6f3ee479a 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java index 93228b1af76..a5d1f508051 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/CustomizableTraceInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java index 4f9b95a9197..0a2c2ec8e94 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/DebugInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java index bffad2c4d1f..a4ce58d5282 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisors.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java index 9d25008e912..c5443e7dc31 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/ExposeInvocationInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java index 8f14116ac8c..5ff0f9cba8c 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/JamonPerformanceMonitorInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java index fd3f5375604..4362c5de10d 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java index ec794cb5fd6..e70f502fd10 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleTraceInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java b/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java index cc07afc997b..95009495ba3 100644 --- a/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java +++ b/spring-aop/src/main/java/org/springframework/aop/scope/DefaultScopedObject.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedObject.java b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedObject.java index 9e46d230cd2..4b7046e3595 100644 --- a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedObject.java +++ b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedObject.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java index 2193d8b6746..34bc7b9b740 100644 --- a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java +++ b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyUtils.java b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyUtils.java index e59267d30f3..fdd0253d6ed 100644 --- a/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyUtils.java +++ b/spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractBeanFactoryPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractBeanFactoryPointcutAdvisor.java index 938a7cb7421..3715a9ca702 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractBeanFactoryPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractBeanFactoryPointcutAdvisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java index dc48762686b..74a62a7ba9b 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractExpressionPointcut.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java index c0fcb7c791b..53494a14ce5 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractGenericPointcutAdvisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java index 4b362c8407e..8dc2fb0a3ea 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/AbstractPointcutAdvisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java b/spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java index 4abb43c8f22..1dea2cb113b 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/ClassFilters.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java index 1ec8a012299..b537a6ab8e5 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java index 008e9105c90..4de481fcba0 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/ControlFlowPointcut.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java index 1324847e126..92fb3c45525 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultBeanFactoryPointcutAdvisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java index f9a7e33e5dd..e1aad6a1701 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java index 64d6651af55..f4b16915f94 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java index ac0199a69ea..5eeeea60d60 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/DelegatePerTargetObjectIntroductionInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2087 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java index 53211519e38..c27d1872cff 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/DelegatingIntroductionInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java index 6a6a70c9851..9427a647deb 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java index e70530b0982..35d765c2977 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcherPointcut.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/IntroductionInfoSupport.java b/spring-aop/src/main/java/org/springframework/aop/support/IntroductionInfoSupport.java index 1279087de17..c8807f76393 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/IntroductionInfoSupport.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/IntroductionInfoSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java index 82409fc0091..071da29247a 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/JdkRegexpMethodPointcut.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java b/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java index 75d56678adb..be8b5bca7f8 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java index ddbec48ffeb..69389d0bf57 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcut.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcutAdvisor.java index ef939cfb553..c2f85b58811 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/NameMatchMethodPointcutAdvisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java b/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java index 267083cc703..2bfbcb1c323 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/Pointcuts.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/RegexpMethodPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/RegexpMethodPointcutAdvisor.java index 5cc14d909bf..1edb2d746b2 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/RegexpMethodPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/RegexpMethodPointcutAdvisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java b/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java index 955f92ef03e..461252e6179 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcher.java index 27209a18ac1..6efebf1106b 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcher.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java index 9bafe1bd499..acdbbeff881 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java index 8a2d9a6a272..3192fab5fe9 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java index 86259b7abe3..6fdd24ef92e 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/AbstractLazyCreationTargetSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java index ccb8b56637a..91e1b72ee7a 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/target/CommonsPoolTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/CommonsPoolTargetSource.java index 096fd2f46fa..47a35f756e8 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/CommonsPoolTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/CommonsPoolTargetSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java index f6358585e27..193259ba8db 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/EmptyTargetSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java index 37f5b99d46f..dcb6108e871 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/LazyInitTargetSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/target/PoolingConfig.java b/spring-aop/src/main/java/org/springframework/aop/target/PoolingConfig.java index ddaad787043..c671f024f5a 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/PoolingConfig.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/PoolingConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/target/PrototypeTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/PrototypeTargetSource.java index ed372d085ec..81642f6b2e4 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/PrototypeTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/PrototypeTargetSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java index 911eb837f11..14560404c47 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/SimpleBeanTargetSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java index 844073a5ab8..cd2dfb0c0c0 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/SingletonTargetSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSourceStats.java b/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSourceStats.java index 688b8913306..f3801a79dbe 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSourceStats.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/ThreadLocalTargetSourceStats.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java index 865e4fa6997..7aba951ee57 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/BeanFactoryRefreshableTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/BeanFactoryRefreshableTargetSource.java index 76c17e33378..f2f894dbec0 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/BeanFactoryRefreshableTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/BeanFactoryRefreshableTargetSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/Refreshable.java b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/Refreshable.java index 82d16e7fd48..187544e6d84 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/Refreshable.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/Refreshable.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverAnnotationTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverAnnotationTests.java index 0d523ba87e3..5efbb2f893a 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverAnnotationTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverAnnotationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscovererTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscovererTests.java index 73ec4283958..7662195c0fd 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscovererTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscovererTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java index 630c1e3ea44..cf96bf3f06b 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java index 1c30480fbd6..ac6dc31a2a2 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java index 2af6f16be4f..8c84e801b8d 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJAdviceParameterNameDiscovererTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJAdviceParameterNameDiscovererTests.java index d9769685c5d..2b92a5c6611 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJAdviceParameterNameDiscovererTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJAdviceParameterNameDiscovererTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java index c3e1f0c120b..b8c336b0fbb 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java index 7ad0b7c7682..fea874179e0 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java index 6a5a746063c..d15b0a11cab 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java index 1627f57d69c..88beb1455a5 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java index 472b495a50d..af55e122a63 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectMetadataTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java index c0b30c27e28..93aebbfa673 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactoryTests.java index 085e8c5d9f5..f01d1bb9c6b 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactoryTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ReflectiveAspectJAdvisorFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java index 9c4b78b54d3..08d95808edc 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java index de575c88426..0d86588b8c9 100644 --- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java index fcb34b4012d..ba0b767921d 100644 --- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java b/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java index 40209c7d7bf..3dbd38f98c6 100644 --- a/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java index 96a22b33536..dca823663df 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java index 5940cd57187..03b971fed02 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java index f4602bf0b5c..4e815534441 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java index 64abdd4891e..05a0fc327af 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java index 1255baae2a9..ddf48d28d82 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java index 77707f16bc2..fe72f963255 100644 --- a/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java index 0d2edb525aa..964fac9efaf 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java index deceb5c2151..77aad8e9ff1 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java index d13c8e65125..d0cee0780eb 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/DebugInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java index fc19053502b..170f5b34bc5 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java index f514800cfb5..ae224b6385c 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java index c36ca5ba68d..bf2c45fc2c6 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/PerformanceMonitorInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java index 6732be2f90a..6efc651d272 100644 --- a/spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java b/spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java index d968e957edc..9ec42626db3 100644 --- a/spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/scope/DefaultScopedObjectTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java index 83bb13216e0..f44b215755e 100644 --- a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java index 6090b16b8dd..505697408c9 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java index 8df910eecb9..42992fb57c2 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java index b66105de6c7..2ca2acd665e 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java index e6c08c08f28..6288f7674af 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java index cb812d668de..1b7c8d60b36 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java index 404fc55d81f..0848ab58a9a 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/JdkRegexpMethodPointcutTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java b/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java index 614ba7a532e..5b3ceb039b8 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java index a36856ddd36..8b89281e763 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java index 72255612dfe..1ed7cd8430a 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java index bab75b7a3d4..e52d9b14e0e 100644 --- a/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests.java b/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests.java index 269d585e9d4..e70d2c7baa3 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java index be9b929475f..b3d6ceef18e 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java index 55661a89012..2a584f9a5c5 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/LazyCreationTargetSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java index 4283695ba6c..984261bcc96 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java index 39325e2dcbd..93205fb1b9e 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java index 3317694eff0..204f3d8abdb 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java index 875ba6dc827..c896b9e638c 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java index 3f90fb8aefc..3010a4674de 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java b/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java index d59b8ddd3be..91a49faa0fe 100644 --- a/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java +++ b/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/test/aop/DefaultLockable.java b/spring-aop/src/test/java/test/aop/DefaultLockable.java index a7f6c4ac7ef..1fddaca9f19 100644 --- a/spring-aop/src/test/java/test/aop/DefaultLockable.java +++ b/spring-aop/src/test/java/test/aop/DefaultLockable.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/test/aop/Lockable.java b/spring-aop/src/test/java/test/aop/Lockable.java index 135a9914246..039b06e8a7d 100644 --- a/spring-aop/src/test/java/test/aop/Lockable.java +++ b/spring-aop/src/test/java/test/aop/Lockable.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/test/aop/MethodCounter.java b/spring-aop/src/test/java/test/aop/MethodCounter.java index 745b7289cbb..ae673bd168d 100644 --- a/spring-aop/src/test/java/test/aop/MethodCounter.java +++ b/spring-aop/src/test/java/test/aop/MethodCounter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/test/aop/NopInterceptor.java b/spring-aop/src/test/java/test/aop/NopInterceptor.java index fd4d9e9ff60..20b9ece08fd 100644 --- a/spring-aop/src/test/java/test/aop/NopInterceptor.java +++ b/spring-aop/src/test/java/test/aop/NopInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java b/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java index 5a21b1d7f09..064df39ab52 100644 --- a/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java +++ b/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/test/beans/DerivedTestBean.java b/spring-aop/src/test/java/test/beans/DerivedTestBean.java index a26ee9b471b..225ae1a300d 100644 --- a/spring-aop/src/test/java/test/beans/DerivedTestBean.java +++ b/spring-aop/src/test/java/test/beans/DerivedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/test/beans/INestedTestBean.java b/spring-aop/src/test/java/test/beans/INestedTestBean.java index 87bfc267738..56c9d829ee3 100644 --- a/spring-aop/src/test/java/test/beans/INestedTestBean.java +++ b/spring-aop/src/test/java/test/beans/INestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/test/beans/IOther.java b/spring-aop/src/test/java/test/beans/IOther.java index e5b576de3b1..f3c6263261e 100644 --- a/spring-aop/src/test/java/test/beans/IOther.java +++ b/spring-aop/src/test/java/test/beans/IOther.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/test/beans/NestedTestBean.java b/spring-aop/src/test/java/test/beans/NestedTestBean.java index 6855305fb3d..edc145ad7d2 100644 --- a/spring-aop/src/test/java/test/beans/NestedTestBean.java +++ b/spring-aop/src/test/java/test/beans/NestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/test/beans/Person.java b/spring-aop/src/test/java/test/beans/Person.java index d1a441945ee..974d7d9b772 100644 --- a/spring-aop/src/test/java/test/beans/Person.java +++ b/spring-aop/src/test/java/test/beans/Person.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/test/beans/SerializablePerson.java b/spring-aop/src/test/java/test/beans/SerializablePerson.java index 60fa67417de..3aa60f1fdc0 100644 --- a/spring-aop/src/test/java/test/beans/SerializablePerson.java +++ b/spring-aop/src/test/java/test/beans/SerializablePerson.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/test/beans/SideEffectBean.java b/spring-aop/src/test/java/test/beans/SideEffectBean.java index 82871af7527..621ecbc3a2c 100644 --- a/spring-aop/src/test/java/test/beans/SideEffectBean.java +++ b/spring-aop/src/test/java/test/beans/SideEffectBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/test/beans/TestBean.java b/spring-aop/src/test/java/test/beans/TestBean.java index 5c5e4abb232..3f50f93836c 100644 --- a/spring-aop/src/test/java/test/beans/TestBean.java +++ b/spring-aop/src/test/java/test/beans/TestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/test/beans/subpkg/DeepBean.java b/spring-aop/src/test/java/test/beans/subpkg/DeepBean.java index 211e1010234..b18646f4d02 100644 --- a/spring-aop/src/test/java/test/beans/subpkg/DeepBean.java +++ b/spring-aop/src/test/java/test/beans/subpkg/DeepBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java b/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java index be5819bb3cc..5aa69c1fa89 100644 --- a/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java +++ b/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/test/util/SerializationTestUtils.java b/spring-aop/src/test/java/test/util/SerializationTestUtils.java index 132bd33d4eb..e9bc9fee04a 100644 --- a/spring-aop/src/test/java/test/util/SerializationTestUtils.java +++ b/spring-aop/src/test/java/test/util/SerializationTestUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/test/util/TestResourceUtils.java b/spring-aop/src/test/java/test/util/TestResourceUtils.java index 9d764e6b83f..b294c1b6064 100644 --- a/spring-aop/src/test/java/test/util/TestResourceUtils.java +++ b/spring-aop/src/test/java/test/util/TestResourceUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aop/src/test/java/test/util/TimeStamped.java b/spring-aop/src/test/java/test/util/TimeStamped.java index 484d5dda44b..4fedb8998b0 100644 --- a/spring-aop/src/test/java/test/util/TimeStamped.java +++ b/spring-aop/src/test/java/test/util/TimeStamped.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerAspect.aj index 5abf0e29893..760cea9dc1e 100644 --- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerAspect.aj +++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerAspect.aj @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractDependencyInjectionAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractDependencyInjectionAspect.aj index 42a27944d42..390e1dc989c 100644 --- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractDependencyInjectionAspect.aj +++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractDependencyInjectionAspect.aj @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractInterfaceDrivenDependencyInjectionAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractInterfaceDrivenDependencyInjectionAspect.aj index 0a7303eca84..5cd0140d464 100644 --- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractInterfaceDrivenDependencyInjectionAspect.aj +++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractInterfaceDrivenDependencyInjectionAspect.aj @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj index 06e32f4bfb8..5313df9ed16 100644 --- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj +++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AnnotationBeanConfigurerAspect.aj @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java index 9aca558660f..869b7a72d8a 100644 --- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java +++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj index d91b05d1170..351c11d7d9e 100644 --- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj +++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/GenericInterfaceDrivenDependencyInjectionAspect.aj @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj b/spring-aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj index ca4d14a66bf..a9a6da82e98 100644 --- a/spring-aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj +++ b/spring-aspects/src/main/java/org/springframework/cache/aspectj/AbstractCacheAspect.aj @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/main/java/org/springframework/cache/aspectj/AnnotationCacheAspect.aj b/spring-aspects/src/main/java/org/springframework/cache/aspectj/AnnotationCacheAspect.aj index 0687b3c54c9..be3957a3a08 100644 --- a/spring-aspects/src/main/java/org/springframework/cache/aspectj/AnnotationCacheAspect.aj +++ b/spring-aspects/src/main/java/org/springframework/cache/aspectj/AnnotationCacheAspect.aj @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/main/java/org/springframework/cache/aspectj/AspectJCachingConfiguration.java b/spring-aspects/src/main/java/org/springframework/cache/aspectj/AspectJCachingConfiguration.java index ec6bda35ebe..740ddaddcae 100644 --- a/spring-aspects/src/main/java/org/springframework/cache/aspectj/AspectJCachingConfiguration.java +++ b/spring-aspects/src/main/java/org/springframework/cache/aspectj/AspectJCachingConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj index aa6ad3a9cb6..e373607d558 100644 --- a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj +++ b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj index 56bf0829390..1c50c64bbe6 100644 --- a/spring-aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj +++ b/spring-aspects/src/main/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControl.aj @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java b/spring-aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java index 07aee0364ab..913d147b3e1 100644 --- a/spring-aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java +++ b/spring-aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.mock.staticmock; import java.lang.annotation.ElementType; diff --git a/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj b/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj index 491f666992e..3594725aaee 100644 --- a/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj +++ b/spring-aspects/src/main/java/org/springframework/orm/jpa/aspectj/JpaExceptionTranslatorAspect.aj @@ -1,3 +1,19 @@ +/* + * Copyright 2002-2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.orm.jpa.aspectj; import javax.persistence.EntityManager; diff --git a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj index 3daa4761163..ed0956ef9fe 100644 --- a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj +++ b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AbstractTransactionAspect.aj @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AnnotationTransactionAspect.aj b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AnnotationTransactionAspect.aj index 36ac0eb2cb1..1fe8de9030b 100644 --- a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AnnotationTransactionAspect.aj +++ b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AnnotationTransactionAspect.aj @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AspectJTransactionManagementConfiguration.java b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AspectJTransactionManagementConfiguration.java index 54c30a1af0a..582de644628 100644 --- a/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AspectJTransactionManagementConfiguration.java +++ b/spring-aspects/src/main/java/org/springframework/transaction/aspectj/AspectJTransactionManagementConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/AutoProxyWithCodeStyleAspectsTests.java b/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/AutoProxyWithCodeStyleAspectsTests.java index d5667cd1555..e6f8cb8459e 100644 --- a/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/AutoProxyWithCodeStyleAspectsTests.java +++ b/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/AutoProxyWithCodeStyleAspectsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/CodeStyleAspect.aj b/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/CodeStyleAspect.aj index 374bc00909a..0758d3a403a 100644 --- a/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/CodeStyleAspect.aj +++ b/spring-aspects/src/test/java/org/springframework/aop/aspectj/autoproxy/CodeStyleAspect.aj @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/beans/Colour.java b/spring-aspects/src/test/java/org/springframework/beans/Colour.java index 17fd24fec79..a992a2ebfc6 100644 --- a/spring-aspects/src/test/java/org/springframework/beans/Colour.java +++ b/spring-aspects/src/test/java/org/springframework/beans/Colour.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java index 0940539f54a..a10846ba95a 100644 --- a/spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-aspects/src/test/java/org/springframework/beans/INestedTestBean.java index c5c4ed5e679..e0ae5f20a3f 100644 --- a/spring-aspects/src/test/java/org/springframework/beans/INestedTestBean.java +++ b/spring-aspects/src/test/java/org/springframework/beans/INestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/beans/IOther.java b/spring-aspects/src/test/java/org/springframework/beans/IOther.java index 6a8f74187cb..d7fb346185a 100644 --- a/spring-aspects/src/test/java/org/springframework/beans/IOther.java +++ b/spring-aspects/src/test/java/org/springframework/beans/IOther.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/beans/ITestBean.java b/spring-aspects/src/test/java/org/springframework/beans/ITestBean.java index cdf5ef510dd..478999c05da 100644 --- a/spring-aspects/src/test/java/org/springframework/beans/ITestBean.java +++ b/spring-aspects/src/test/java/org/springframework/beans/ITestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-aspects/src/test/java/org/springframework/beans/IndexedTestBean.java index ddb091770ee..d7af36ed641 100644 --- a/spring-aspects/src/test/java/org/springframework/beans/IndexedTestBean.java +++ b/spring-aspects/src/test/java/org/springframework/beans/IndexedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-aspects/src/test/java/org/springframework/beans/NestedTestBean.java index 0eb8df5c8ae..88b450b9171 100644 --- a/spring-aspects/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-aspects/src/test/java/org/springframework/beans/NestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/beans/TestBean.java b/spring-aspects/src/test/java/org/springframework/beans/TestBean.java index 7842bbfeacf..ac8e5ea4857 100644 --- a/spring-aspects/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-aspects/src/test/java/org/springframework/beans/TestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java index b92077767bb..73f37a8f9eb 100644 --- a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java +++ b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/SpringConfiguredWithAutoProxyingTests.java b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/SpringConfiguredWithAutoProxyingTests.java index 16e2522d934..1c678ba6b19 100644 --- a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/SpringConfiguredWithAutoProxyingTests.java +++ b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/SpringConfiguredWithAutoProxyingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/XmlBeanConfigurerTests.java b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/XmlBeanConfigurerTests.java index 47d3fef664a..c5cc835a3da 100644 --- a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/XmlBeanConfigurerTests.java +++ b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/XmlBeanConfigurerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractAnnotationTest.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractAnnotationTest.java index b3f9d4937b7..3771a21b9f7 100644 --- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractAnnotationTest.java +++ b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractAnnotationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTest.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTest.java index 81a7793fc8f..df237674754 100644 --- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTest.java +++ b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java b/spring-aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java index a6d1b4f7bda..52a1b4265e1 100644 --- a/spring-aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java +++ b/spring-aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/cache/config/CacheableService.java b/spring-aspects/src/test/java/org/springframework/cache/config/CacheableService.java index 09e2fc4c4b1..81dd758d19d 100644 --- a/spring-aspects/src/test/java/org/springframework/cache/config/CacheableService.java +++ b/spring-aspects/src/test/java/org/springframework/cache/config/CacheableService.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java b/spring-aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java index 33cc40d0a44..95edbcd9d64 100644 --- a/spring-aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java +++ b/spring-aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java b/spring-aspects/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java index 13364bdbd17..b4cc29458b2 100644 --- a/spring-aspects/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java +++ b/spring-aspects/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java b/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java index 3bd1741699c..8c1584fc99c 100644 --- a/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java +++ b/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java index 946e33aa01e..ad9bac54438 100644 --- a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java +++ b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person.java b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person.java index a3b15c59c63..ca98b77f923 100644 --- a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person.java +++ b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj index 9e13013bb1f..a6a62cdbb64 100644 --- a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj +++ b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java index 0c0b3cb81cf..969cf90a8fb 100644 --- a/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java +++ b/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java index f718e093855..938265b97c4 100644 --- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java +++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,8 +12,6 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * - * Created on 11 Sep 2006 by Adrian Colyer */ package org.springframework.transaction.aspectj; diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java index 18763dcc742..07abf06c64d 100644 --- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java +++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -12,8 +12,6 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * - * Created on 11 Sep 2006 by Adrian Colyer */ package org.springframework.transaction.aspectj; diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ITransactional.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ITransactional.java index 7e8ef63d165..44c3ea36b38 100644 --- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ITransactional.java +++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/ITransactional.java @@ -1,3 +1,19 @@ +/* + * Copyright 2002-2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.transaction.aspectj; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/MethodAnnotationOnClassWithNoInterface.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/MethodAnnotationOnClassWithNoInterface.java index 437a1a4f07c..3631b05550a 100644 --- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/MethodAnnotationOnClassWithNoInterface.java +++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/MethodAnnotationOnClassWithNoInterface.java @@ -1,3 +1,19 @@ +/* + * Copyright 2002-2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.transaction.aspectj; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java index 407a5e2e991..be562b2585b 100644 --- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java +++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionalAnnotationOnlyOnClassWithNoInterface.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionalAnnotationOnlyOnClassWithNoInterface.java index 93bd225f7ca..bca935ce3f5 100644 --- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionalAnnotationOnlyOnClassWithNoInterface.java +++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionalAnnotationOnlyOnClassWithNoInterface.java @@ -1,3 +1,19 @@ +/* + * Copyright 2002-2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.transaction.aspectj; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java b/spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java index 9fbac3fef8a..ef170a1baaf 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java +++ b/spring-beans/src/main/java/org/springframework/beans/BeanInstantiationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java index 6890b9e706b..f806b9f6a5e 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java +++ b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttribute.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java index ca62f6fa3ca..c683f50ab8a 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataAttributeAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataElement.java b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataElement.java index 70b3667bee8..6b6229d4165 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeanMetadataElement.java +++ b/spring-beans/src/main/java/org/springframework/beans/BeanMetadataElement.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/BeanWrapper.java b/spring-beans/src/main/java/org/springframework/beans/BeanWrapper.java index 070fdbf8dea..628ee8e78a5 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeanWrapper.java +++ b/spring-beans/src/main/java/org/springframework/beans/BeanWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/BeansException.java b/spring-beans/src/main/java/org/springframework/beans/BeansException.java index 2aae901c722..efbed41edf5 100644 --- a/spring-beans/src/main/java/org/springframework/beans/BeansException.java +++ b/spring-beans/src/main/java/org/springframework/beans/BeansException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java b/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java index fc44cd572d4..5151193e8fe 100644 --- a/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java +++ b/spring-beans/src/main/java/org/springframework/beans/ConversionNotSupportedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/FatalBeanException.java b/spring-beans/src/main/java/org/springframework/beans/FatalBeanException.java index d1d30a5e2fa..84fe47bb239 100644 --- a/spring-beans/src/main/java/org/springframework/beans/FatalBeanException.java +++ b/spring-beans/src/main/java/org/springframework/beans/FatalBeanException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java b/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java index 20260432a27..0f0c5931627 100644 --- a/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java +++ b/spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java b/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java index 51ff5161f18..96db41d162b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java +++ b/spring-beans/src/main/java/org/springframework/beans/InvalidPropertyException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/Mergeable.java b/spring-beans/src/main/java/org/springframework/beans/Mergeable.java index dc142e0f994..cba64d94f89 100644 --- a/spring-beans/src/main/java/org/springframework/beans/Mergeable.java +++ b/spring-beans/src/main/java/org/springframework/beans/Mergeable.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java b/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java index 467c595ed60..e079bb0f56e 100644 --- a/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java +++ b/spring-beans/src/main/java/org/springframework/beans/MethodInvocationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java b/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java index 7a21fbf0e1f..390b3f8a12f 100644 --- a/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java +++ b/spring-beans/src/main/java/org/springframework/beans/MutablePropertyValues.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java b/spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java index cba93573fe0..2001d09eed9 100644 --- a/spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java +++ b/spring-beans/src/main/java/org/springframework/beans/NotReadablePropertyException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java b/spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java index 2a5042c94f1..de734c28c30 100644 --- a/spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java +++ b/spring-beans/src/main/java/org/springframework/beans/NotWritablePropertyException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java b/spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java index 6ed4d3c578a..f1ad856b3ff 100644 --- a/spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java +++ b/spring-beans/src/main/java/org/springframework/beans/NullValueInNestedPathException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java index b2eafd44339..68bdde7412f 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java index 80168252ac9..621bae5325b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java index 9fa559a8e94..9da1ed0658b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyAccessorUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java b/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java index 9768d25a26e..1919a47122b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyBatchUpdateException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrar.java b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrar.java index c14de75ed1d..549334393f3 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrar.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistry.java b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistry.java index 9eb3af78af7..f76df2a2d84 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistry.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java index 6b3aa68b6d1..81854100d4e 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyEditorRegistrySupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyMatches.java b/spring-beans/src/main/java/org/springframework/beans/PropertyMatches.java index 9584b49107b..82830a198cd 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyMatches.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyMatches.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java b/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java index f08d0291089..feecaf0e590 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/PropertyValues.java b/spring-beans/src/main/java/org/springframework/beans/PropertyValues.java index 6ecb77e16d5..8af2c77ff79 100644 --- a/spring-beans/src/main/java/org/springframework/beans/PropertyValues.java +++ b/spring-beans/src/main/java/org/springframework/beans/PropertyValues.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java b/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java index bac7fc93ba1..d1b7c48130c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java +++ b/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java index b27aa6f4325..ab584354b85 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanClassLoaderAware.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java index bd5998cc7f2..2ffe909a941 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationNotAllowedException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationNotAllowedException.java index cb270e619c1..480ff828575 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationNotAllowedException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCreationNotAllowedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCurrentlyInCreationException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCurrentlyInCreationException.java index 9e3d1a59060..050444bb4ef 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanCurrentlyInCreationException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanCurrentlyInCreationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java index 1ba73bbde06..47a2ec8c14b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanDefinitionStoreException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanExpressionException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanExpressionException.java index f4b5be3df28..b935abfbb4b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanExpressionException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanExpressionException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java index 0debc41c7df..2d18e67b1ac 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryAware.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryAware.java index 1a7df36df23..a283217c248 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryAware.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanFactoryAware.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanInitializationException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanInitializationException.java index aaace2cf34b..c52d0ae7661 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanInitializationException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanInitializationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsAbstractException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsAbstractException.java index 46a99fc5a24..f7020130e84 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsAbstractException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsAbstractException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java index 43b2bddc756..af47ab3f80d 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanIsNotAFactoryException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java b/spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java index b853cec073a..3b2914e6c9d 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/BeanNotOfRequiredTypeException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/CannotLoadBeanClassException.java b/spring-beans/src/main/java/org/springframework/beans/factory/CannotLoadBeanClassException.java index e620437b532..772da666e2d 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/CannotLoadBeanClassException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/CannotLoadBeanClassException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java index 536c2e695c8..5554afc2b3d 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/DisposableBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBean.java index d16bd68551e..84763c37f6c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java b/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java index 791b30557e6..9e8e0e20735 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/FactoryBeanNotInitializedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/HierarchicalBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/HierarchicalBeanFactory.java index d48bdba6d73..7e6a347afc2 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/HierarchicalBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/HierarchicalBeanFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java index 420aefb2c0b..365bf99bf1a 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/InitializingBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java index 6f8d57ff85a..5f5b643f156 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/ListableBeanFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/ObjectFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/ObjectFactory.java index 78640789b05..40f807dd543 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/ObjectFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/ObjectFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/SmartFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/SmartFactoryBean.java index a8e20e049c4..143936f7b76 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/SmartFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/SmartFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java b/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java index f700515bec4..5a455420d32 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/UnsatisfiedDependencyException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java index ef2e40e34cf..b917de2a174 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryLocator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryReference.java index efe23a7479d..35c3d3f51fa 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryReference.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/BeanFactoryReference.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java index 2fb454543e5..d2a72bc368e 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/BootstrapException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java index 00fb3e690b0..1dc32578192 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/access/el/SpringBeanELResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/access/el/SpringBeanELResolver.java index 6b439391e98..e97329df74d 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/access/el/SpringBeanELResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/access/el/SpringBeanELResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedBeanDefinition.java index 811898742dd..7eef126d8d6 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedBeanDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotatedBeanDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Configurable.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Configurable.java index 205fed0aebc..dc594157ae4 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Configurable.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Configurable.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Required.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Required.java index 46ef046864f..bb342c7854c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Required.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/Required.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/AbstractFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/AbstractFactoryBean.java index 5939524eea8..5c1ad4b751b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/AbstractFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/AbstractFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java index 2040f6f4201..e71eb1a8991 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/AutowireCapableBeanFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java index 4102753bfc8..b0b4142ec65 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java index d14e2f3c0b0..c9d442c3355 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanFactoryPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanFactoryPostProcessor.java index 47db66447eb..8cfbb7645ff 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanFactoryPostProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanFactoryPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanPostProcessor.java index 52d03678bc7..9739a62f8f1 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanPostProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReference.java index b396d2367bf..80c22d87dbd 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReference.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReference.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java index e7c232d97b8..bbe7ddf804d 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/BeanReferenceFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java index ebaa3a44bba..d0e93c8b0c8 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CommonsLogFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableListableBeanFactory.java index 956448d332f..2dc8ec6faee 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableListableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConfigurableListableBeanFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java index 4d013fae16b..1e59e7d134c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java index 9eff79944ca..f155dedbdf0 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/DestructionAwareBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/DestructionAwareBeanPostProcessor.java index df8cb8447f7..76de13907fd 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/DestructionAwareBeanPostProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/DestructionAwareBeanPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java index b0583f58865..31edfa91449 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java index 7eca9097c16..f508e3fff11 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/InstantiationAwareBeanPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java index 299b588fc6e..736868bed36 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ListFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java index b544f2f1e2b..1615a8125f6 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/MethodInvokingFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java index a202e5a9585..c1fd6a8e6bf 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PreferencesPlaceholderConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java index 8032c163350..b9b822e2e2e 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPathFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java index 197c2ad306d..bf9474138f1 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java index d9c775743dd..7477e197cb8 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanNameReference.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java index 55ab063ef66..836098ff8cd 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/RuntimeBeanReference.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java index 7e299321f04..8777fa61e07 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/Scope.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java index 1fb0c2005ac..e8f2b72b6c7 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/SingletonBeanRegistry.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/SingletonBeanRegistry.java index 2d94806085c..79d0234c37d 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/SingletonBeanRegistry.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/SingletonBeanRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/SmartInstantiationAwareBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/SmartInstantiationAwareBeanPostProcessor.java index fe77b35478f..13f5a9be56d 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/SmartInstantiationAwareBeanPostProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/SmartInstantiationAwareBeanPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java index 3f79e9ff5a4..e4f27fec8b2 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AliasDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AliasDefinition.java index d37d64258c3..828cdc8257c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AliasDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/AliasDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java index ff5da625e46..d281d86cd44 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanComponentDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanDefinitionParsingException.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanDefinitionParsingException.java index 7e3d6b68a21..2d01b986a1d 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanDefinitionParsingException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanDefinitionParsingException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ComponentDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ComponentDefinition.java index 0f162026543..49c5f9f7b57 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ComponentDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ComponentDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntry.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntry.java index b5a99a8890c..72357a8cc7b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntry.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ConstructorArgumentEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java index 4462ef760f9..76f3a2fd8a7 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/FailFastProblemReporter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ImportDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ImportDefinition.java index e58a4276bbd..ffc1cb2a1e1 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ImportDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ImportDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Location.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Location.java index 71a155efe47..9ff54665c78 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Location.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Location.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/NullSourceExtractor.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/NullSourceExtractor.java index 6726bbac41a..66dfae23d90 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/NullSourceExtractor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/NullSourceExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java index 4f9882f293f..3c4b68e3399 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractor.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractor.java index f11e44e4f9b..4611365c077 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Problem.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Problem.java index 42f1bc82e07..9f78a2909d4 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Problem.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/Problem.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ProblemReporter.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ProblemReporter.java index 0bbbb4deee1..649b17123a3 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ProblemReporter.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/ProblemReporter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java index 6d602ea28ab..2f940269eb4 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/QualifierEntry.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/QualifierEntry.java index 4da479b2341..e21707376ed 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/QualifierEntry.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/QualifierEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/SourceExtractor.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/SourceExtractor.java index 88c2bcf9f4b..0b0fe96658c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/SourceExtractor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/SourceExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java index 615839c2133..b07e211d163 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java index 964f7d83e66..6846390e1b9 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateQualifier.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateResolver.java index 3906928b5fd..cd2c41e1153 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireCandidateResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java index 6ea25abcc6b..f8ffd5798b5 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AutowireUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java index 2b354882df4..6a2cb27e495 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java index 542f1d5b62a..db7ccda8001 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionDefaults.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReader.java index 813e8d4b6f1..f5d1e777812 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java index 4a13bc1b2dc..aa9bbe94e8b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java index fd50469024a..326e1fb58c4 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java index f14db8c8bca..330b699096b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValidationException.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValidationException.java index 57f4ddbb801..04e96a75781 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValidationException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValidationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java index a09d69ddedf..b03ca67dcd5 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ChildBeanDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java index da0103b6547..161eae7e99b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java index d3206fdc998..82fddd21066 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/GenericBeanDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/InstantiationStrategy.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/InstantiationStrategy.java index 6be1f2399c6..884ee9c3d9a 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/InstantiationStrategy.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/InstantiationStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.java index 9c1e9292e29..560943d309e 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java index bac4697f187..e7e7ec7dca3 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java index bac7a2a4fc8..5c9aa550113 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java index e4459d02967..4529b714417 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java index b947affe435..95b444721b8 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java index 7efcba32043..654cadc9fc6 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverride.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverride.java index c29fbaaa7d0..ecc984a7cec 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverride.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverride.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java index d336ef8855c..fc64caf6480 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodOverrides.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodReplacer.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodReplacer.java index 0fa1b59046f..d3c630491b9 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodReplacer.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/MethodReplacer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java index 8927b9b0737..7b7822f0df0 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java index 261ccc04163..e570a24c573 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/SecurityContextProvider.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SecurityContextProvider.java index 6efe58e1e1f..ac001c639e9 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/SecurityContextProvider.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/SecurityContextProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java index 7287049bc34..edb954ae7f8 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleSecurityContextProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java index 0e129d6e38a..e46145f2968 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanConfigurerSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfo.java b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfo.java index 4ec68342d55..67f32d5d2c4 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfo.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfoResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfoResolver.java index ab648bdbb98..c306cb70bb1 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfoResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/wiring/BeanWiringInfoResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java index 9782f086beb..91c94990ccf 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSimpleBeanDefinitionParser.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSimpleBeanDefinitionParser.java index 99bd416cb91..0bfcb375dab 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSimpleBeanDefinitionParser.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSimpleBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSingleBeanDefinitionParser.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSingleBeanDefinitionParser.java index f86dc30f70b..ec5d3687400 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSingleBeanDefinitionParser.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/AbstractSingleBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDecorator.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDecorator.java index b1713f24e8e..c5e4d9128a7 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDecorator.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDecorator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDocumentReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDocumentReader.java index ecf5980def2..37ef1b40904 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDocumentReader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionDocumentReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java index a833a3c5144..d7fcfc9e4d9 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java index c6d9f5140a2..9900aa16517 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java index 4450b30bd74..07bfe7afa93 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DelegatingEntityResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java index b927112b63b..874eeaf0348 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentDefaultsDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentLoader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentLoader.java index 348f4f6dc4a..a7ebdb9c579 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentLoader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/DocumentLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandler.java index 823e3015cec..8da64b6070f 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandler.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerResolver.java index 12e95b0b428..d8ccc410506 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/NamespaceHandlerResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java index ab933ffc9be..a7ca4fbd54e 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java index 259c592ef71..27d861bcb83 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java index 064ffd30cb7..39676dc24d8 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/UtilNamespaceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java index c819bbb7a6b..16b58500bc1 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionStoreException.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionStoreException.java index cba28b06415..ceec57615e7 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionStoreException.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionStoreException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java index 2ff16bbbaee..fb6889226cc 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java index 6e51f97fe5c..aee26b0ded1 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharacterEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharsetEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharsetEditor.java index 2c87af1f7a4..e45a34149ec 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharsetEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CharsetEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java index 42420f9fd01..68ab64d576c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassArrayEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java index 59dba77c36b..a6214171a57 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ClassEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CurrencyEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CurrencyEditor.java index 433e126749b..5d5eea0de18 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CurrencyEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CurrencyEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomBooleanEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomBooleanEditor.java index 934fa37bb35..985ba1723c1 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomBooleanEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomBooleanEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java index b78db5ea5ef..cbf10da7a4b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomCollectionEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java index 03e1d9c8f2e..36718b20e9d 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomDateEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java index 81134a69313..14871687ded 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomMapEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java index 3e3072f0ec6..c946c621fb5 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/CustomNumberEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/FileEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/FileEditor.java index 2fb351b55f2..a57b69eaede 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/FileEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/FileEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputSourceEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputSourceEditor.java index 982f9438d61..92f47df1f1b 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputSourceEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputSourceEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputStreamEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputStreamEditor.java index efa3908b2dc..220f381e88e 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputStreamEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/InputStreamEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java index 753ba19c5b9..25af77b5dd3 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PatternEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PatternEditor.java index 886a1075c93..0c4c971fead 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PatternEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PatternEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java index a608128bee0..977c2b0a6cb 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/PropertiesEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ResourceBundleEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ResourceBundleEditor.java index 19f8bf5393f..24467400fac 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ResourceBundleEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/ResourceBundleEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java index 716872c5e2a..c8875b388b3 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringArrayPropertyEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java index f05dd439612..da9c1eea94e 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/StringTrimmerEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/TimeZoneEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/TimeZoneEditor.java index 2059c660c47..632f60127cf 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/TimeZoneEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/TimeZoneEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URIEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URIEditor.java index 84febdf01d8..f5ac6d6a487 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URIEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URIEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URLEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URLEditor.java index be8bf5c69ca..c5f9755d85a 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URLEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/URLEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/UUIDEditor.java b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/UUIDEditor.java index fd938eef804..3662903df83 100644 --- a/spring-beans/src/main/java/org/springframework/beans/propertyeditors/UUIDEditor.java +++ b/spring-beans/src/main/java/org/springframework/beans/propertyeditors/UUIDEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java b/spring-beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java index 486d13ed74a..a9ed9984aa0 100644 --- a/spring-beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java +++ b/spring-beans/src/main/java/org/springframework/beans/support/ArgumentConvertingMethodInvoker.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java b/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java index 89490a664af..2c64bf5252f 100644 --- a/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/support/MutableSortDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java b/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java index 13a81da8092..4d7ff960135 100644 --- a/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java +++ b/spring-beans/src/main/java/org/springframework/beans/support/PagedListHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java b/spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java index 950f22cb06e..afe74eac66e 100644 --- a/spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java +++ b/spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/main/java/org/springframework/beans/support/SortDefinition.java b/spring-beans/src/main/java/org/springframework/beans/support/SortDefinition.java index 9ad02dade06..406e3b6faa1 100644 --- a/spring-beans/src/main/java/org/springframework/beans/support/SortDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/support/SortDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java b/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java index d85622e12bd..b3e62ba2b82 100644 --- a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java +++ b/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java index 4132763825c..51ea30bb548 100644 --- a/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/AbstractPropertyValuesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java index f62d8003566..f49f63182cf 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java index c9966af03ba..73bdeaee1c6 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java index 5825d6a08b5..a1752458c42 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java index 8eaac3b46bc..95c3fbb8cc9 100644 --- a/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java b/spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java index 2b114defc7c..bc53e02ae2f 100644 --- a/spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/MutablePropertyValuesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java index 5696a0ad8c5..7c728a55a29 100644 --- a/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java index f3b990fdbab..967cd5d2b80 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java index 5b4c200f58d..3f7e69e4f48 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java index 5bb7f93ae06..0a50c2e617f 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java index e417ccdba09..c5f365f7997 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java index 6afaa8b219a..f9295e4ee61 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java index 72073bc1905..6691e2401fa 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java index ba08ffe4bab..65e6debd15f 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomScopeConfigurerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java index 0c328ce481d..d5569c3fd3c 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java index 616b025ad39..a35b1e2948e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java index 88a6f09ef9e..8b1a7079c7f 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java index e4446440b81..409e3f8325d 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java index 5a564500eb3..73daf724a35 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java index 44e6abf05e1..f7ab438e765 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ServiceLocatorFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java index 601e564b63f..861cafa68d2 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java index e834490226a..e9ff4c6a315 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/TestTypes.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java index 10422ae527e..82a35dc064f 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java index 8907294f72e..622b7fda5d3 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/FailFastProblemReporterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java index 56b9b1fbc64..fe85b49123f 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/PassThroughSourceExtractorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java index e0f0875403e..2e4025d304a 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java index 36745a65c08..ee00efdec97 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java index 22dbf41ba35..22972e96fd1 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java index caacb5604fd..51e8dd70122 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java index 72a90473e2b..195ad775290 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/QualifierAnnotationAutowireBeanFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/ConstructorBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/ConstructorBean.java index 1d07565be64..0b65929fdd3 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/ConstructorBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/ConstructorBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java index 0091998af75..cf72ae3a95b 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java index 4296a2f3030..4df91dc1360 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java index 175ce84f160..41bc80b8ab8 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java index f648206980e..87a4ec27fcb 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java index 1009e9e76b9..2c371011e36 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java index cf51e1cdd02..22131ab9adc 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java index 1567bad02f0..ded4bb5eaef 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java index 35fa49013b1..e2a0071022a 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java index ce0ba6e7f03..cfe24570a3e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/BeanNameGenerationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java index 3b552f0762e..021f9bb81d4 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java index 0c0974fd722..72de2d65d11 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java index 8b7d179e9e3..6a31f91e1a3 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java index 0b0a476bcab..75bcc94d84b 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java index 357dc5d6cee..558e58681aa 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java index 00933e788a9..6b396933ae7 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DelegatingEntityResolverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java index 7cb8a586274..8bed2eeeab0 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java index fbc40ca3025..d1449fdb0b7 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java index bd2d8370384..58c392ddcaa 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java index 765c4384497..62f4e654b65 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java index 8ee4c39d633..1623cf3ac52 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java index 01afc690242..fdf65f88d71 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/GeneratedNameBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java index 6e3f1df422b..25ab86c6416 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java index b8757c3e3f3..8cb697a7551 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java index 1cd7a541244..33788f98dbc 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java index 75af81b55cc..231ca93a3db 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProtectedLifecycleBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java index 173fe926421..c031ae52e96 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java index 07d8371b6f8..438a4b7e9e3 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java index cf83b0be7c2..d042952a88e 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java index 49473c6dc59..76baf7366fe 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java index 9cc47454696..1025fffe40b 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java index eb936a57efa..2b2ee692e6a 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/support/DefaultNamespaceHandlerResolverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java index 7f4cf0d9fa0..a66734f6259 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/BeanInfoTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditorTests.java index 4bf47d014aa..f2d77a2b684 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/ByteArrayPropertyEditorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java index c8cf8d7649e..ca477008cd2 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java index e2baf255306..b1cc7ee18de 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java index 7050c656b97..ef036076581 100644 --- a/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java index ab995152794..320759d1b8a 100644 --- a/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/support/PropertyComparatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/test/beans/BooleanTestBean.java b/spring-beans/src/test/java/test/beans/BooleanTestBean.java index c6f32d1f91d..4ea2f67d3bb 100644 --- a/spring-beans/src/test/java/test/beans/BooleanTestBean.java +++ b/spring-beans/src/test/java/test/beans/BooleanTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/test/beans/Colour.java b/spring-beans/src/test/java/test/beans/Colour.java index 5be4dfa761a..533d0df36e3 100644 --- a/spring-beans/src/test/java/test/beans/Colour.java +++ b/spring-beans/src/test/java/test/beans/Colour.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/test/beans/DerivedTestBean.java b/spring-beans/src/test/java/test/beans/DerivedTestBean.java index 87133f27d56..c0f63181aba 100644 --- a/spring-beans/src/test/java/test/beans/DerivedTestBean.java +++ b/spring-beans/src/test/java/test/beans/DerivedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/test/beans/DummyBean.java b/spring-beans/src/test/java/test/beans/DummyBean.java index 6c83aed2098..a8428c7f780 100644 --- a/spring-beans/src/test/java/test/beans/DummyBean.java +++ b/spring-beans/src/test/java/test/beans/DummyBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/test/beans/DummyFactory.java b/spring-beans/src/test/java/test/beans/DummyFactory.java index 99f2efc2665..60f7966d9a0 100644 --- a/spring-beans/src/test/java/test/beans/DummyFactory.java +++ b/spring-beans/src/test/java/test/beans/DummyFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/test/beans/INestedTestBean.java b/spring-beans/src/test/java/test/beans/INestedTestBean.java index 87bfc267738..56c9d829ee3 100644 --- a/spring-beans/src/test/java/test/beans/INestedTestBean.java +++ b/spring-beans/src/test/java/test/beans/INestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/test/beans/IOther.java b/spring-beans/src/test/java/test/beans/IOther.java index e5b576de3b1..f3c6263261e 100644 --- a/spring-beans/src/test/java/test/beans/IOther.java +++ b/spring-beans/src/test/java/test/beans/IOther.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/test/beans/LifecycleBean.java b/spring-beans/src/test/java/test/beans/LifecycleBean.java index e0dd4d3e322..cd1dcd6e5e0 100644 --- a/spring-beans/src/test/java/test/beans/LifecycleBean.java +++ b/spring-beans/src/test/java/test/beans/LifecycleBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/test/beans/NestedTestBean.java b/spring-beans/src/test/java/test/beans/NestedTestBean.java index 6855305fb3d..edc145ad7d2 100644 --- a/spring-beans/src/test/java/test/beans/NestedTestBean.java +++ b/spring-beans/src/test/java/test/beans/NestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/test/beans/NumberTestBean.java b/spring-beans/src/test/java/test/beans/NumberTestBean.java index e739da47385..cdd80bd27b2 100644 --- a/spring-beans/src/test/java/test/beans/NumberTestBean.java +++ b/spring-beans/src/test/java/test/beans/NumberTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/test/beans/PackageLevelVisibleBean.java b/spring-beans/src/test/java/test/beans/PackageLevelVisibleBean.java index a77af92d129..eeb4b7325db 100644 --- a/spring-beans/src/test/java/test/beans/PackageLevelVisibleBean.java +++ b/spring-beans/src/test/java/test/beans/PackageLevelVisibleBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/test/beans/TestBean.java b/spring-beans/src/test/java/test/beans/TestBean.java index 1ad802cc977..5b94f078b5d 100644 --- a/spring-beans/src/test/java/test/beans/TestBean.java +++ b/spring-beans/src/test/java/test/beans/TestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-beans/src/test/java/test/util/TestResourceUtils.java b/spring-beans/src/test/java/test/util/TestResourceUtils.java index c137adffe4c..4843151231b 100644 --- a/spring-beans/src/test/java/test/util/TestResourceUtils.java +++ b/spring-beans/src/test/java/test/util/TestResourceUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailAuthenticationException.java b/spring-context-support/src/main/java/org/springframework/mail/MailAuthenticationException.java index f7474155f84..d4eb9cc6044 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/MailAuthenticationException.java +++ b/spring-context-support/src/main/java/org/springframework/mail/MailAuthenticationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailException.java b/spring-context-support/src/main/java/org/springframework/mail/MailException.java index bcbdd3cfb16..b254dc90737 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/MailException.java +++ b/spring-context-support/src/main/java/org/springframework/mail/MailException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailParseException.java b/spring-context-support/src/main/java/org/springframework/mail/MailParseException.java index de58b7613a0..b6b47f16131 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/MailParseException.java +++ b/spring-context-support/src/main/java/org/springframework/mail/MailParseException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailPreparationException.java b/spring-context-support/src/main/java/org/springframework/mail/MailPreparationException.java index 5b77c3825ea..b1e99b55917 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/MailPreparationException.java +++ b/spring-context-support/src/main/java/org/springframework/mail/MailPreparationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java b/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java index d86944fc16d..4820c270a2d 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java +++ b/spring-context-support/src/main/java/org/springframework/mail/MailSendException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/mail/MailSender.java b/spring-context-support/src/main/java/org/springframework/mail/MailSender.java index fb44ac572e7..6b87d7bb99b 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/MailSender.java +++ b/spring-context-support/src/main/java/org/springframework/mail/MailSender.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java b/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java index 1abeaa6a4f3..7cc61122bb5 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java +++ b/spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java index f3ceba872ee..ac683c5243b 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java +++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/InternetAddressEditor.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/InternetAddressEditor.java index 057d6f78e29..2cf0b89671a 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/javamail/InternetAddressEditor.java +++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/InternetAddressEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSender.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSender.java index bae5d7fb962..7372f625126 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSender.java +++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSender.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java index ed9151bfdf3..257b15b78e7 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java +++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java index 840320741b1..47a115e9805 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java +++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessagePreparator.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessagePreparator.java index dd6417b182f..9b0f49fc34d 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessagePreparator.java +++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessagePreparator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/SmartMimeMessage.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/SmartMimeMessage.java index 2e46fa1029c..35b3ace313c 100644 --- a/spring-context-support/src/main/java/org/springframework/mail/javamail/SmartMimeMessage.java +++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/SmartMimeMessage.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java index 25931464c9e..c3e603882dc 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/ScheduledTimerListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java index 2eae87785d5..8167f6a709c 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/commonj/TimerManagerAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerBean.java index eb1d1b6087b..c5e1c070b83 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerBean.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/CronTriggerBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailAwareTrigger.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailAwareTrigger.java index 0971d96d54f..3edec2aacba 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailAwareTrigger.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailAwareTrigger.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailBean.java index 1da0bb9b10f..0a534065777 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailBean.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobDetailBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobMethodInvocationFailedException.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobMethodInvocationFailedException.java index 701b5c6ca09..d79bd3f69d9 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobMethodInvocationFailedException.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/JobMethodInvocationFailedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java index 2b1f04a48b1..c9664b28f8e 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalDataSourceJobStore.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalTaskExecutorThreadPool.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalTaskExecutorThreadPool.java index e0307f6e251..6e5189e3b09 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalTaskExecutorThreadPool.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/LocalTaskExecutorThreadPool.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/QuartzJobBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/QuartzJobBean.java index 78862788575..b2d61536da3 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/QuartzJobBean.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/QuartzJobBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java index a81e39c83fc..5eba86a1055 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/ResourceLoaderClassLoadHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java index 17940bece42..84db22173a5 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerBean.java index 06b273eb246..b35bb59ad93 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerBean.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SimpleTriggerBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SpringBeanJobFactory.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SpringBeanJobFactory.java index c6811478ae6..a9d837e7dae 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SpringBeanJobFactory.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/SpringBeanJobFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java b/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java index d4f050e8a84..574c7695e7f 100644 --- a/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java +++ b/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerConfigurationFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerTemplateUtils.java b/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerTemplateUtils.java index acc1e30b21d..b2e7a852144 100644 --- a/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerTemplateUtils.java +++ b/spring-context-support/src/main/java/org/springframework/ui/freemarker/FreeMarkerTemplateUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java b/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java index 0ff54aeba0e..2e811889688 100644 --- a/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java +++ b/spring-context-support/src/main/java/org/springframework/ui/velocity/VelocityEngineFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/test/java/org/springframework/beans/Colour.java b/spring-context-support/src/test/java/org/springframework/beans/Colour.java index 17fd24fec79..a992a2ebfc6 100644 --- a/spring-context-support/src/test/java/org/springframework/beans/Colour.java +++ b/spring-context-support/src/test/java/org/springframework/beans/Colour.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-context-support/src/test/java/org/springframework/beans/INestedTestBean.java index c5c4ed5e679..e0ae5f20a3f 100644 --- a/spring-context-support/src/test/java/org/springframework/beans/INestedTestBean.java +++ b/spring-context-support/src/test/java/org/springframework/beans/INestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/test/java/org/springframework/beans/IOther.java b/spring-context-support/src/test/java/org/springframework/beans/IOther.java index 6a8f74187cb..d7fb346185a 100644 --- a/spring-context-support/src/test/java/org/springframework/beans/IOther.java +++ b/spring-context-support/src/test/java/org/springframework/beans/IOther.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java index e136978f9e6..412891c439b 100644 --- a/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/test/java/org/springframework/beans/TestBean.java b/spring-context-support/src/test/java/org/springframework/beans/TestBean.java index 7a27cf0894e..6d71de75764 100644 --- a/spring-context-support/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-context-support/src/test/java/org/springframework/beans/TestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java b/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java index cd49644c6e3..4b397425a5b 100644 --- a/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java +++ b/spring-context-support/src/test/java/org/springframework/mail/javamail/InternetAddressEditorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java index fc5bf4cfc52..51eab98cd6a 100644 --- a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java +++ b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/CronTriggerBeanTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/CronTriggerBeanTests.java index ca7bb45d657..8ccc9c5b697 100644 --- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/CronTriggerBeanTests.java +++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/CronTriggerBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java index 855bf686929..af4042c2c99 100644 --- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java +++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/cache/Cache.java b/spring-context/src/main/java/org/springframework/cache/Cache.java index 5035789d1ef..dbfa1cba84b 100644 --- a/spring-context/src/main/java/org/springframework/cache/Cache.java +++ b/spring-context/src/main/java/org/springframework/cache/Cache.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java b/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java index 7116955e829..716b840ad0e 100644 --- a/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java +++ b/spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java index cda9352b529..7c62a21af7a 100644 --- a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java +++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/cache/support/SimpleValueWrapper.java b/spring-context/src/main/java/org/springframework/cache/support/SimpleValueWrapper.java index 5ff3aaf9e86..3b687a86dea 100644 --- a/spring-context/src/main/java/org/springframework/cache/support/SimpleValueWrapper.java +++ b/spring-context/src/main/java/org/springframework/cache/support/SimpleValueWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/ApplicationContext.java b/spring-context/src/main/java/org/springframework/context/ApplicationContext.java index 2565e481a3a..776e9f492b1 100644 --- a/spring-context/src/main/java/org/springframework/context/ApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/ApplicationContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/ApplicationContextAware.java b/spring-context/src/main/java/org/springframework/context/ApplicationContextAware.java index 594af464c0d..c8a20ef17e0 100644 --- a/spring-context/src/main/java/org/springframework/context/ApplicationContextAware.java +++ b/spring-context/src/main/java/org/springframework/context/ApplicationContextAware.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/ApplicationContextException.java b/spring-context/src/main/java/org/springframework/context/ApplicationContextException.java index 1068bb9126c..2a53416c090 100644 --- a/spring-context/src/main/java/org/springframework/context/ApplicationContextException.java +++ b/spring-context/src/main/java/org/springframework/context/ApplicationContextException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/ApplicationEvent.java b/spring-context/src/main/java/org/springframework/context/ApplicationEvent.java index 464a440af60..e20d12cd858 100644 --- a/spring-context/src/main/java/org/springframework/context/ApplicationEvent.java +++ b/spring-context/src/main/java/org/springframework/context/ApplicationEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/ApplicationListener.java b/spring-context/src/main/java/org/springframework/context/ApplicationListener.java index d79e741cfff..a7eea9b5f92 100644 --- a/spring-context/src/main/java/org/springframework/context/ApplicationListener.java +++ b/spring-context/src/main/java/org/springframework/context/ApplicationListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/HierarchicalMessageSource.java b/spring-context/src/main/java/org/springframework/context/HierarchicalMessageSource.java index 3339abe70ed..d03b98774d5 100644 --- a/spring-context/src/main/java/org/springframework/context/HierarchicalMessageSource.java +++ b/spring-context/src/main/java/org/springframework/context/HierarchicalMessageSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/Lifecycle.java b/spring-context/src/main/java/org/springframework/context/Lifecycle.java index b1d00e13f2c..cfc101e39b1 100644 --- a/spring-context/src/main/java/org/springframework/context/Lifecycle.java +++ b/spring-context/src/main/java/org/springframework/context/Lifecycle.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/MessageSource.java b/spring-context/src/main/java/org/springframework/context/MessageSource.java index 62e1f9729b8..13f1530b31f 100644 --- a/spring-context/src/main/java/org/springframework/context/MessageSource.java +++ b/spring-context/src/main/java/org/springframework/context/MessageSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/MessageSourceResolvable.java b/spring-context/src/main/java/org/springframework/context/MessageSourceResolvable.java index d344a6dadf8..965a44bbe77 100644 --- a/spring-context/src/main/java/org/springframework/context/MessageSourceResolvable.java +++ b/spring-context/src/main/java/org/springframework/context/MessageSourceResolvable.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java b/spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java index 980464d36f1..777bd389b7f 100644 --- a/spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java +++ b/spring-context/src/main/java/org/springframework/context/NoSuchMessageException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/Phased.java b/spring-context/src/main/java/org/springframework/context/Phased.java index b4b84d86d94..e815988e963 100644 --- a/spring-context/src/main/java/org/springframework/context/Phased.java +++ b/spring-context/src/main/java/org/springframework/context/Phased.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/ResourceLoaderAware.java b/spring-context/src/main/java/org/springframework/context/ResourceLoaderAware.java index c13e5902f33..cf9edd7101d 100644 --- a/spring-context/src/main/java/org/springframework/context/ResourceLoaderAware.java +++ b/spring-context/src/main/java/org/springframework/context/ResourceLoaderAware.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java b/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java index 4a608ec060c..b39ae885901 100644 --- a/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java +++ b/spring-context/src/main/java/org/springframework/context/access/ContextBeanFactoryReference.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java b/spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java index 8372bb00b9a..54b66347ade 100644 --- a/spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java +++ b/spring-context/src/main/java/org/springframework/context/access/ContextJndiBeanFactoryLocator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java b/spring-context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java index 2f9d9d5cc83..57df5694c88 100644 --- a/spring-context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java +++ b/spring-context/src/main/java/org/springframework/context/access/ContextSingletonBeanFactoryLocator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/access/DefaultLocatorFactory.java b/spring-context/src/main/java/org/springframework/context/access/DefaultLocatorFactory.java index 9b550724893..1ac558f5380 100644 --- a/spring-context/src/main/java/org/springframework/context/access/DefaultLocatorFactory.java +++ b/spring-context/src/main/java/org/springframework/context/access/DefaultLocatorFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java b/spring-context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java index f166faac358..5fcd8a572d0 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java b/spring-context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java index 9b6917c5804..b3f9450f983 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Scope.java b/spring-context/src/main/java/org/springframework/context/annotation/Scope.java index bcb433f5caf..2e556f51878 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/Scope.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/Scope.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadata.java b/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadata.java index 2f67592b0fd..a13dfdd1933 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadata.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadata.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadataResolver.java b/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadataResolver.java index 03a8a1306f7..04fda90705a 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadataResolver.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ScopeMetadataResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/config/ContextNamespaceHandler.java b/spring-context/src/main/java/org/springframework/context/config/ContextNamespaceHandler.java index b095d47d980..1a758b60a94 100644 --- a/spring-context/src/main/java/org/springframework/context/config/ContextNamespaceHandler.java +++ b/spring-context/src/main/java/org/springframework/context/config/ContextNamespaceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java index 256ee620649..c7ad16ac501 100644 --- a/spring-context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java +++ b/spring-context/src/main/java/org/springframework/context/config/PropertyOverrideBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java b/spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java index 822f3667f59..fa84458568e 100644 --- a/spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java +++ b/spring-context/src/main/java/org/springframework/context/event/ApplicationContextEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java index abd68238384..8db8dc4dc7b 100644 --- a/spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java +++ b/spring-context/src/main/java/org/springframework/context/event/ContextClosedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java index b8f97520a4e..d18b3970d20 100644 --- a/spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java +++ b/spring-context/src/main/java/org/springframework/context/event/ContextRefreshedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java index d314430eeda..5033d7dbb74 100644 --- a/spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java +++ b/spring-context/src/main/java/org/springframework/context/event/ContextStartedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java b/spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java index 4e089149c5f..98d95a8ceff 100644 --- a/spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java +++ b/spring-context/src/main/java/org/springframework/context/event/ContextStoppedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java b/spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java index abaddb72b36..ef32c7b6f7c 100644 --- a/spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java +++ b/spring-context/src/main/java/org/springframework/context/event/EventPublicationInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java b/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java index dcaf8fc14eb..2e13855d4a5 100644 --- a/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java +++ b/spring-context/src/main/java/org/springframework/context/event/SimpleApplicationEventMulticaster.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java b/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java index ac517852959..155fefbbc1b 100644 --- a/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java +++ b/spring-context/src/main/java/org/springframework/context/expression/MapAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/i18n/LocaleContextHolder.java b/spring-context/src/main/java/org/springframework/context/i18n/LocaleContextHolder.java index 6ace3993339..2ca6ea2f85c 100644 --- a/spring-context/src/main/java/org/springframework/context/i18n/LocaleContextHolder.java +++ b/spring-context/src/main/java/org/springframework/context/i18n/LocaleContextHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java b/spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java index b21e35e772b..d3848ebe0a9 100644 --- a/spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java +++ b/spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractMessageSource.java b/spring-context/src/main/java/org/springframework/context/support/AbstractMessageSource.java index a7f44dca16c..768c963d3b5 100644 --- a/spring-context/src/main/java/org/springframework/context/support/AbstractMessageSource.java +++ b/spring-context/src/main/java/org/springframework/context/support/AbstractMessageSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java index 547f7519eec..44ba2589d8d 100644 --- a/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java index 5e8377c999e..138f45526cd 100644 --- a/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java index 3f88a900dbd..1e7681aa0ba 100644 --- a/spring-context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/AbstractXmlApplicationContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java b/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java index a2ce34e6ad6..e88b26799cf 100644 --- a/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java +++ b/spring-context/src/main/java/org/springframework/context/support/ApplicationContextAwareProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java b/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java index a872b76b782..ebee90cc033 100644 --- a/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java +++ b/spring-context/src/main/java/org/springframework/context/support/ApplicationObjectSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java b/spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java index 6930177dedc..f81020673de 100644 --- a/spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java +++ b/spring-context/src/main/java/org/springframework/context/support/ContextTypeMatchClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java b/spring-context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java index 32bb029c0a6..95b40263edc 100644 --- a/spring-context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/context/support/ConversionServiceFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java b/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java index b05eeaa4e79..e668c4e7368 100644 --- a/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java +++ b/spring-context/src/main/java/org/springframework/context/support/DefaultMessageSourceResolvable.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java index a1e4fdababb..7c3d8bcc114 100644 --- a/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java index 5384a333bea..e120f667fb5 100644 --- a/spring-context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/GenericXmlApplicationContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/support/MessageSourceAccessor.java b/spring-context/src/main/java/org/springframework/context/support/MessageSourceAccessor.java index e026e5c98f0..03fa94a5256 100644 --- a/spring-context/src/main/java/org/springframework/context/support/MessageSourceAccessor.java +++ b/spring-context/src/main/java/org/springframework/context/support/MessageSourceAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/support/MessageSourceResourceBundle.java b/spring-context/src/main/java/org/springframework/context/support/MessageSourceResourceBundle.java index 4dd8bce3511..8dc2c1ffb3e 100644 --- a/spring-context/src/main/java/org/springframework/context/support/MessageSourceResourceBundle.java +++ b/spring-context/src/main/java/org/springframework/context/support/MessageSourceResourceBundle.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java b/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java index 6c8cbc99d76..30aad8a078b 100644 --- a/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java +++ b/spring-context/src/main/java/org/springframework/context/support/SimpleThreadScope.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java index 4e82ef9cdb1..b93c8b2df58 100644 --- a/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java +++ b/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAware.java b/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAware.java index 6c87480fe41..0f67d7aba6f 100644 --- a/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAware.java +++ b/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAware.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAwareProcessor.java b/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAwareProcessor.java index 58ac5f4254f..d2c704f1a50 100644 --- a/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAwareProcessor.java +++ b/spring-context/src/main/java/org/springframework/context/weaving/LoadTimeWeaverAwareProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java index c80aef379b6..1af0997e643 100644 --- a/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java +++ b/spring-context/src/main/java/org/springframework/ejb/access/AbstractRemoteSlsbInvokerInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java index 652205cd526..8a12977c8a4 100644 --- a/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java +++ b/spring-context/src/main/java/org/springframework/ejb/access/AbstractSlsbInvokerInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java b/spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java index e3332791d5b..3d555779e90 100644 --- a/spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java +++ b/spring-context/src/main/java/org/springframework/ejb/access/EjbAccessException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java index 789130620c6..7a27feafa29 100644 --- a/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java +++ b/spring-context/src/main/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java index 3058f699aad..c824d4c9171 100644 --- a/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java index c459d22a9ae..ce39ce9a6cd 100644 --- a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java +++ b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java index 6bcb7753195..de6a45b1fef 100644 --- a/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ejb/config/JeeNamespaceHandler.java b/spring-context/src/main/java/org/springframework/ejb/config/JeeNamespaceHandler.java index b5841ca19dd..2e106d8ed0f 100644 --- a/spring-context/src/main/java/org/springframework/ejb/config/JeeNamespaceHandler.java +++ b/spring-context/src/main/java/org/springframework/ejb/config/JeeNamespaceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java index 81ea064909f..6b616ace255 100644 --- a/spring-context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java +++ b/spring-context/src/main/java/org/springframework/ejb/config/JndiLookupBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java index eeb2191cf73..c5caff9ef5e 100644 --- a/spring-context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java +++ b/spring-context/src/main/java/org/springframework/ejb/config/LocalStatelessSessionBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java index 0b1669a4071..30469ead505 100644 --- a/spring-context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java +++ b/spring-context/src/main/java/org/springframework/ejb/config/RemoteStatelessSessionBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.java b/spring-context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.java index 73499993283..89d50674517 100644 --- a/spring-context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.java +++ b/spring-context/src/main/java/org/springframework/ejb/interceptor/SpringBeanAutowiringInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java index 801ffcd0427..aaa6f7adff7 100644 --- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java +++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractEnterpriseBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java index 26bdd8b79b0..ecfb7baa985 100644 --- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java +++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractJmsMessageDrivenBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java index e87447b648c..bbfc158cbbb 100644 --- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java +++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractMessageDrivenBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java index edf66f329ce..5f4e2770b7e 100644 --- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java +++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractSessionBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java index bbd9079b263..49716db8344 100644 --- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java +++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatefulSessionBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java index 2f91d248a4a..ee013df6cb1 100644 --- a/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java +++ b/spring-context/src/main/java/org/springframework/ejb/support/AbstractStatelessSessionBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/format/AnnotationFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/AnnotationFormatterFactory.java index 0a620e9e8c5..fb539380114 100644 --- a/spring-context/src/main/java/org/springframework/format/AnnotationFormatterFactory.java +++ b/spring-context/src/main/java/org/springframework/format/AnnotationFormatterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/format/Formatter.java b/spring-context/src/main/java/org/springframework/format/Formatter.java index 83d26b13a75..a1bbebc4463 100644 --- a/spring-context/src/main/java/org/springframework/format/Formatter.java +++ b/spring-context/src/main/java/org/springframework/format/Formatter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/format/FormatterRegistrar.java b/spring-context/src/main/java/org/springframework/format/FormatterRegistrar.java index b754a738d10..96059b463b0 100644 --- a/spring-context/src/main/java/org/springframework/format/FormatterRegistrar.java +++ b/spring-context/src/main/java/org/springframework/format/FormatterRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/format/FormatterRegistry.java b/spring-context/src/main/java/org/springframework/format/FormatterRegistry.java index 5613c74eb81..eb6d3f130c8 100644 --- a/spring-context/src/main/java/org/springframework/format/FormatterRegistry.java +++ b/spring-context/src/main/java/org/springframework/format/FormatterRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/format/Parser.java b/spring-context/src/main/java/org/springframework/format/Parser.java index 276a509305a..ed62cc4e10d 100644 --- a/spring-context/src/main/java/org/springframework/format/Parser.java +++ b/spring-context/src/main/java/org/springframework/format/Parser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/format/Printer.java b/spring-context/src/main/java/org/springframework/format/Printer.java index c8528398584..ce2d5d85a8e 100644 --- a/spring-context/src/main/java/org/springframework/format/Printer.java +++ b/spring-context/src/main/java/org/springframework/format/Printer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/format/annotation/NumberFormat.java b/spring-context/src/main/java/org/springframework/format/annotation/NumberFormat.java index 55de49ff82c..e4f1076ea7b 100644 --- a/spring-context/src/main/java/org/springframework/format/annotation/NumberFormat.java +++ b/spring-context/src/main/java/org/springframework/format/annotation/NumberFormat.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java index c15a36eb8c4..f80fcd62426 100644 --- a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java +++ b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java index f1f0a76bfe2..85ca71044a6 100644 --- a/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java +++ b/spring-context/src/main/java/org/springframework/format/datetime/joda/JodaTimeContextHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java b/spring-context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java index ad3c1d4137d..da34f935bc2 100644 --- a/spring-context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java +++ b/spring-context/src/main/java/org/springframework/format/number/AbstractNumberFormatter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/format/number/NumberFormatAnnotationFormatterFactory.java b/spring-context/src/main/java/org/springframework/format/number/NumberFormatAnnotationFormatterFactory.java index 00c14d8a7d2..2108d9f5ae8 100644 --- a/spring-context/src/main/java/org/springframework/format/number/NumberFormatAnnotationFormatterFactory.java +++ b/spring-context/src/main/java/org/springframework/format/number/NumberFormatAnnotationFormatterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java b/spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java index a86ccf2c5ff..2dc19dda744 100644 --- a/spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/format/support/FormattingConversionServiceFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java index 8a4422d93e9..94316c8f6d8 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/InstrumentationLoadTimeWeaver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/LoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/LoadTimeWeaver.java index 74b24b9b909..166f1deb3e6 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/LoadTimeWeaver.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/LoadTimeWeaver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.java index 9e143d576ac..86907d33ddc 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java b/spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java index 7cf9200abc4..3d15f1035ce 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleInstrumentableClassLoader.java b/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleInstrumentableClassLoader.java index b13ba8bd63a..e35bd31fcb7 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleInstrumentableClassLoader.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleInstrumentableClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.java index ab17d2a991d..a421f0418e0 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/SimpleLoadTimeWeaver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishClassLoaderAdapter.java index d5568e3b8d3..92b997d615e 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishClassLoaderAdapter.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishClassLoaderAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java index 2ad5bcf0162..eb28f67ddf9 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java index 0777391ad51..a128608d84d 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java index b5e1cd4ec3a..8325e1b7982 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/jboss/JBossMCTranslatorAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java index d3821e795e0..723a947e1ab 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassLoaderAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java index 06498c5aefa..dce57618981 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/oc4j/OC4JClassPreprocessorAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java index eb6f98b7dc0..03b49e13260 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassLoaderAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassPreProcessorAdapter.java b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassPreProcessorAdapter.java index 087872adedb..aede3544be8 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassPreProcessorAdapter.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicClassPreProcessorAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java index 4197c2f0445..6662830c73a 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/weblogic/WebLogicLoadTimeWeaver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java index 5d952e0a9e2..c95684c4d69 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereClassPreDefinePlugin.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java index 215c8d5735c..3312c377783 100644 --- a/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java +++ b/spring-context/src/main/java/org/springframework/instrument/classloading/websphere/WebSphereLoadTimeWeaver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/JmxException.java b/spring-context/src/main/java/org/springframework/jmx/JmxException.java index bbddbc3ec23..b7baa2eb6cc 100644 --- a/spring-context/src/main/java/org/springframework/jmx/JmxException.java +++ b/spring-context/src/main/java/org/springframework/jmx/JmxException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java b/spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java index 231fcfec8d8..7c3155f10e9 100644 --- a/spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java +++ b/spring-context/src/main/java/org/springframework/jmx/MBeanServerNotFoundException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/access/ConnectorDelegate.java b/spring-context/src/main/java/org/springframework/jmx/access/ConnectorDelegate.java index 7f987272cfd..115d0b3d66a 100644 --- a/spring-context/src/main/java/org/springframework/jmx/access/ConnectorDelegate.java +++ b/spring-context/src/main/java/org/springframework/jmx/access/ConnectorDelegate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java b/spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java index fb1f10b411c..af785e472b6 100644 --- a/spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java +++ b/spring-context/src/main/java/org/springframework/jmx/access/InvalidInvocationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java b/spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java index a52413179b9..e9bf348cc9f 100644 --- a/spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java +++ b/spring-context/src/main/java/org/springframework/jmx/access/InvocationFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java index 761996d8ba4..36894535ed3 100644 --- a/spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java +++ b/spring-context/src/main/java/org/springframework/jmx/access/MBeanClientInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java index 2e2a9588d26..89354926ee2 100644 --- a/spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java +++ b/spring-context/src/main/java/org/springframework/jmx/access/MBeanConnectFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java index b14e4d98d1b..fac8f2dc531 100644 --- a/spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java +++ b/spring-context/src/main/java/org/springframework/jmx/access/MBeanInfoRetrievalException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java index 26fcda79bf6..466a4ff8fbc 100644 --- a/spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/jmx/access/MBeanProxyFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/access/NotificationListenerRegistrar.java b/spring-context/src/main/java/org/springframework/jmx/access/NotificationListenerRegistrar.java index c600f1279d9..bb0b2021de8 100644 --- a/spring-context/src/main/java/org/springframework/jmx/access/NotificationListenerRegistrar.java +++ b/spring-context/src/main/java/org/springframework/jmx/access/NotificationListenerRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java index 2d31820e7b1..9321cca9258 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExportException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java index 9969b74383f..9e94a66df39 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporterListener.java b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporterListener.java index 18b0c14b2d9..d8a62beea12 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporterListener.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/MBeanExporterListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java b/spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java index 821d0cafb4c..610078c6769 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/UnableToRegisterMBeanException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedMetric.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedMetric.java index f6868aeb9f9..5adfc012a9e 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedMetric.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedMetric.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java index bc8b02d6f3a..1ddbd3400f4 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameters.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameters.java index 1bef5da10b3..8c01f19195b 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameters.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedOperationParameters.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedResource.java b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedResource.java index ef5a2534b55..d5d1f3a7743 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedResource.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java index 07f976c0e97..ce2c24a1850 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AutodetectCapableMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AutodetectCapableMBeanInfoAssembler.java index 1d5233570db..ef345cb710a 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/AutodetectCapableMBeanInfoAssembler.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/AutodetectCapableMBeanInfoAssembler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java index 538e247121c..e464fa234bf 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssembler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MBeanInfoAssembler.java index 32a713b399c..1bb200b8621 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MBeanInfoAssembler.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MBeanInfoAssembler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java index 0a05442500b..320a64790e1 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssembler.java index b3ba402b6b2..e092c221cda 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssembler.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssembler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java index a28e57b465f..c4467ab58ac 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssembler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/assembler/SimpleReflectiveMBeanInfoAssembler.java b/spring-context/src/main/java/org/springframework/jmx/export/assembler/SimpleReflectiveMBeanInfoAssembler.java index 9fbad2dd3bd..25ef5084bd9 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/assembler/SimpleReflectiveMBeanInfoAssembler.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/assembler/SimpleReflectiveMBeanInfoAssembler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java index 7c6c59c0066..2bc8b2663d2 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/metadata/InvalidMetadataException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/metadata/JmxAttributeSource.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/JmxAttributeSource.java index dec9a77ea83..8861079de22 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/metadata/JmxAttributeSource.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/metadata/JmxAttributeSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedResource.java b/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedResource.java index 93b6d1193f2..9fd41123c2d 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedResource.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/metadata/ManagedResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java index f1830613329..1e9e4ff4328 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/IdentityNamingStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java index 65efbb76f70..07b459910d6 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/KeyNamingStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java index ba4d86085ab..f1d138d38bd 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/MetadataNamingStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/ObjectNamingStrategy.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/ObjectNamingStrategy.java index edfe3f81dca..cfbda068c0d 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/naming/ObjectNamingStrategy.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/ObjectNamingStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/naming/SelfNaming.java b/spring-context/src/main/java/org/springframework/jmx/export/naming/SelfNaming.java index 74fe92ec2b5..cf083c76982 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/naming/SelfNaming.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/naming/SelfNaming.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java b/spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java index 170c1c35d2a..1c94273bbb2 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisher.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java b/spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java index 64d4dcbfe10..068b7a5a603 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/notification/NotificationPublisher.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/export/notification/UnableToSendNotificationException.java b/spring-context/src/main/java/org/springframework/jmx/export/notification/UnableToSendNotificationException.java index 7c2c98f0f44..7996ffc9530 100644 --- a/spring-context/src/main/java/org/springframework/jmx/export/notification/UnableToSendNotificationException.java +++ b/spring-context/src/main/java/org/springframework/jmx/export/notification/UnableToSendNotificationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/support/ConnectorServerFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/ConnectorServerFactoryBean.java index 888e7eb1cf0..a717b8a1abd 100644 --- a/spring-context/src/main/java/org/springframework/jmx/support/ConnectorServerFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/jmx/support/ConnectorServerFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java b/spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java index 9d95040119a..1308f350876 100644 --- a/spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java +++ b/spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java index 00e0ffba6be..3d9b82bc34e 100644 --- a/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerFactoryBean.java index 304780f6937..61b1086a4ca 100644 --- a/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/jmx/support/MBeanServerFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java b/spring-context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java index bce56721385..bc508386791 100644 --- a/spring-context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java +++ b/spring-context/src/main/java/org/springframework/jmx/support/NotificationListenerHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/support/ObjectNameManager.java b/spring-context/src/main/java/org/springframework/jmx/support/ObjectNameManager.java index f6621a1dee4..cf63334eeee 100644 --- a/spring-context/src/main/java/org/springframework/jmx/support/ObjectNameManager.java +++ b/spring-context/src/main/java/org/springframework/jmx/support/ObjectNameManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java index 52a2ab42e40..5cd37f3d659 100644 --- a/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiCallback.java b/spring-context/src/main/java/org/springframework/jndi/JndiCallback.java index 325c4f8170e..c7845ec84cc 100644 --- a/spring-context/src/main/java/org/springframework/jndi/JndiCallback.java +++ b/spring-context/src/main/java/org/springframework/jndi/JndiCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java b/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java index 0f266c64eaa..cd7ed962884 100644 --- a/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java +++ b/spring-context/src/main/java/org/springframework/jndi/JndiLocatorDelegate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiLookupFailureException.java b/spring-context/src/main/java/org/springframework/jndi/JndiLookupFailureException.java index 9eb73086abd..c168b562179 100644 --- a/spring-context/src/main/java/org/springframework/jndi/JndiLookupFailureException.java +++ b/spring-context/src/main/java/org/springframework/jndi/JndiLookupFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java b/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java index a2d6b6a04c4..5a9bb616b18 100644 --- a/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java +++ b/spring-context/src/main/java/org/springframework/jndi/JndiObjectTargetSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java b/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java index 168edb1bc6e..441a113d88e 100644 --- a/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java +++ b/spring-context/src/main/java/org/springframework/jndi/JndiTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jndi/JndiTemplateEditor.java b/spring-context/src/main/java/org/springframework/jndi/JndiTemplateEditor.java index dd4f4e2d279..9607258534a 100644 --- a/spring-context/src/main/java/org/springframework/jndi/JndiTemplateEditor.java +++ b/spring-context/src/main/java/org/springframework/jndi/JndiTemplateEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java b/spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java index 16e1d15cc48..f5ec23bc468 100644 --- a/spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java +++ b/spring-context/src/main/java/org/springframework/jndi/TypeMismatchNamingException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java b/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java index a123d72cb61..f565f37edf6 100644 --- a/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java +++ b/spring-context/src/main/java/org/springframework/jndi/support/SimpleJndiBeanFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java index 063c94826a0..f0464c4f395 100644 --- a/spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java +++ b/spring-context/src/main/java/org/springframework/remoting/RemoteConnectFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java index 027ca75078e..35fb4af377d 100644 --- a/spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java +++ b/spring-context/src/main/java/org/springframework/remoting/RemoteInvocationFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java index 48ba3ccab39..388fe868e6d 100644 --- a/spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java +++ b/spring-context/src/main/java/org/springframework/remoting/RemoteLookupFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java b/spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java index c1bd8f080fd..476123fce04 100644 --- a/spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java +++ b/spring-context/src/main/java/org/springframework/remoting/RemoteProxyFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java b/spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java index 8e0401d6fbc..1bea9c145f7 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/CodebaseAwareObjectInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java index 55461ba33ef..8660e2cf5be 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java index 78b9f36a21c..b4e884e2606 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java index fb2bab26a50..180ba0f5633 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java index 3a8c2c5ceb8..d4673dbff6f 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java index 265d2f7034c..431b4e6a0a1 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiBasedExporter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java index 177b1982e95..ba9d8775d99 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java index 30c18ec60b8..1a9d8413a3c 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiClientInterceptorUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java index d878cb33baf..77ddbaf44f3 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java index 5d028402bc7..22cac7f71f0 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiInvocationWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java index ff2687a7514..a635a1fa599 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiProxyFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java index 275c8b532bd..fee68ce8d73 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiRegistryFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java index 6f01f80e33d..dcd5f91f85b 100644 --- a/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java +++ b/spring-context/src/main/java/org/springframework/remoting/rmi/RmiServiceExporter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java b/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java index 7a3dc51aa49..8523ab97edd 100644 --- a/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java +++ b/spring-context/src/main/java/org/springframework/remoting/soap/SoapFaultException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java index 6956ee370a2..2cf59d0d747 100644 --- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java +++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java index b68a6cfd22b..91f87ff65d3 100644 --- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java +++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteExporter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java index dc83e38c417..afb5dd37d48 100644 --- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java +++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocation.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedAccessor.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedAccessor.java index 8bf4bfe4c55..36324bf66fa 100644 --- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedAccessor.java +++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationBasedAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java index e6c7a27e780..3348b7a839f 100644 --- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java +++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java index 7ed9e72b6e5..05c521c7f00 100644 --- a/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java +++ b/spring-context/src/main/java/org/springframework/remoting/support/RemoteInvocationUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java b/spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java index fb95016a49d..832d4899629 100644 --- a/spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java +++ b/spring-context/src/main/java/org/springframework/remoting/support/RemotingSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/SchedulingAwareRunnable.java b/spring-context/src/main/java/org/springframework/scheduling/SchedulingAwareRunnable.java index 9efdba4fc24..4dffa2335f1 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/SchedulingAwareRunnable.java +++ b/spring-context/src/main/java/org/springframework/scheduling/SchedulingAwareRunnable.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/SchedulingException.java b/spring-context/src/main/java/org/springframework/scheduling/SchedulingException.java index 4d59efa3907..468c2073947 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/SchedulingException.java +++ b/spring-context/src/main/java/org/springframework/scheduling/SchedulingException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/SchedulingTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/SchedulingTaskExecutor.java index b5674139855..deef622f854 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/SchedulingTaskExecutor.java +++ b/spring-context/src/main/java/org/springframework/scheduling/SchedulingTaskExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java index b18e7baa58a..defd101789f 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java +++ b/spring-context/src/main/java/org/springframework/scheduling/TaskScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/Trigger.java b/spring-context/src/main/java/org/springframework/scheduling/Trigger.java index 06f569011a0..4c8d9a1ed73 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/Trigger.java +++ b/spring-context/src/main/java/org/springframework/scheduling/Trigger.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/TriggerContext.java b/spring-context/src/main/java/org/springframework/scheduling/TriggerContext.java index 5ba5980b1b7..feeb2ecea6e 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/TriggerContext.java +++ b/spring-context/src/main/java/org/springframework/scheduling/TriggerContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java index 4f0ee681836..f657d306804 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java +++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java index cc1fa39abd8..8d88bf85dd5 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java +++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java index ff7760c8363..d4672431311 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java +++ b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java index 8fe217f52b0..8cfb86f2b33 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java +++ b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/CustomizableThreadFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java index b24b0935e7b..ca237fe1af2 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java +++ b/spring-context/src/main/java/org/springframework/scheduling/backportconcurrent/ThreadPoolTaskExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java index bc9cf37b9f5..ea5bc9ca890 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java index bd41c76a418..b972db06017 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ConcurrentTaskScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java index 6665e3836ec..7ac8d4790e6 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/CustomizableThreadFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java index 92d7d2007d0..964872e1d6e 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ExecutorConfigurationSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.java index 911ecd99229..40d48ad2955 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorTask.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorTask.java index 6eadb637390..07d8c02199f 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorTask.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorTask.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java index ae9a96ec741..19cd880bbb7 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolExecutorFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java index 1a7da1d6163..31dc69d553b 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java index 4d03d5c57cd..e8961e05e36 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java +++ b/spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java index 009a163c28b..39b86694d23 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java +++ b/spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java index be34e5ad191..7f76bfc8307 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java +++ b/spring-context/src/main/java/org/springframework/scheduling/config/SchedulerBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java b/spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java index 12e8aeab076..6ba1d5a552d 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java +++ b/spring-context/src/main/java/org/springframework/scheduling/config/TaskNamespaceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java b/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java index 3f5459e61e8..b3530ebf785 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java +++ b/spring-context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/CronTrigger.java b/spring-context/src/main/java/org/springframework/scheduling/support/CronTrigger.java index 09df2374daa..eca37982e6d 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/support/CronTrigger.java +++ b/spring-context/src/main/java/org/springframework/scheduling/support/CronTrigger.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java b/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java index 07a18033970..b494e4c5ff0 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java +++ b/spring-context/src/main/java/org/springframework/scheduling/support/PeriodicTrigger.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/support/TaskUtils.java b/spring-context/src/main/java/org/springframework/scheduling/support/TaskUtils.java index 4800543853b..81c16bc9a5b 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/support/TaskUtils.java +++ b/spring-context/src/main/java/org/springframework/scheduling/support/TaskUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/timer/DelegatingTimerTask.java b/spring-context/src/main/java/org/springframework/scheduling/timer/DelegatingTimerTask.java index 677daa138dd..60095136923 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/timer/DelegatingTimerTask.java +++ b/spring-context/src/main/java/org/springframework/scheduling/timer/DelegatingTimerTask.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java index 241a96c7cc1..389e9a76b9f 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/scheduling/timer/MethodInvokingTimerTaskFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/timer/ScheduledTimerTask.java b/spring-context/src/main/java/org/springframework/scheduling/timer/ScheduledTimerTask.java index f1885b9701a..90a34dabcf1 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/timer/ScheduledTimerTask.java +++ b/spring-context/src/main/java/org/springframework/scheduling/timer/ScheduledTimerTask.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java b/spring-context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java index 6ddccd151aa..c0de9b4eb91 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/scheduling/timer/TimerFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scheduling/timer/TimerTaskExecutor.java b/spring-context/src/main/java/org/springframework/scheduling/timer/TimerTaskExecutor.java index 42626b4e816..03979dc45af 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/timer/TimerTaskExecutor.java +++ b/spring-context/src/main/java/org/springframework/scheduling/timer/TimerTaskExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java b/spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java index e6a5cf238f7..ccb86745006 100644 --- a/spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java +++ b/spring-context/src/main/java/org/springframework/scripting/ScriptCompilationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scripting/ScriptFactory.java b/spring-context/src/main/java/org/springframework/scripting/ScriptFactory.java index c2d360fa22b..2e2f255ae7e 100644 --- a/spring-context/src/main/java/org/springframework/scripting/ScriptFactory.java +++ b/spring-context/src/main/java/org/springframework/scripting/ScriptFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scripting/ScriptSource.java b/spring-context/src/main/java/org/springframework/scripting/ScriptSource.java index a3ccb89ed4d..2e5a37e4d48 100644 --- a/spring-context/src/main/java/org/springframework/scripting/ScriptSource.java +++ b/spring-context/src/main/java/org/springframework/scripting/ScriptSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java index 3f079267c61..2d94a16cb8f 100644 --- a/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java +++ b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java index 6c8f6ea616f..d71298e29cf 100644 --- a/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java +++ b/spring-context/src/main/java/org/springframework/scripting/bsh/BshScriptUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java b/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java index 8e2b115e549..e66455a8d69 100644 --- a/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java +++ b/spring-context/src/main/java/org/springframework/scripting/config/LangNamespaceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java index 4cde7aa0632..eb741dd3fe6 100644 --- a/spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java +++ b/spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scripting/config/ScriptingDefaultsParser.java b/spring-context/src/main/java/org/springframework/scripting/config/ScriptingDefaultsParser.java index ee87c286783..d0766b95f40 100644 --- a/spring-context/src/main/java/org/springframework/scripting/config/ScriptingDefaultsParser.java +++ b/spring-context/src/main/java/org/springframework/scripting/config/ScriptingDefaultsParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyObjectCustomizer.java b/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyObjectCustomizer.java index b8dd3e967a2..cb4f5b1c17d 100644 --- a/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyObjectCustomizer.java +++ b/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyObjectCustomizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java b/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java index d984d10cdad..e40871defb7 100644 --- a/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java +++ b/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java b/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java index 318b83e1a5e..2271d1b53db 100644 --- a/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java +++ b/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scripting/support/RefreshableScriptTargetSource.java b/spring-context/src/main/java/org/springframework/scripting/support/RefreshableScriptTargetSource.java index 9103452d03d..68ba19653f7 100644 --- a/spring-context/src/main/java/org/springframework/scripting/support/RefreshableScriptTargetSource.java +++ b/spring-context/src/main/java/org/springframework/scripting/support/RefreshableScriptTargetSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java b/spring-context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java index c3cce13a7f1..23be717eacd 100644 --- a/spring-context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java +++ b/spring-context/src/main/java/org/springframework/scripting/support/ResourceScriptSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java b/spring-context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java index abacdd4bfa4..5afede47a8f 100644 --- a/spring-context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java +++ b/spring-context/src/main/java/org/springframework/scripting/support/StaticScriptSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ui/ExtendedModelMap.java b/spring-context/src/main/java/org/springframework/ui/ExtendedModelMap.java index 4d4f37bb167..b2710d4bde5 100644 --- a/spring-context/src/main/java/org/springframework/ui/ExtendedModelMap.java +++ b/spring-context/src/main/java/org/springframework/ui/ExtendedModelMap.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ui/Model.java b/spring-context/src/main/java/org/springframework/ui/Model.java index d68710fc618..4a51e9182c8 100644 --- a/spring-context/src/main/java/org/springframework/ui/Model.java +++ b/spring-context/src/main/java/org/springframework/ui/Model.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ui/ModelMap.java b/spring-context/src/main/java/org/springframework/ui/ModelMap.java index 28a6a687b5e..238b0d9d7a7 100644 --- a/spring-context/src/main/java/org/springframework/ui/ModelMap.java +++ b/spring-context/src/main/java/org/springframework/ui/ModelMap.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java index a67f083cd0d..e20db315c93 100644 --- a/spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java +++ b/spring-context/src/main/java/org/springframework/ui/context/HierarchicalThemeSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ui/context/Theme.java b/spring-context/src/main/java/org/springframework/ui/context/Theme.java index 6dc815ef07e..a2ef92602f2 100644 --- a/spring-context/src/main/java/org/springframework/ui/context/Theme.java +++ b/spring-context/src/main/java/org/springframework/ui/context/Theme.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ui/context/ThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/ThemeSource.java index a4a7e8704cb..85c676aa06e 100644 --- a/spring-context/src/main/java/org/springframework/ui/context/ThemeSource.java +++ b/spring-context/src/main/java/org/springframework/ui/context/ThemeSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java b/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java index 4cf80c84c08..a0c195df32e 100644 --- a/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java +++ b/spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java b/spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java index e65da9b4bc3..e1c5956efa7 100644 --- a/spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java +++ b/spring-context/src/main/java/org/springframework/ui/context/support/UiApplicationContextUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java b/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java index 60d13648882..3ab515bc890 100644 --- a/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java +++ b/spring-context/src/main/java/org/springframework/validation/AbstractErrors.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java b/spring-context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java index fb0199e1fc2..52c86a2b1f1 100644 --- a/spring-context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java +++ b/spring-context/src/main/java/org/springframework/validation/AbstractPropertyBindingResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java b/spring-context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java index 9043faffd8a..dff8bdce9a3 100644 --- a/spring-context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java +++ b/spring-context/src/main/java/org/springframework/validation/BeanPropertyBindingResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/validation/BindingErrorProcessor.java b/spring-context/src/main/java/org/springframework/validation/BindingErrorProcessor.java index 6650c3d1c73..4f877a571af 100644 --- a/spring-context/src/main/java/org/springframework/validation/BindingErrorProcessor.java +++ b/spring-context/src/main/java/org/springframework/validation/BindingErrorProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/validation/BindingResultUtils.java b/spring-context/src/main/java/org/springframework/validation/BindingResultUtils.java index 15d0981bfe8..ae3c0357688 100644 --- a/spring-context/src/main/java/org/springframework/validation/BindingResultUtils.java +++ b/spring-context/src/main/java/org/springframework/validation/BindingResultUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/validation/DefaultBindingErrorProcessor.java b/spring-context/src/main/java/org/springframework/validation/DefaultBindingErrorProcessor.java index 64ea2a3727c..08fc3b97e55 100644 --- a/spring-context/src/main/java/org/springframework/validation/DefaultBindingErrorProcessor.java +++ b/spring-context/src/main/java/org/springframework/validation/DefaultBindingErrorProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/validation/Errors.java b/spring-context/src/main/java/org/springframework/validation/Errors.java index d21cb1f5d1d..bea2a7061bb 100644 --- a/spring-context/src/main/java/org/springframework/validation/Errors.java +++ b/spring-context/src/main/java/org/springframework/validation/Errors.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/validation/FieldError.java b/spring-context/src/main/java/org/springframework/validation/FieldError.java index 2f94663cfbb..0c76cc1622c 100644 --- a/spring-context/src/main/java/org/springframework/validation/FieldError.java +++ b/spring-context/src/main/java/org/springframework/validation/FieldError.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/validation/MessageCodesResolver.java b/spring-context/src/main/java/org/springframework/validation/MessageCodesResolver.java index 5fd476817f2..d86acd476b4 100644 --- a/spring-context/src/main/java/org/springframework/validation/MessageCodesResolver.java +++ b/spring-context/src/main/java/org/springframework/validation/MessageCodesResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/validation/ObjectError.java b/spring-context/src/main/java/org/springframework/validation/ObjectError.java index 5b2dd29ee43..ccfab2f9261 100644 --- a/spring-context/src/main/java/org/springframework/validation/ObjectError.java +++ b/spring-context/src/main/java/org/springframework/validation/ObjectError.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/validation/ValidationUtils.java b/spring-context/src/main/java/org/springframework/validation/ValidationUtils.java index 0e5004e5bd9..9da8e3d26b8 100644 --- a/spring-context/src/main/java/org/springframework/validation/ValidationUtils.java +++ b/spring-context/src/main/java/org/springframework/validation/ValidationUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/validation/Validator.java b/spring-context/src/main/java/org/springframework/validation/Validator.java index f076ea6fe2a..d5d1e48ab14 100644 --- a/spring-context/src/main/java/org/springframework/validation/Validator.java +++ b/spring-context/src/main/java/org/springframework/validation/Validator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java b/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java index 452867a8b2f..b9553992c3d 100644 --- a/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java +++ b/spring-context/src/main/java/org/springframework/validation/support/BindingAwareModelMap.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java b/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java index 1bf169f777c..02fb1e5d2a3 100644 --- a/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java +++ b/spring-context/src/test/java/example/scannable/AutowiredQualifierFooService.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/example/scannable/FooServiceImpl.java b/spring-context/src/test/java/example/scannable/FooServiceImpl.java index e4941f4bf82..1db44f5bb0b 100644 --- a/spring-context/src/test/java/example/scannable/FooServiceImpl.java +++ b/spring-context/src/test/java/example/scannable/FooServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/example/scannable/MessageBean.java b/spring-context/src/test/java/example/scannable/MessageBean.java index 9a3311ac193..a4fc2d26148 100644 --- a/spring-context/src/test/java/example/scannable/MessageBean.java +++ b/spring-context/src/test/java/example/scannable/MessageBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java b/spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java index 601722be844..74191d87e57 100644 --- a/spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java +++ b/spring-context/src/test/java/example/scannable/ScopedProxyTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java b/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java index 292b0586568..eed10c07834 100644 --- a/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java +++ b/spring-context/src/test/java/example/scannable/ServiceInvocationCounter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/example/scannable/StubFooDao.java b/spring-context/src/test/java/example/scannable/StubFooDao.java index 052d9cd25e1..46daeb18920 100644 --- a/spring-context/src/test/java/example/scannable/StubFooDao.java +++ b/spring-context/src/test/java/example/scannable/StubFooDao.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java index a241920c660..0e9f634bd43 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java index e85b6cd311e..a2f1054e9e4 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java index dc32a581db1..e57c4df2172 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java index 913d173a55c..67195904dc8 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java index 6eae7b3b64b..5b606689acd 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java index 977038a1f01..b88de9c97db 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java index 4b1d267b615..e43cc579883 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java index 5d5930c80be..53a81f6e5a7 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java index 08250b6ff35..4df2dc36337 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java index 0eb1c2192d7..07542c3cab0 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java index cde853bf6ae..bf495f0736e 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java index c3e652a3a33..59a3136fdce 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java index 4740e656777..0e7435362af 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java index fc02024d763..5c942d9ddc2 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java index c5512be61d5..4c79347978d 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java index 22e729d6338..e002a9fa1d0 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ProceedTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java index bc6a0a1b41f..5551cbfcb22 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/PropertyDependentAspectTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java index 93fd2a2b596..75e0aeabf0d 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java index a31b0be91ec..2c597c0f049 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java index 8b9ab4ea519..f01bf14a475 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/TargetPointcutSelectionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java index 5bf6196f593..f71d16605df 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java index 2ae946206eb..3a2bc6fda89 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java b/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java index 2bb1fb39a66..1490cf357e1 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/_TestTypes.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests.java index 0829446808f..10f054ab9cb 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java index a8247ac352b..07f4d5c688b 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java index bdf4d1ddc1f..361809558b4 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java index 227903bab0b..f609c08b3e7 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java index 0c2927961dc..2dfa414c65c 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java index ef61c94dfda..c5b7c8c5cf4 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAnnotationBindingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java index 247e416e1ce..8060defdbf3 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/_TestTypes.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java index 8d12136b544..a988324a003 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java index e048453a4fe..9d47785b853 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/spr3064/SPR3064Tests.java @@ -1,5 +1,5 @@ /** - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests.java index 336523137ae..24ce7bcf1fe 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java index 8085f19b229..093a6fe69a4 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericBridgeMethodMatchingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java index 9bf53313296..f0f8d6ff04c 100644 --- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/GenericParameterMatchingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests.java index f2c174522bd..9a0ddffb8f9 100644 --- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests.java +++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests.java index 453040fe3d0..45bd83f77e5 100644 --- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests.java +++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests.java index f7f4d3e8123..fed5ac1eb5e 100644 --- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests.java +++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests.java index dcb1d9c3830..4af0a3b292f 100644 --- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests.java +++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java index 60ec4288f6a..753fb3341a7 100644 --- a/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java index 17103fce2f5..911e4d51542 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java index 0bf067154ac..d5f1e89c62a 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java index e6bf8c37dae..83598caf9b8 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java index 0197bb68400..11805c6d5bb 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java index 54242e6ffc4..da9e177c017 100644 --- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java +++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java index 56b60673948..e47669eaf83 100644 --- a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java +++ b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java b/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java index cf6e0789b6e..5de96fc526f 100644 --- a/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java +++ b/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/Colour.java b/spring-context/src/test/java/org/springframework/beans/Colour.java index 17fd24fec79..a992a2ebfc6 100644 --- a/spring-context/src/test/java/org/springframework/beans/Colour.java +++ b/spring-context/src/test/java/org/springframework/beans/Colour.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java index 8ada7848fa9..c5360de5316 100644 --- a/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-context/src/test/java/org/springframework/beans/INestedTestBean.java index c5c4ed5e679..e0ae5f20a3f 100644 --- a/spring-context/src/test/java/org/springframework/beans/INestedTestBean.java +++ b/spring-context/src/test/java/org/springframework/beans/INestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/IOther.java b/spring-context/src/test/java/org/springframework/beans/IOther.java index 6a8f74187cb..d7fb346185a 100644 --- a/spring-context/src/test/java/org/springframework/beans/IOther.java +++ b/spring-context/src/test/java/org/springframework/beans/IOther.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java index e44bac1740b..9f90cf15bb1 100644 --- a/spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java +++ b/spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java index e136978f9e6..412891c439b 100644 --- a/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/Person.java b/spring-context/src/test/java/org/springframework/beans/Person.java index a78998ad5d4..7c66f4b451b 100644 --- a/spring-context/src/test/java/org/springframework/beans/Person.java +++ b/spring-context/src/test/java/org/springframework/beans/Person.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java index 9a2a3193df2..dbe365f4937 100644 --- a/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java +++ b/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/TestBean.java b/spring-context/src/test/java/org/springframework/beans/TestBean.java index 21526c932bd..c050b64856c 100644 --- a/spring-context/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-context/src/test/java/org/springframework/beans/TestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java index 9c8be8ac4c4..b588561321f 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java index bd402c3040e..f9c4f273826 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java b/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java index 1c1708eca5c..73fe70276e2 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java index 191b3509c73..013a65a0e49 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java index afb3dbe2f1a..959861e6b47 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java b/spring-context/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java index 0e8a09a5a78..4b4d6980564 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java b/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java index 39fdf5be5b8..f54299a03f9 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java b/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java index 6bb485f835f..c69ab5658b1 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/annotation/BridgeMethodAutowiringTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java index 9901e8feb82..71b565f900c 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java b/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java index ebd2ad7ea28..496cc1d63b1 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/factory/support/InjectAnnotationAutowireContextTests.java b/spring-context/src/test/java/org/springframework/beans/factory/support/InjectAnnotationAutowireContextTests.java index 4a32d4582cf..d7cf863defa 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/support/InjectAnnotationAutowireContextTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/support/InjectAnnotationAutowireContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java index d5c2f1ce3d8..28c3bffa8f4 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java index 96adebee0f7..ed9fbbde83b 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java index 4a1923181f5..91d1d7565ad 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/QualifierAnnotationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java index 148c3d2e2b9..7a52f76eda2 100644 --- a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java +++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java b/spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java index 4d4ea48a619..4c72d9d5937 100644 --- a/spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java +++ b/spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/cache/config/CacheableService.java b/spring-context/src/test/java/org/springframework/cache/config/CacheableService.java index 09e2fc4c4b1..81dd758d19d 100644 --- a/spring-context/src/test/java/org/springframework/cache/config/CacheableService.java +++ b/spring-context/src/test/java/org/springframework/cache/config/CacheableService.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java b/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java index b3a19df1897..f9f19b47594 100644 --- a/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java +++ b/spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java index 3e9138fd5e2..04f232cc845 100644 --- a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java +++ b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/ACATester.java b/spring-context/src/test/java/org/springframework/context/ACATester.java index e2603726ccf..c6a63ddb623 100644 --- a/spring-context/src/test/java/org/springframework/context/ACATester.java +++ b/spring-context/src/test/java/org/springframework/context/ACATester.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java index fe8201644ba..a7207435209 100644 --- a/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java b/spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java index 8ec1c33a345..f4454c64daa 100644 --- a/spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java +++ b/spring-context/src/test/java/org/springframework/context/BeanThatBroadcasts.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/BeanThatListens.java b/spring-context/src/test/java/org/springframework/context/BeanThatListens.java index 9ca20496a31..479ddb33de2 100644 --- a/spring-context/src/test/java/org/springframework/context/BeanThatListens.java +++ b/spring-context/src/test/java/org/springframework/context/BeanThatListens.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java index 68664e6a01b..69fea0435db 100644 --- a/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java +++ b/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/TestListener.java b/spring-context/src/test/java/org/springframework/context/TestListener.java index c4d12a1881d..8bcaa6d6c17 100644 --- a/spring-context/src/test/java/org/springframework/context/TestListener.java +++ b/spring-context/src/test/java/org/springframework/context/TestListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java b/spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java index a2eaf26f79e..33bdac26e81 100644 --- a/spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java +++ b/spring-context/src/test/java/org/springframework/context/access/ContextBeanFactoryReferenceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java b/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java index eb3bc80d39b..e87e6023780 100644 --- a/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java +++ b/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java b/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java index e4d3dfbe147..6c63077602a 100644 --- a/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java +++ b/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/access/DefaultLocatorFactoryTests.java b/spring-context/src/test/java/org/springframework/context/access/DefaultLocatorFactoryTests.java index eee36e9d9bc..633127e84b7 100644 --- a/spring-context/src/test/java/org/springframework/context/access/DefaultLocatorFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/context/access/DefaultLocatorFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java index 50ed95df10d..bfbc2c9ef65 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java index f82a42fc5c6..23973400039 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationConfigApplicationContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java index 12b0a100b71..71542305057 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java index 8e8cf870959..16565d9b1d7 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AsmCircularImportDetectionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AsmCircularImportDetectionTests.java index 01e25e80300..61b2612d29c 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/AsmCircularImportDetectionTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/AsmCircularImportDetectionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java index 1f81d31669d..1e4deb22f08 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java index b377f6b4375..5a4508b9037 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserWithUserDefinedStrategiesTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserWithUserDefinedStrategiesTests.java index c7237a2f6ba..02749a2e516 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserWithUserDefinedStrategiesTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserWithUserDefinedStrategiesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java index 3e672f556c4..ee826eb33a0 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndAutowiringTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndAutowiringTests.java index d79256a53ba..81e7b1af66b 100755 --- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndAutowiringTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndAutowiringTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java index 3fc42a1f147..570d2a53aac 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationWithFactoryBeanAndParametersTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java index f8613d29ace..7baf82681eb 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java index 48ef3c6eaf4..9a3ced52d70 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/EnableLoadTimeWeavingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java b/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java index a52d8cc5045..c01fc14cec5 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/NestedConfigurationClassTests.java b/spring-context/src/test/java/org/springframework/context/annotation/NestedConfigurationClassTests.java index 6c8540be513..c6ea3cb6aca 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/NestedConfigurationClassTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/NestedConfigurationClassTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java b/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java index 176aee5c32d..455cdad855c 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/SimpleConfigTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java b/spring-context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java index d3a14c0ab38..22c7cbc8244 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/SimpleScanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java index e661727c404..25b2192cd8b 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java index 68dd81c5af2..48780c545fe 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/Spr6602Tests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java b/spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java index 6bed19ab6ea..f57fac7fd84 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/TestBeanNameGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java b/spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java index eef18312ba0..bde4c67cb08 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/TestScopeMetadataResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java index e061bc7edf5..2051c97fe0e 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanAnnotationAttributePropagationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanAnnotationAttributePropagationTests.java index da770cb924e..f0dcbab8abb 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanAnnotationAttributePropagationTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/BeanAnnotationAttributePropagationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java index c983ea4e3ac..9c94716494a 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java index d198b49180b..c18cc981e7e 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassCglibCallbackDeregistrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java index 7bdf1daac51..9ac6ab319fc 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java index c27d84c1310..78314569d20 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java index 2d4783496a1..b23695db3ba 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java index 6be61e22c5e..49007b8a348 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java index 910e71b9c96..02f0fd8e3e6 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation/spr8761/Spr8761Tests.java b/spring-context/src/test/java/org/springframework/context/annotation/spr8761/Spr8761Tests.java index be87313477b..206ac4d8bcb 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/spr8761/Spr8761Tests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/spr8761/Spr8761Tests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java b/spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java index 1363f45d896..5c53712e5aa 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java +++ b/spring-context/src/test/java/org/springframework/context/annotation3/StubFooDao.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java b/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java index 6e1461dd361..415cf895198 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java +++ b/spring-context/src/test/java/org/springframework/context/annotation5/OtherFooDao.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/conversionservice/Bar.java b/spring-context/src/test/java/org/springframework/context/conversionservice/Bar.java index 80949157002..1c8bdb54dde 100644 --- a/spring-context/src/test/java/org/springframework/context/conversionservice/Bar.java +++ b/spring-context/src/test/java/org/springframework/context/conversionservice/Bar.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java b/spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java index c319cde5203..1771dd7cf57 100644 --- a/spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java +++ b/spring-context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java b/spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java index 654ffa9153f..56090d33273 100644 --- a/spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java +++ b/spring-context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java index 19a54ec52d0..56233a73730 100644 --- a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java index 31ca74fa67a..4a9a4db08d2 100644 --- a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java b/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java index c6f95b24bba..380f29125db 100644 --- a/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/LifecycleEventTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java index b23b6861162..b49857d8cbb 100644 --- a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java +++ b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/support/Assembler.java b/spring-context/src/test/java/org/springframework/context/support/Assembler.java index 60df14aeb85..26c750cff6d 100644 --- a/spring-context/src/test/java/org/springframework/context/support/Assembler.java +++ b/spring-context/src/test/java/org/springframework/context/support/Assembler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/support/AutowiredService.java b/spring-context/src/test/java/org/springframework/context/support/AutowiredService.java index 3ab4a12d959..d7592088c72 100644 --- a/spring-context/src/test/java/org/springframework/context/support/AutowiredService.java +++ b/spring-context/src/test/java/org/springframework/context/support/AutowiredService.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java index 94d465bcdaf..8c39e53d32e 100644 --- a/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java index 903ff415329..38939c7fcb5 100644 --- a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java index 9ee0025433f..49fda87dab2 100644 --- a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java index cc345c79e07..4f4e8860e13 100644 --- a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java b/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java index 24e94a154b9..450a7291a5e 100644 --- a/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java +++ b/spring-context/src/test/java/org/springframework/context/support/LifecycleTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/support/Logic.java b/spring-context/src/test/java/org/springframework/context/support/Logic.java index 71d169120ec..79daad0e297 100644 --- a/spring-context/src/test/java/org/springframework/context/support/Logic.java +++ b/spring-context/src/test/java/org/springframework/context/support/Logic.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/support/NoOpAdvice.java b/spring-context/src/test/java/org/springframework/context/support/NoOpAdvice.java index 68f1ce529c4..9b4c7ec1079 100644 --- a/spring-context/src/test/java/org/springframework/context/support/NoOpAdvice.java +++ b/spring-context/src/test/java/org/springframework/context/support/NoOpAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java index e3f9ada36f0..39482f71cfc 100644 --- a/spring-context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java index bfb2adc69af..3e640d91457 100644 --- a/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java b/spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java index 91ff6bd0229..3e30e569cc5 100644 --- a/spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java +++ b/spring-context/src/test/java/org/springframework/context/support/ResourceConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/support/Service.java b/spring-context/src/test/java/org/springframework/context/support/Service.java index a0be957e75c..ee9d5095d74 100644 --- a/spring-context/src/test/java/org/springframework/context/support/Service.java +++ b/spring-context/src/test/java/org/springframework/context/support/Service.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java b/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java index 42d89e92545..e03b30eaa68 100644 --- a/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java +++ b/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java b/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java index 73c189e36e5..6d82d77d88b 100644 --- a/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java +++ b/spring-context/src/test/java/org/springframework/context/support/Spr7283Tests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/support/Spr7816Tests.java b/spring-context/src/test/java/org/springframework/context/support/Spr7816Tests.java index 9c7e9a2319b..6fb17f353b3 100644 --- a/spring-context/src/test/java/org/springframework/context/support/Spr7816Tests.java +++ b/spring-context/src/test/java/org/springframework/context/support/Spr7816Tests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java index fc211895acd..9c7ea0ca659 100644 --- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java index b6f936dd1aa..1c63274f197 100644 --- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java index 8469cbd64f2..9fa8ddd436d 100644 --- a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java +++ b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/context/support/TestIF.java b/spring-context/src/test/java/org/springframework/context/support/TestIF.java index 7ee7a9c0069..5ce3da22d0d 100644 --- a/spring-context/src/test/java/org/springframework/context/support/TestIF.java +++ b/spring-context/src/test/java/org/springframework/context/support/TestIF.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java b/spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java index 701f7518ee1..0dd6ce2cf21 100644 --- a/spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java +++ b/spring-context/src/test/java/org/springframework/core/task/NoOpRunnable.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java index efa2967148f..b8206b21a28 100644 --- a/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java index 53e414146e3..c0a78215bd6 100644 --- a/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/access/LocalStatelessSessionProxyFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java index ac3d59b47eb..c0fa18c2c33 100644 --- a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java index 527babf6030..8e03115c1f3 100644 --- a/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteStatelessSessionProxyFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/format/number/CurrencyFormatterTests.java b/spring-context/src/test/java/org/springframework/format/number/CurrencyFormatterTests.java index 4cb1bfdd589..68c5b598f98 100644 --- a/spring-context/src/test/java/org/springframework/format/number/CurrencyFormatterTests.java +++ b/spring-context/src/test/java/org/springframework/format/number/CurrencyFormatterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java b/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java index 556d5a78bd4..9503e82067a 100644 --- a/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java +++ b/spring-context/src/test/java/org/springframework/format/number/NumberFormattingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java index d501dafa400..ae9aa8be0e8 100644 --- a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java b/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java index 8abddb5ea30..f39f28b40cf 100644 --- a/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java +++ b/spring-context/src/test/java/org/springframework/instrument/classloading/ReflectiveLoadTimeWeaverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java b/spring-context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java index 506a883136b..3cafa8950e0 100644 --- a/spring-context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java +++ b/spring-context/src/test/java/org/springframework/instrument/classloading/ResourceOverridingShadowingClassLoaderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java b/spring-context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java index 7867139ae31..b2efa269c1e 100644 --- a/spring-context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java +++ b/spring-context/src/test/java/org/springframework/instrument/classloading/glassfish/GlassFishLoadTimeWeaverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java b/spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java index 3f3580b37dd..a213fdd4ac5 100644 --- a/spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/AbstractJmxTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java b/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java index 06122a2a02e..12dbf05a50c 100644 --- a/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/jmx/IJmxTestBean.java b/spring-context/src/test/java/org/springframework/jmx/IJmxTestBean.java index 0a6ba490356..be001e23c4c 100644 --- a/spring-context/src/test/java/org/springframework/jmx/IJmxTestBean.java +++ b/spring-context/src/test/java/org/springframework/jmx/IJmxTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java b/spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java index 5268a8d6533..d42fbf201b3 100644 --- a/spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java +++ b/spring-context/src/test/java/org/springframework/jmx/JmxTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java b/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java index 29d2c04037d..7842ee328cb 100644 --- a/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java b/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java index b33a5793aa3..7082efec132 100644 --- a/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java +++ b/spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java index 67c8adc64b4..2c71236d78a 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/export/DateRange.java b/spring-context/src/test/java/org/springframework/jmx/export/DateRange.java index 5603c43abd1..64f3f03b897 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/DateRange.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/DateRange.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/export/ExceptionOnInitBean.java b/spring-context/src/test/java/org/springframework/jmx/export/ExceptionOnInitBean.java index c61cd388aa2..a59d950a8d7 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/ExceptionOnInitBean.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/ExceptionOnInitBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java index 716fccfc7c5..59740fa0db4 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java index 3eb6fe9baa1..45244123079 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java b/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java index ef79c481c6b..a6abda7ed2e 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java index ba052565270..c95000c59da 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java b/spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java index 7ed0f6c7ec3..53da8a65824 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java index e75c9a7ad52..d74787b7f81 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java index 4d751020b6e..191b2f9ae36 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java index dc9f58375c2..9b0982d801d 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java b/spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java index 675deb0ae3d..97b24e29ec4 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java index 79da547c136..59b71a58b27 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java index 968b955a477..68811d712a8 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java index 15e5812236b..4c7c414d850 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/ICustomJmxBean.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/ICustomJmxBean.java index 1d74177d3b4..311b7c67a51 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/ICustomJmxBean.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/ICustomJmxBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java index 27beb0b470f..d4034ed4494 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java index 0ada6be5756..dc9db0fc5e2 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java index cfe72619900..76b8ad5639e 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java index 53629c55bb6..2c2a8618eb1 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java index 2015cbbece8..35fe1082703 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java index 9cb85d799d1..f037d87bcb7 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java index e13a4ff2aff..8a492930066 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java index b7741897e70..062a45febd7 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java index 1ae6c75130a..2b0bbaeefcf 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java index 5e0a4bf9849..729e784464b 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java index 28696ff1a16..df11e8b4bba 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java index 4b0e1a39207..3050b6f8e87 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java index 4c474100a79..3521619c224 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java b/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java index cfffabaead9..14986a19596 100644 --- a/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java b/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java index 333d2e5f27c..c006f6fab7e 100644 --- a/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java index d53d8366fe8..598bc73e8c9 100644 --- a/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java index 6244e0fae61..a99ef772f01 100644 --- a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateEditorTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateEditorTests.java index cf2c73b5068..b191a7ada5b 100644 --- a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateEditorTests.java +++ b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateEditorTests.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java index bf98aa1adc7..40188024759 100644 --- a/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java +++ b/spring-context/src/test/java/org/springframework/jndi/JndiTemplateTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java b/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java index 3851c6bbee3..23bac25d536 100644 --- a/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java +++ b/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java index 9b3d10470da..71736866063 100644 --- a/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java +++ b/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java index 5ab0d313777..4e1641b2cd8 100644 --- a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java +++ b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java index 32908a306aa..883db7bfd3f 100644 --- a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java +++ b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java b/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java index c92f3d0aca0..1c492f3759a 100644 --- a/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java +++ b/spring-context/src/test/java/org/springframework/remoting/rmi/RmiSupportTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java index e52582125a1..86116151934 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java index 4808b1011a5..ee40acf24ad 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java index c17d9f27faa..7320cea1d19 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ThreadPoolTaskSchedulerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java b/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java index 6c32a85bd08..74e3d76639c 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java b/spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java index 8e045073255..5d6aec6f41f 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/support/PeriodicTriggerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java index 5d210b344ae..f45f032382a 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java index 4632e4852c7..2469e55823e 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/scripting/ScriptBean.java b/spring-context/src/test/java/org/springframework/scripting/ScriptBean.java index 95e40c10980..2bc727e4b4b 100644 --- a/spring-context/src/test/java/org/springframework/scripting/ScriptBean.java +++ b/spring-context/src/test/java/org/springframework/scripting/ScriptBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java index 01a4f6a78cc..8add303ba8d 100644 --- a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java b/spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java index f00e5148039..c2648628ea4 100644 --- a/spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java +++ b/spring-context/src/test/java/org/springframework/scripting/config/OtherTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java b/spring-context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java index fc19107ced6..5e85cc6424f 100644 --- a/spring-context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/config/ScriptingDefaultsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java b/spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java index 4f55dc01f8a..030ac6b0463 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/ConcreteMessenger.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java index 132d9211c05..78e61a0607f 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyClassLoadingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java index 9aa2b1436bf..86214124a8e 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/TestException.java b/spring-context/src/test/java/org/springframework/scripting/groovy/TestException.java index 95b21bcda2a..389b38d3b6f 100644 --- a/spring-context/src/test/java/org/springframework/scripting/groovy/TestException.java +++ b/spring-context/src/test/java/org/springframework/scripting/groovy/TestException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java index f2899f520e8..962e72b766a 100644 --- a/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java b/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java index 3e0589c7b32..41a3749ca15 100644 --- a/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java +++ b/spring-context/src/test/java/org/springframework/scripting/jruby/WrapperAdder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java b/spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java index 12b3496757f..5a5b72715c5 100644 --- a/spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/support/RefreshableScriptTargetSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java b/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java index 5303be385a9..e1fe7c848e0 100644 --- a/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/support/ResourceScriptSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java index 7b6b40b2581..47b65817275 100644 --- a/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java b/spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java index d67f8d47b75..7363033668d 100644 --- a/spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java +++ b/spring-context/src/test/java/org/springframework/scripting/support/StubMessenger.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java index 30835d1dff6..09a8c6aaa8d 100644 --- a/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java +++ b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/util/SerializationTestUtils.java b/spring-context/src/test/java/org/springframework/util/SerializationTestUtils.java index 9ae4f54ec24..b20121d864c 100644 --- a/spring-context/src/test/java/org/springframework/util/SerializationTestUtils.java +++ b/spring-context/src/test/java/org/springframework/util/SerializationTestUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java index 7d00f311843..543999cc890 100644 --- a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java +++ b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java index ac5b020c9d7..9107bb3a59d 100644 --- a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java +++ b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java b/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java index 48a9b9bfe9b..1c7fe2c708e 100644 --- a/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java +++ b/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java index 43ac003895e..214f797fa0e 100644 --- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java +++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/MethodValidationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java b/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java index fe373ecc7e8..a8a3a01e3a3 100644 --- a/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java +++ b/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java b/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java index 89fc45aeb5e..5aa37b61e14 100644 --- a/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java +++ b/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/test/advice/MethodCounter.java b/spring-context/src/test/java/test/advice/MethodCounter.java index 8c29886a3df..e0e45d6f142 100644 --- a/spring-context/src/test/java/test/advice/MethodCounter.java +++ b/spring-context/src/test/java/test/advice/MethodCounter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java b/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java index 284cfc51931..bdcb2f2c9e4 100644 --- a/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java +++ b/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/test/beans/CustomScope.java b/spring-context/src/test/java/test/beans/CustomScope.java index 2f63f3cbfe5..32de2322644 100644 --- a/spring-context/src/test/java/test/beans/CustomScope.java +++ b/spring-context/src/test/java/test/beans/CustomScope.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/test/beans/Employee.java b/spring-context/src/test/java/test/beans/Employee.java index d93ca6ed60a..537a5a88335 100644 --- a/spring-context/src/test/java/test/beans/Employee.java +++ b/spring-context/src/test/java/test/beans/Employee.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/test/beans/FactoryMethods.java b/spring-context/src/test/java/test/beans/FactoryMethods.java index ee25e7042b1..8e0f55ce777 100644 --- a/spring-context/src/test/java/test/beans/FactoryMethods.java +++ b/spring-context/src/test/java/test/beans/FactoryMethods.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/test/beans/ITestBean.java b/spring-context/src/test/java/test/beans/ITestBean.java index 81c0e45e3b5..242d5e38503 100644 --- a/spring-context/src/test/java/test/beans/ITestBean.java +++ b/spring-context/src/test/java/test/beans/ITestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/test/beans/NestedTestBean.java b/spring-context/src/test/java/test/beans/NestedTestBean.java index 70736e816e7..0546fdadebb 100644 --- a/spring-context/src/test/java/test/beans/NestedTestBean.java +++ b/spring-context/src/test/java/test/beans/NestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/test/beans/SideEffectBean.java b/spring-context/src/test/java/test/beans/SideEffectBean.java index 990989bb19c..52b78737175 100644 --- a/spring-context/src/test/java/test/beans/SideEffectBean.java +++ b/spring-context/src/test/java/test/beans/SideEffectBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/test/beans/TestBean.java b/spring-context/src/test/java/test/beans/TestBean.java index 4e6489e168c..4b98eab870e 100644 --- a/spring-context/src/test/java/test/beans/TestBean.java +++ b/spring-context/src/test/java/test/beans/TestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/test/interceptor/NopInterceptor.java b/spring-context/src/test/java/test/interceptor/NopInterceptor.java index ccda8189944..b1cdf832a4a 100644 --- a/spring-context/src/test/java/test/interceptor/NopInterceptor.java +++ b/spring-context/src/test/java/test/interceptor/NopInterceptor.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java b/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java index cec29e27498..d8d179f7e43 100644 --- a/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java +++ b/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java b/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java index 038d1cc6af1..eb9789edb37 100644 --- a/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java +++ b/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/test/mixin/DefaultLockable.java b/spring-context/src/test/java/test/mixin/DefaultLockable.java index ec739f29eed..2e84161be94 100644 --- a/spring-context/src/test/java/test/mixin/DefaultLockable.java +++ b/spring-context/src/test/java/test/mixin/DefaultLockable.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/test/mixin/LockMixin.java b/spring-context/src/test/java/test/mixin/LockMixin.java index 5894f97a9be..e9463cdc9b8 100644 --- a/spring-context/src/test/java/test/mixin/LockMixin.java +++ b/spring-context/src/test/java/test/mixin/LockMixin.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/test/mixin/LockMixinAdvisor.java b/spring-context/src/test/java/test/mixin/LockMixinAdvisor.java index 7ee37ed6846..50667a7b0dc 100644 --- a/spring-context/src/test/java/test/mixin/LockMixinAdvisor.java +++ b/spring-context/src/test/java/test/mixin/LockMixinAdvisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/test/mixin/Lockable.java b/spring-context/src/test/java/test/mixin/Lockable.java index dd006ad449a..a5f6d111464 100644 --- a/spring-context/src/test/java/test/mixin/Lockable.java +++ b/spring-context/src/test/java/test/mixin/Lockable.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/test/mixin/LockedException.java b/spring-context/src/test/java/test/mixin/LockedException.java index 1ca010f1649..96f46e484e3 100644 --- a/spring-context/src/test/java/test/mixin/LockedException.java +++ b/spring-context/src/test/java/test/mixin/LockedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-context/src/test/java/test/util/TimeStamped.java b/spring-context/src/test/java/test/util/TimeStamped.java index 2de8e381e2a..4fedb8998b0 100644 --- a/spring-context/src/test/java/test/util/TimeStamped.java +++ b/spring-context/src/test/java/test/util/TimeStamped.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/AttributeAccessor.java b/spring-core/src/main/java/org/springframework/core/AttributeAccessor.java index b0e4757d4c3..27130bce2b3 100644 --- a/spring-core/src/main/java/org/springframework/core/AttributeAccessor.java +++ b/spring-core/src/main/java/org/springframework/core/AttributeAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java b/spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java index a170bb10d73..cf351f42cf1 100644 --- a/spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java +++ b/spring-core/src/main/java/org/springframework/core/AttributeAccessorSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java b/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java index ef63695b577..c16cdb39dc2 100644 --- a/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java +++ b/spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java b/spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java index 45ff9c468e9..4d48b0449d4 100644 --- a/spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java +++ b/spring-core/src/main/java/org/springframework/core/ConfigurableObjectInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/ConstantException.java b/spring-core/src/main/java/org/springframework/core/ConstantException.java index 577464fe290..451b46b8573 100644 --- a/spring-core/src/main/java/org/springframework/core/ConstantException.java +++ b/spring-core/src/main/java/org/springframework/core/ConstantException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/ControlFlow.java b/spring-core/src/main/java/org/springframework/core/ControlFlow.java index 908501d12a0..bc754211b5e 100644 --- a/spring-core/src/main/java/org/springframework/core/ControlFlow.java +++ b/spring-core/src/main/java/org/springframework/core/ControlFlow.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/Conventions.java b/spring-core/src/main/java/org/springframework/core/Conventions.java index 035aefd9f78..7ea7c825b0f 100644 --- a/spring-core/src/main/java/org/springframework/core/Conventions.java +++ b/spring-core/src/main/java/org/springframework/core/Conventions.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/ErrorCoded.java b/spring-core/src/main/java/org/springframework/core/ErrorCoded.java index 62849516ae8..1425fe8492a 100644 --- a/spring-core/src/main/java/org/springframework/core/ErrorCoded.java +++ b/spring-core/src/main/java/org/springframework/core/ErrorCoded.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java b/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java index 7a243abad74..c3b05e35fe1 100644 --- a/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java +++ b/spring-core/src/main/java/org/springframework/core/GenericCollectionTypeResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/InfrastructureProxy.java b/spring-core/src/main/java/org/springframework/core/InfrastructureProxy.java index 19206573a91..18f90286417 100644 --- a/spring-core/src/main/java/org/springframework/core/InfrastructureProxy.java +++ b/spring-core/src/main/java/org/springframework/core/InfrastructureProxy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/JdkVersion.java b/spring-core/src/main/java/org/springframework/core/JdkVersion.java index 270b276ebc7..b66c85b9deb 100644 --- a/spring-core/src/main/java/org/springframework/core/JdkVersion.java +++ b/spring-core/src/main/java/org/springframework/core/JdkVersion.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/NestedCheckedException.java b/spring-core/src/main/java/org/springframework/core/NestedCheckedException.java index 0716a62cb8a..8f72b5eab4d 100644 --- a/spring-core/src/main/java/org/springframework/core/NestedCheckedException.java +++ b/spring-core/src/main/java/org/springframework/core/NestedCheckedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/NestedIOException.java b/spring-core/src/main/java/org/springframework/core/NestedIOException.java index 536d5c299a8..9bd7b88eb12 100644 --- a/spring-core/src/main/java/org/springframework/core/NestedIOException.java +++ b/spring-core/src/main/java/org/springframework/core/NestedIOException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/NestedRuntimeException.java b/spring-core/src/main/java/org/springframework/core/NestedRuntimeException.java index 4d18861b883..520c8bc9ac5 100644 --- a/spring-core/src/main/java/org/springframework/core/NestedRuntimeException.java +++ b/spring-core/src/main/java/org/springframework/core/NestedRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/Ordered.java b/spring-core/src/main/java/org/springframework/core/Ordered.java index c949b3958e2..fcabe86a243 100644 --- a/spring-core/src/main/java/org/springframework/core/Ordered.java +++ b/spring-core/src/main/java/org/springframework/core/Ordered.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/OverridingClassLoader.java b/spring-core/src/main/java/org/springframework/core/OverridingClassLoader.java index 0d4755229d6..597a392304a 100644 --- a/spring-core/src/main/java/org/springframework/core/OverridingClassLoader.java +++ b/spring-core/src/main/java/org/springframework/core/OverridingClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java b/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java index de3da1b5407..e65e88cd21c 100644 --- a/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java +++ b/spring-core/src/main/java/org/springframework/core/PrioritizedParameterNameDiscoverer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java b/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java index 72772d12549..c036f27ad99 100644 --- a/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java +++ b/spring-core/src/main/java/org/springframework/core/SmartClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/SpringVersion.java b/spring-core/src/main/java/org/springframework/core/SpringVersion.java index 6d80ff886ff..38426f1be84 100644 --- a/spring-core/src/main/java/org/springframework/core/SpringVersion.java +++ b/spring-core/src/main/java/org/springframework/core/SpringVersion.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/annotation/Order.java b/spring-core/src/main/java/org/springframework/core/annotation/Order.java index 478ce0f6199..54f81677dbb 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/Order.java +++ b/spring-core/src/main/java/org/springframework/core/annotation/Order.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java b/spring-core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java index 56d0f2178de..8a45f037e14 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/ConversionServiceFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/IdToEntityConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/IdToEntityConverter.java index 2586a4c99a8..653712660b1 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/IdToEntityConverter.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/IdToEntityConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java index af44fb8e1b8..0448e5824f6 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java index 2cb57adc3a1..4a278f92eb7 100644 --- a/spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java +++ b/spring-core/src/main/java/org/springframework/core/enums/AbstractCachingLabeledEnumResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java index d0279487183..cee9535cee0 100644 --- a/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java +++ b/spring-core/src/main/java/org/springframework/core/enums/AbstractGenericLabeledEnum.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java index 6bcdb72ec0f..3c2860f74b8 100644 --- a/spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java +++ b/spring-core/src/main/java/org/springframework/core/enums/AbstractLabeledEnum.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/enums/LabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/LabeledEnum.java index 25b7e5e1caa..dc2325bfac3 100644 --- a/spring-core/src/main/java/org/springframework/core/enums/LabeledEnum.java +++ b/spring-core/src/main/java/org/springframework/core/enums/LabeledEnum.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/enums/LabeledEnumResolver.java b/spring-core/src/main/java/org/springframework/core/enums/LabeledEnumResolver.java index b5416df813c..7b374a70b0c 100644 --- a/spring-core/src/main/java/org/springframework/core/enums/LabeledEnumResolver.java +++ b/spring-core/src/main/java/org/springframework/core/enums/LabeledEnumResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java index 0cf24130912..cb70971aab1 100644 --- a/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java +++ b/spring-core/src/main/java/org/springframework/core/enums/LetterCodedLabeledEnum.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/enums/ShortCodedLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/ShortCodedLabeledEnum.java index ca74beac923..27a78d1c660 100644 --- a/spring-core/src/main/java/org/springframework/core/enums/ShortCodedLabeledEnum.java +++ b/spring-core/src/main/java/org/springframework/core/enums/ShortCodedLabeledEnum.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java index 1fd9da9f03f..e6440cc3b64 100644 --- a/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java +++ b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnum.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnumResolver.java b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnumResolver.java index b8759f1e02f..3d9f78a402f 100644 --- a/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnumResolver.java +++ b/spring-core/src/main/java/org/springframework/core/enums/StaticLabeledEnumResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java b/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java index 3eff20f4d2f..d0a936effd5 100644 --- a/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java +++ b/spring-core/src/main/java/org/springframework/core/enums/StringCodedLabeledEnum.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/env/EnvironmentCapable.java b/spring-core/src/main/java/org/springframework/core/env/EnvironmentCapable.java index 3c53c712757..e95528fa353 100644 --- a/spring-core/src/main/java/org/springframework/core/env/EnvironmentCapable.java +++ b/spring-core/src/main/java/org/springframework/core/env/EnvironmentCapable.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java b/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java index 2f245121edf..d195def9693 100644 --- a/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java +++ b/spring-core/src/main/java/org/springframework/core/io/ByteArrayResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java b/spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java index 51470f45d91..00f267e4439 100644 --- a/spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java +++ b/spring-core/src/main/java/org/springframework/core/io/ClassRelativeResourceLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java b/spring-core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java index ba631801f96..1a390f04ec0 100644 --- a/spring-core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java +++ b/spring-core/src/main/java/org/springframework/core/io/DefaultResourceLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java b/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java index 2ff0a1f1c3b..8385891ea3a 100644 --- a/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java +++ b/spring-core/src/main/java/org/springframework/core/io/DescriptiveResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java b/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java index 4b6e7f1fc08..d9b2405c99c 100644 --- a/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java +++ b/spring-core/src/main/java/org/springframework/core/io/InputStreamResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/io/ResourceEditor.java b/spring-core/src/main/java/org/springframework/core/io/ResourceEditor.java index f8a8430c25a..0f86c14683d 100644 --- a/spring-core/src/main/java/org/springframework/core/io/ResourceEditor.java +++ b/spring-core/src/main/java/org/springframework/core/io/ResourceEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/io/ResourceLoader.java b/spring-core/src/main/java/org/springframework/core/io/ResourceLoader.java index 360c8f9cf7e..958746178fa 100644 --- a/spring-core/src/main/java/org/springframework/core/io/ResourceLoader.java +++ b/spring-core/src/main/java/org/springframework/core/io/ResourceLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/io/WritableResource.java b/spring-core/src/main/java/org/springframework/core/io/WritableResource.java index acb688dad95..72d4fe34ed3 100644 --- a/spring-core/src/main/java/org/springframework/core/io/WritableResource.java +++ b/spring-core/src/main/java/org/springframework/core/io/WritableResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/io/support/EncodedResource.java b/spring-core/src/main/java/org/springframework/core/io/support/EncodedResource.java index 36649fdf189..405a16e2a88 100644 --- a/spring-core/src/main/java/org/springframework/core/io/support/EncodedResource.java +++ b/spring-core/src/main/java/org/springframework/core/io/support/EncodedResource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/io/support/LocalizedResourceHelper.java b/spring-core/src/main/java/org/springframework/core/io/support/LocalizedResourceHelper.java index 485ddae1f24..57f2645a986 100644 --- a/spring-core/src/main/java/org/springframework/core/io/support/LocalizedResourceHelper.java +++ b/spring-core/src/main/java/org/springframework/core/io/support/LocalizedResourceHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/io/support/ResourceArrayPropertyEditor.java b/spring-core/src/main/java/org/springframework/core/io/support/ResourceArrayPropertyEditor.java index 02c14657be4..12c6fb7aca4 100644 --- a/spring-core/src/main/java/org/springframework/core/io/support/ResourceArrayPropertyEditor.java +++ b/spring-core/src/main/java/org/springframework/core/io/support/ResourceArrayPropertyEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/io/support/ResourcePatternUtils.java b/spring-core/src/main/java/org/springframework/core/io/support/ResourcePatternUtils.java index c995946519f..9c0c12eecd1 100644 --- a/spring-core/src/main/java/org/springframework/core/io/support/ResourcePatternUtils.java +++ b/spring-core/src/main/java/org/springframework/core/io/support/ResourcePatternUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java b/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java index a247769a7ae..f61f697d2f7 100644 --- a/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java +++ b/spring-core/src/main/java/org/springframework/core/serializer/DefaultDeserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/serializer/DefaultSerializer.java b/spring-core/src/main/java/org/springframework/core/serializer/DefaultSerializer.java index 8e03728e8c2..04fe8bed5a8 100644 --- a/spring-core/src/main/java/org/springframework/core/serializer/DefaultSerializer.java +++ b/spring-core/src/main/java/org/springframework/core/serializer/DefaultSerializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/serializer/Deserializer.java b/spring-core/src/main/java/org/springframework/core/serializer/Deserializer.java index 0219a70e429..f64fbdf762f 100644 --- a/spring-core/src/main/java/org/springframework/core/serializer/Deserializer.java +++ b/spring-core/src/main/java/org/springframework/core/serializer/Deserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/serializer/Serializer.java b/spring-core/src/main/java/org/springframework/core/serializer/Serializer.java index b1e0bb95e07..8af65195243 100644 --- a/spring-core/src/main/java/org/springframework/core/serializer/Serializer.java +++ b/spring-core/src/main/java/org/springframework/core/serializer/Serializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java b/spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java index 60de9d1e3f0..274a6cb0559 100644 --- a/spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java +++ b/spring-core/src/main/java/org/springframework/core/serializer/support/SerializationFailedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/style/DefaultToStringStyler.java b/spring-core/src/main/java/org/springframework/core/style/DefaultToStringStyler.java index be370e60a1a..f81cb4a82ec 100644 --- a/spring-core/src/main/java/org/springframework/core/style/DefaultToStringStyler.java +++ b/spring-core/src/main/java/org/springframework/core/style/DefaultToStringStyler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java b/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java index 46a3383daf0..2e6251c0f5a 100644 --- a/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java +++ b/spring-core/src/main/java/org/springframework/core/style/DefaultValueStyler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/style/StylerUtils.java b/spring-core/src/main/java/org/springframework/core/style/StylerUtils.java index 8fc918c0ef0..91e09deefbd 100644 --- a/spring-core/src/main/java/org/springframework/core/style/StylerUtils.java +++ b/spring-core/src/main/java/org/springframework/core/style/StylerUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/style/ToStringCreator.java b/spring-core/src/main/java/org/springframework/core/style/ToStringCreator.java index 08a90a5fd0e..5871f8dfccf 100644 --- a/spring-core/src/main/java/org/springframework/core/style/ToStringCreator.java +++ b/spring-core/src/main/java/org/springframework/core/style/ToStringCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/style/ToStringStyler.java b/spring-core/src/main/java/org/springframework/core/style/ToStringStyler.java index 785ce79c4b2..9ae12df5f5e 100644 --- a/spring-core/src/main/java/org/springframework/core/style/ToStringStyler.java +++ b/spring-core/src/main/java/org/springframework/core/style/ToStringStyler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java index ece4c3cb26f..0a68e74615a 100644 --- a/spring-core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java +++ b/spring-core/src/main/java/org/springframework/core/task/AsyncTaskExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java index 36c9b04ce7f..f6b714007ea 100644 --- a/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java +++ b/spring-core/src/main/java/org/springframework/core/task/SimpleAsyncTaskExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java index 054e921ccf0..47bebf46766 100644 --- a/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java +++ b/spring-core/src/main/java/org/springframework/core/task/SyncTaskExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java b/spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java index fe80839acd1..fea960e3c6a 100644 --- a/spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java +++ b/spring-core/src/main/java/org/springframework/core/task/TaskExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java b/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java index d1067fb1131..feacf971692 100644 --- a/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java +++ b/spring-core/src/main/java/org/springframework/core/task/TaskRejectedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java b/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java index 4cda4266be7..476658bbae6 100644 --- a/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java +++ b/spring-core/src/main/java/org/springframework/core/task/TaskTimeoutException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java b/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java index dea77c827f2..0c594b93a1c 100644 --- a/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java +++ b/spring-core/src/main/java/org/springframework/core/task/support/ExecutorServiceAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java b/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java index b5b8ad06f41..bd2df283d71 100644 --- a/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java +++ b/spring-core/src/main/java/org/springframework/core/task/support/TaskExecutorAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/type/AnnotationMetadata.java b/spring-core/src/main/java/org/springframework/core/type/AnnotationMetadata.java index 1d50b7846ca..beeb7d935a0 100644 --- a/spring-core/src/main/java/org/springframework/core/type/AnnotationMetadata.java +++ b/spring-core/src/main/java/org/springframework/core/type/AnnotationMetadata.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/type/ClassMetadata.java b/spring-core/src/main/java/org/springframework/core/type/ClassMetadata.java index 5d80abe5b10..3f649713104 100644 --- a/spring-core/src/main/java/org/springframework/core/type/ClassMetadata.java +++ b/spring-core/src/main/java/org/springframework/core/type/ClassMetadata.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/type/MethodMetadata.java b/spring-core/src/main/java/org/springframework/core/type/MethodMetadata.java index 8d6da265fc8..17d7bab24cb 100644 --- a/spring-core/src/main/java/org/springframework/core/type/MethodMetadata.java +++ b/spring-core/src/main/java/org/springframework/core/type/MethodMetadata.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java b/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java index 82ff7598971..4ac99d4d4de 100644 --- a/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java +++ b/spring-core/src/main/java/org/springframework/core/type/StandardClassMetadata.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/type/classreading/MetadataReaderFactory.java b/spring-core/src/main/java/org/springframework/core/type/classreading/MetadataReaderFactory.java index fa77bdccf6e..e2e010c92ff 100644 --- a/spring-core/src/main/java/org/springframework/core/type/classreading/MetadataReaderFactory.java +++ b/spring-core/src/main/java/org/springframework/core/type/classreading/MetadataReaderFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/type/filter/AbstractTypeHierarchyTraversingFilter.java b/spring-core/src/main/java/org/springframework/core/type/filter/AbstractTypeHierarchyTraversingFilter.java index 1a218fb70da..82362b56700 100644 --- a/spring-core/src/main/java/org/springframework/core/type/filter/AbstractTypeHierarchyTraversingFilter.java +++ b/spring-core/src/main/java/org/springframework/core/type/filter/AbstractTypeHierarchyTraversingFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/type/filter/AnnotationTypeFilter.java b/spring-core/src/main/java/org/springframework/core/type/filter/AnnotationTypeFilter.java index 61c795c1d11..8a0d14b6aae 100644 --- a/spring-core/src/main/java/org/springframework/core/type/filter/AnnotationTypeFilter.java +++ b/spring-core/src/main/java/org/springframework/core/type/filter/AnnotationTypeFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/core/type/filter/AssignableTypeFilter.java b/spring-core/src/main/java/org/springframework/core/type/filter/AssignableTypeFilter.java index 7d0f4574529..82afe352cc2 100644 --- a/spring-core/src/main/java/org/springframework/core/type/filter/AssignableTypeFilter.java +++ b/spring-core/src/main/java/org/springframework/core/type/filter/AssignableTypeFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java b/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java index f51c6c8ad33..7a2135fb65c 100644 --- a/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java +++ b/spring-core/src/main/java/org/springframework/util/AutoPopulatingList.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java b/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java index bd6e7dfc1c6..d1290588fdc 100644 --- a/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java +++ b/spring-core/src/main/java/org/springframework/util/CachingMapDecorator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java index 5ce5e847f99..5e74473fa9b 100644 --- a/spring-core/src/main/java/org/springframework/util/CollectionUtils.java +++ b/spring-core/src/main/java/org/springframework/util/CollectionUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/CommonsLogWriter.java b/spring-core/src/main/java/org/springframework/util/CommonsLogWriter.java index 76e090ddc76..30bdb0861e8 100644 --- a/spring-core/src/main/java/org/springframework/util/CommonsLogWriter.java +++ b/spring-core/src/main/java/org/springframework/util/CommonsLogWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java b/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java index a961f0ff648..56abcec7bca 100644 --- a/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java +++ b/spring-core/src/main/java/org/springframework/util/ConcurrencyThrottleSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/CustomizableThreadCreator.java b/spring-core/src/main/java/org/springframework/util/CustomizableThreadCreator.java index 97d277208fb..0d1a368356c 100644 --- a/spring-core/src/main/java/org/springframework/util/CustomizableThreadCreator.java +++ b/spring-core/src/main/java/org/springframework/util/CustomizableThreadCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java b/spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java index 4d691c28032..19f2698c367 100644 --- a/spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java +++ b/spring-core/src/main/java/org/springframework/util/DefaultPropertiesPersister.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/DigestUtils.java b/spring-core/src/main/java/org/springframework/util/DigestUtils.java index 0328c0fdd6f..a4ca743bf9e 100644 --- a/spring-core/src/main/java/org/springframework/util/DigestUtils.java +++ b/spring-core/src/main/java/org/springframework/util/DigestUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java b/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java index 25f7fa9aba5..5aac3090866 100644 --- a/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java +++ b/spring-core/src/main/java/org/springframework/util/FileCopyUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/FileSystemUtils.java b/spring-core/src/main/java/org/springframework/util/FileSystemUtils.java index 41dd4f2c7f5..529b4f01786 100644 --- a/spring-core/src/main/java/org/springframework/util/FileSystemUtils.java +++ b/spring-core/src/main/java/org/springframework/util/FileSystemUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/Log4jConfigurer.java b/spring-core/src/main/java/org/springframework/util/Log4jConfigurer.java index fecdbf4a8d3..655bc0eacaa 100644 --- a/spring-core/src/main/java/org/springframework/util/Log4jConfigurer.java +++ b/spring-core/src/main/java/org/springframework/util/Log4jConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/MethodInvoker.java b/spring-core/src/main/java/org/springframework/util/MethodInvoker.java index 8a9569357c0..565a68c696d 100644 --- a/spring-core/src/main/java/org/springframework/util/MethodInvoker.java +++ b/spring-core/src/main/java/org/springframework/util/MethodInvoker.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/MultiValueMap.java b/spring-core/src/main/java/org/springframework/util/MultiValueMap.java index 290c2d9f473..a526af78ab8 100644 --- a/spring-core/src/main/java/org/springframework/util/MultiValueMap.java +++ b/spring-core/src/main/java/org/springframework/util/MultiValueMap.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/NumberUtils.java b/spring-core/src/main/java/org/springframework/util/NumberUtils.java index 02afc4c860a..47f38a0b83c 100644 --- a/spring-core/src/main/java/org/springframework/util/NumberUtils.java +++ b/spring-core/src/main/java/org/springframework/util/NumberUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java index 11673b77eda..3ec36174188 100644 --- a/spring-core/src/main/java/org/springframework/util/ObjectUtils.java +++ b/spring-core/src/main/java/org/springframework/util/ObjectUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/PathMatcher.java b/spring-core/src/main/java/org/springframework/util/PathMatcher.java index 0910382f7fa..0bea9cd8086 100644 --- a/spring-core/src/main/java/org/springframework/util/PathMatcher.java +++ b/spring-core/src/main/java/org/springframework/util/PathMatcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/PropertiesPersister.java b/spring-core/src/main/java/org/springframework/util/PropertiesPersister.java index 071a69ee804..1e4c3c97119 100644 --- a/spring-core/src/main/java/org/springframework/util/PropertiesPersister.java +++ b/spring-core/src/main/java/org/springframework/util/PropertiesPersister.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/StopWatch.java b/spring-core/src/main/java/org/springframework/util/StopWatch.java index c47c16291f6..1f7552b57a7 100644 --- a/spring-core/src/main/java/org/springframework/util/StopWatch.java +++ b/spring-core/src/main/java/org/springframework/util/StopWatch.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/SystemPropertyUtils.java b/spring-core/src/main/java/org/springframework/util/SystemPropertyUtils.java index da03d54dd21..19ee4478e71 100644 --- a/spring-core/src/main/java/org/springframework/util/SystemPropertyUtils.java +++ b/spring-core/src/main/java/org/springframework/util/SystemPropertyUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/TypeUtils.java b/spring-core/src/main/java/org/springframework/util/TypeUtils.java index 0f0125cf41e..3733f7cf210 100644 --- a/spring-core/src/main/java/org/springframework/util/TypeUtils.java +++ b/spring-core/src/main/java/org/springframework/util/TypeUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java b/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java index 82fa3f7aa6d..6fd0c2294bc 100644 --- a/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java +++ b/spring-core/src/main/java/org/springframework/util/comparator/BooleanComparator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java b/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java index a471b24d17c..46f4d98ebe5 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java +++ b/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxContentHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java b/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java index 241205c12a5..feeefd6e8ea 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java +++ b/spring-core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLReader.java b/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLReader.java index e4e8a68da74..300f9ff2fc9 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLReader.java +++ b/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java b/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java index c9ff1853e1e..e8c8a643486 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java +++ b/spring-core/src/main/java/org/springframework/util/xml/AbstractXMLStreamReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java b/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java index 1e3697175de..534cb0077b4 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java +++ b/spring-core/src/main/java/org/springframework/util/xml/DomContentHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/xml/DomUtils.java b/spring-core/src/main/java/org/springframework/util/xml/DomUtils.java index 7614beacd31..44eaedb7357 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/DomUtils.java +++ b/spring-core/src/main/java/org/springframework/util/xml/DomUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java b/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java index 7eb9b0aedf9..c0d966d6eba 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java +++ b/spring-core/src/main/java/org/springframework/util/xml/SimpleNamespaceContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/xml/SimpleSaxErrorHandler.java b/spring-core/src/main/java/org/springframework/util/xml/SimpleSaxErrorHandler.java index c5d587f7f9f..ed06ed8c056 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/SimpleSaxErrorHandler.java +++ b/spring-core/src/main/java/org/springframework/util/xml/SimpleSaxErrorHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/xml/SimpleTransformErrorListener.java b/spring-core/src/main/java/org/springframework/util/xml/SimpleTransformErrorListener.java index 8b0dc5eea20..7fd5dffa109 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/SimpleTransformErrorListener.java +++ b/spring-core/src/main/java/org/springframework/util/xml/SimpleTransformErrorListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/xml/StaxEventXMLReader.java b/spring-core/src/main/java/org/springframework/util/xml/StaxEventXMLReader.java index 04b5eedef2e..0d32a3fc08c 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/StaxEventXMLReader.java +++ b/spring-core/src/main/java/org/springframework/util/xml/StaxEventXMLReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/xml/StaxResult.java b/spring-core/src/main/java/org/springframework/util/xml/StaxResult.java index d0149df8452..c001902252a 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/StaxResult.java +++ b/spring-core/src/main/java/org/springframework/util/xml/StaxResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/xml/StaxSource.java b/spring-core/src/main/java/org/springframework/util/xml/StaxSource.java index 0fcedc8e412..af005ecc149 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/StaxSource.java +++ b/spring-core/src/main/java/org/springframework/util/xml/StaxSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java b/spring-core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java index 2ae9bcc559d..2241e2f2a9e 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java +++ b/spring-core/src/main/java/org/springframework/util/xml/StaxStreamContentHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/xml/StaxStreamXMLReader.java b/spring-core/src/main/java/org/springframework/util/xml/StaxStreamXMLReader.java index a7dc6354761..bca48d1cdbe 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/StaxStreamXMLReader.java +++ b/spring-core/src/main/java/org/springframework/util/xml/StaxStreamXMLReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java b/spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java index d3a202b24c1..4b48abd4b97 100644 --- a/spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java +++ b/spring-core/src/main/java/org/springframework/util/xml/TransformerUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/beans/Colour.java b/spring-core/src/test/java/org/springframework/beans/Colour.java index 17fd24fec79..a992a2ebfc6 100644 --- a/spring-core/src/test/java/org/springframework/beans/Colour.java +++ b/spring-core/src/test/java/org/springframework/beans/Colour.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java index 497400a7afd..70a3fcfe6bb 100644 --- a/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-core/src/test/java/org/springframework/beans/INestedTestBean.java index c5c4ed5e679..e0ae5f20a3f 100644 --- a/spring-core/src/test/java/org/springframework/beans/INestedTestBean.java +++ b/spring-core/src/test/java/org/springframework/beans/INestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/beans/IOther.java b/spring-core/src/test/java/org/springframework/beans/IOther.java index 6a8f74187cb..d7fb346185a 100644 --- a/spring-core/src/test/java/org/springframework/beans/IOther.java +++ b/spring-core/src/test/java/org/springframework/beans/IOther.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java index e136978f9e6..412891c439b 100644 --- a/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/beans/TestBean.java b/spring-core/src/test/java/org/springframework/beans/TestBean.java index 3fef4caba0f..06ad95816db 100644 --- a/spring-core/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-core/src/test/java/org/springframework/beans/TestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/AbstractControlFlowTests.java b/spring-core/src/test/java/org/springframework/core/AbstractControlFlowTests.java index 4df72c30916..56e59e2d995 100644 --- a/spring-core/src/test/java/org/springframework/core/AbstractControlFlowTests.java +++ b/spring-core/src/test/java/org/springframework/core/AbstractControlFlowTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java b/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java index e14e03181e5..3a92c77c28b 100644 --- a/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java +++ b/spring-core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java index d1f09e0576f..b4c32171cfa 100644 --- a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java +++ b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/ConventionsTests.java b/spring-core/src/test/java/org/springframework/core/ConventionsTests.java index a9fb6e6a5fb..19d9b264f0d 100644 --- a/spring-core/src/test/java/org/springframework/core/ConventionsTests.java +++ b/spring-core/src/test/java/org/springframework/core/ConventionsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java b/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java index 8f354e82530..a3929896fca 100644 --- a/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java +++ b/spring-core/src/test/java/org/springframework/core/DefaultControlFlowTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java b/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java index bb3c7989047..5de3f4b6ced 100644 --- a/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java +++ b/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java index 1d0b3f75105..c7e2b7e6207 100644 --- a/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java +++ b/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java b/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java index 8acc0645d35..66f1e4f79fe 100644 --- a/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java +++ b/spring-core/src/test/java/org/springframework/core/Jdk14ControlFlowTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java index 8a6ba96d625..0580ae54c28 100644 --- a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java +++ b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java b/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java index ddcc26e705d..12046e979dc 100644 --- a/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java +++ b/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java b/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java index 602000ac7ce..d93649a02a8 100644 --- a/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java +++ b/spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java index 3cf0875625a..eea35b88e6c 100644 --- a/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java +++ b/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java index 96f3fc71df9..9e12a26d772 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java index 38f3c835e50..2e4f86cb0c7 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java b/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java index c9f0eae2a50..04b5ad53a5f 100644 --- a/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java +++ b/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java b/spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java index f430a29935f..7bb57701b77 100644 --- a/spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java +++ b/spring-core/src/test/java/org/springframework/core/env/PropertySourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java b/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java index 3a6dfe84e53..b494c708107 100644 --- a/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java +++ b/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java b/spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java index 235d2f54863..19163fa17a9 100644 --- a/spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java +++ b/spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java b/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java index 576ab738149..49650303b8f 100644 --- a/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java +++ b/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java b/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java index b7a6d5c3819..57560a2566c 100644 --- a/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java +++ b/spring-core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/type/AssignableTypeFilterTests.java b/spring-core/src/test/java/org/springframework/core/type/AssignableTypeFilterTests.java index 1e99fa0299f..0ca007ea2ef 100644 --- a/spring-core/src/test/java/org/springframework/core/type/AssignableTypeFilterTests.java +++ b/spring-core/src/test/java/org/springframework/core/type/AssignableTypeFilterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java b/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java index 63a7b9e6941..963b0d961ac 100644 --- a/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java +++ b/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/util/AssertTests.java b/spring-core/src/test/java/org/springframework/util/AssertTests.java index 59cf2a92613..744b492f617 100644 --- a/spring-core/src/test/java/org/springframework/util/AssertTests.java +++ b/spring-core/src/test/java/org/springframework/util/AssertTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java index b82a952c267..6eb67d06617 100644 --- a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java +++ b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java b/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java index fe70ac344d5..4f878984324 100644 --- a/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java +++ b/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java index 96146d31a84..39761fb5dea 100644 --- a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java b/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java index fea68d8ed2c..42ac9309723 100644 --- a/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/CollectionUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java b/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java index 94e790d97ed..d87212c1cef 100644 --- a/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/FileSystemUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/util/Log4jConfigurerTests.java b/spring-core/src/test/java/org/springframework/util/Log4jConfigurerTests.java index b71c516c8c5..90d40d7b5d6 100644 --- a/spring-core/src/test/java/org/springframework/util/Log4jConfigurerTests.java +++ b/spring-core/src/test/java/org/springframework/util/Log4jConfigurerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java b/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java index 356fad6b53e..2fa0245aa17 100644 --- a/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java +++ b/spring-core/src/test/java/org/springframework/util/MethodInvokerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java b/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java index be48ab08ff9..e145195b6b2 100644 --- a/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java +++ b/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java index 512b9af9930..d0eb51d285b 100644 --- a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java index 7e47d99f5b2..7129e8d23ca 100644 --- a/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/ResourceUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/util/SerializationUtilsTests.java b/spring-core/src/test/java/org/springframework/util/SerializationUtilsTests.java index 630568b8185..5b9c43c10ef 100644 --- a/spring-core/src/test/java/org/springframework/util/SerializationUtilsTests.java +++ b/spring-core/src/test/java/org/springframework/util/SerializationUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/util/StopWatchTests.java b/spring-core/src/test/java/org/springframework/util/StopWatchTests.java index 83029423f28..e7d745d416a 100644 --- a/spring-core/src/test/java/org/springframework/util/StopWatchTests.java +++ b/spring-core/src/test/java/org/springframework/util/StopWatchTests.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java index d160d596f72..fab4424ebe6 100644 --- a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java +++ b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java b/spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java index 39e6bd1f351..5a34a003ee2 100644 --- a/spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java +++ b/spring-core/src/test/java/org/springframework/util/xml/StaxEventXMLReaderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java b/spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java index 2552d2b7ac8..ba84eadd760 100644 --- a/spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java +++ b/spring-core/src/test/java/org/springframework/util/xml/StaxStreamXMLReaderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/AccessException.java b/spring-expression/src/main/java/org/springframework/expression/AccessException.java index 996a4f1c8b8..23c1e57888d 100644 --- a/spring-expression/src/main/java/org/springframework/expression/AccessException.java +++ b/spring-expression/src/main/java/org/springframework/expression/AccessException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/BeanResolver.java b/spring-expression/src/main/java/org/springframework/expression/BeanResolver.java index 041e93a2945..c95501baa8b 100644 --- a/spring-expression/src/main/java/org/springframework/expression/BeanResolver.java +++ b/spring-expression/src/main/java/org/springframework/expression/BeanResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/ConstructorExecutor.java b/spring-expression/src/main/java/org/springframework/expression/ConstructorExecutor.java index 260f93e4d81..bb04735237f 100644 --- a/spring-expression/src/main/java/org/springframework/expression/ConstructorExecutor.java +++ b/spring-expression/src/main/java/org/springframework/expression/ConstructorExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/ConstructorResolver.java b/spring-expression/src/main/java/org/springframework/expression/ConstructorResolver.java index 73384135526..e1892d86c00 100644 --- a/spring-expression/src/main/java/org/springframework/expression/ConstructorResolver.java +++ b/spring-expression/src/main/java/org/springframework/expression/ConstructorResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/EvaluationException.java b/spring-expression/src/main/java/org/springframework/expression/EvaluationException.java index 5d6761acd5b..bca535d26c4 100644 --- a/spring-expression/src/main/java/org/springframework/expression/EvaluationException.java +++ b/spring-expression/src/main/java/org/springframework/expression/EvaluationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/Expression.java b/spring-expression/src/main/java/org/springframework/expression/Expression.java index a353ab005d2..fdad75b17f7 100644 --- a/spring-expression/src/main/java/org/springframework/expression/Expression.java +++ b/spring-expression/src/main/java/org/springframework/expression/Expression.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java b/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java index 93144dc3555..ecea713cad5 100644 --- a/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java +++ b/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java b/spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java index c531fa139ee..a6b11fb26a5 100644 --- a/spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java +++ b/spring-expression/src/main/java/org/springframework/expression/ExpressionInvocationTargetException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/MethodFilter.java b/spring-expression/src/main/java/org/springframework/expression/MethodFilter.java index bcc824e5a07..e273125d34d 100644 --- a/spring-expression/src/main/java/org/springframework/expression/MethodFilter.java +++ b/spring-expression/src/main/java/org/springframework/expression/MethodFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/MethodResolver.java b/spring-expression/src/main/java/org/springframework/expression/MethodResolver.java index bb92e94fe6e..75cdc5eab8b 100644 --- a/spring-expression/src/main/java/org/springframework/expression/MethodResolver.java +++ b/spring-expression/src/main/java/org/springframework/expression/MethodResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/Operation.java b/spring-expression/src/main/java/org/springframework/expression/Operation.java index 27239c862e2..01b805905ba 100644 --- a/spring-expression/src/main/java/org/springframework/expression/Operation.java +++ b/spring-expression/src/main/java/org/springframework/expression/Operation.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/OperatorOverloader.java b/spring-expression/src/main/java/org/springframework/expression/OperatorOverloader.java index ff4a2f7eafd..29c165111b2 100644 --- a/spring-expression/src/main/java/org/springframework/expression/OperatorOverloader.java +++ b/spring-expression/src/main/java/org/springframework/expression/OperatorOverloader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/ParseException.java b/spring-expression/src/main/java/org/springframework/expression/ParseException.java index b1421215164..e8db01acc05 100644 --- a/spring-expression/src/main/java/org/springframework/expression/ParseException.java +++ b/spring-expression/src/main/java/org/springframework/expression/ParseException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/ParserContext.java b/spring-expression/src/main/java/org/springframework/expression/ParserContext.java index a462c353124..a1ae657bc3d 100644 --- a/spring-expression/src/main/java/org/springframework/expression/ParserContext.java +++ b/spring-expression/src/main/java/org/springframework/expression/ParserContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/PropertyAccessor.java b/spring-expression/src/main/java/org/springframework/expression/PropertyAccessor.java index 041752988e4..e14c30ba681 100644 --- a/spring-expression/src/main/java/org/springframework/expression/PropertyAccessor.java +++ b/spring-expression/src/main/java/org/springframework/expression/PropertyAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/TypeComparator.java b/spring-expression/src/main/java/org/springframework/expression/TypeComparator.java index 6b0f61e8ce2..1dfb41adc79 100644 --- a/spring-expression/src/main/java/org/springframework/expression/TypeComparator.java +++ b/spring-expression/src/main/java/org/springframework/expression/TypeComparator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/TypedValue.java b/spring-expression/src/main/java/org/springframework/expression/TypedValue.java index 7a4fcef207c..67ecb99ad27 100644 --- a/spring-expression/src/main/java/org/springframework/expression/TypedValue.java +++ b/spring-expression/src/main/java/org/springframework/expression/TypedValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java b/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java index 478841019e9..840ad1b8541 100644 --- a/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java +++ b/spring-expression/src/main/java/org/springframework/expression/common/CompositeStringExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/common/LiteralExpression.java b/spring-expression/src/main/java/org/springframework/expression/common/LiteralExpression.java index c9b3c6041b6..ae7713c50f3 100644 --- a/spring-expression/src/main/java/org/springframework/expression/common/LiteralExpression.java +++ b/spring-expression/src/main/java/org/springframework/expression/common/LiteralExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/common/TemplateParserContext.java b/spring-expression/src/main/java/org/springframework/expression/common/TemplateParserContext.java index 5df9c134fe1..046ed6a9010 100644 --- a/spring-expression/src/main/java/org/springframework/expression/common/TemplateParserContext.java +++ b/spring-expression/src/main/java/org/springframework/expression/common/TemplateParserContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java b/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java index 2f34515b3a5..8a09bf2b923 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/InternalParseException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java index 6fbe1c12f99..7c7a3f6f1c9 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/SpelEvaluationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java b/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java index 82231d775af..1935b3ba611 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/SpelParseException.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java index 7f5bdd6d6a6..92eb3036fa9 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/AstUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2012 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java index 09e4a0a1144..35636fe806f 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/BeanReference.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java index 6558498b858..c6a25931fb2 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java index 3f6a1f45edf..1d3b853e29f 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FormatHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java index 1bc897efcc6..db69a05945f 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java index e0b2b8d4def..1839d203c49 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/InlineList.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/IntLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/IntLiteral.java index 466e03e9d6f..cafbd17d28c 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/IntLiteral.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/IntLiteral.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/LongLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/LongLiteral.java index c6b1b303af4..3d69e3fa101 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/LongLiteral.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/LongLiteral.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java index b629ff54b7c..863f1a218f3 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/Operator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorBetween.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorBetween.java index d89e5bd6b84..d18695275e0 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorBetween.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorBetween.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java index 86c673429d3..bf7d0edc91d 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorInstanceof.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/RealLiteral.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/RealLiteral.java index 194db8115d4..df2c1103192 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/RealLiteral.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/RealLiteral.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeCode.java b/spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeCode.java index c91ccad4675..e8a2ac231a3 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeCode.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ast/TypeCode.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpressionParser.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpressionParser.java index 7762d75c855..4f69baebcad 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpressionParser.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpressionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/Token.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/Token.java index 0bc2f0d91a0..3f8593c5fe8 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/Token.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/Token.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/BooleanTypedValue.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/BooleanTypedValue.java index 8de21547205..6b407e8d0bb 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/BooleanTypedValue.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/BooleanTypedValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java index 33a40425ca6..2e6ff92d737 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java index fb7d4b31368..4342941af80 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveConstructorResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java index 1b5a6ddddc0..18f29d148bc 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeComparator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java index 1cc1d6f394a..483dade31e4 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeLocator.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeLocator.java index e46c53462f9..2a210e3fda5 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeLocator.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/StandardTypeLocator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ArrayConstructorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ArrayConstructorTests.java index 6a0a2f9c2a2..1667115532a 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ArrayConstructorTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ArrayConstructorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java index 516e7ce66ea..4b1c619c8ac 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ConstructorInvocationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java index f28c7c295c4..cf189ad6a1e 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java index ca8a5db5191..388d26d0261 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java index a7a1856777e..32de58c8c5f 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java index a9b24b1b382..8071bc198f4 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ListTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ListTests.java index 71055857f81..ba7bca05691 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ListTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ListTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/LiteralExpressionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/LiteralExpressionTests.java index 16d490bc2cc..352b4869913 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/LiteralExpressionTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/LiteralExpressionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java index d95227dffb6..606d4c423f0 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java index 604016eb991..703b1b7394f 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java index b5ca0a2da5b..d2d6b954fec 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java index 0d3efa95ddb..029dd2440f2 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java b/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java index 214af39187d..568bdfad27a 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java index 8d98cb8bea1..5c2a3de1f25 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java index 0216f5c7afb..d9b05524a73 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelUtilities.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelUtilities.java index 8c3f134774d..a3882638516 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelUtilities.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelUtilities.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java index bdc112a4ef7..545e3137136 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2004-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java index ab4e0dcd846..74fff9810e5 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java index d2cd8d94941..59c61a73d1d 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ast/FormatHelperTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ast/FormatHelperTests.java index 6aa0bafec5d..f9afe18d490 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/ast/FormatHelperTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/ast/FormatHelperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java index 781d6963a46..85764aa7a27 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java index ab23d3e1572..737b074ff3e 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/support/StandardComponentsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java index 9047e35b7d0..8c90e667224 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/ArrayContainer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java b/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java index 8468afc531c..b97b4983e37 100644 --- a/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java +++ b/spring-instrument-tomcat/src/main/java/org/springframework/instrument/classloading/tomcat/TomcatInstrumentableClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-instrument/src/main/java/org/springframework/instrument/InstrumentationSavingAgent.java b/spring-instrument/src/main/java/org/springframework/instrument/InstrumentationSavingAgent.java index f9745823bf7..d468e60a8ec 100644 --- a/spring-instrument/src/main/java/org/springframework/instrument/InstrumentationSavingAgent.java +++ b/spring-instrument/src/main/java/org/springframework/instrument/InstrumentationSavingAgent.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java index e7b55177a91..41b0b6f545b 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/BadSqlGrammarException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java index 324030032d8..a50f9b8398f 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/IncorrectResultSetColumnCountException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/IncorrectResultSetColumnCountException.java index 95a45a79ab8..00eaa7dbca8 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/IncorrectResultSetColumnCountException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/IncorrectResultSetColumnCountException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java index 29e615413b5..64b402d2c7e 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/InvalidResultSetAccessException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java index d8bb30d76fc..1f0db37a03c 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/JdbcUpdateAffectedIncorrectNumberOfRowsException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/LobRetrievalFailureException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/LobRetrievalFailureException.java index ddd3e26632a..b6b44991885 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/LobRetrievalFailureException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/LobRetrievalFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/SQLWarningException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/SQLWarningException.java index 1dc4f511d32..5374117bdc3 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/SQLWarningException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/SQLWarningException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java index 8d26855fb22..0d7593e434f 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/UncategorizedSQLException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java b/spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java index 3f593940fb3..6569ba893f7 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/config/SortedResourcesFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchPreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchPreparedStatementSetter.java index 4b95acde854..e3aed57b744 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchPreparedStatementSetter.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BatchPreparedStatementSetter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java index 82576b1df0d..dde80677534 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCallback.java index 08410c3be2a..8ce3abbf353 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCallback.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreator.java index 552daf1bd3a..b4175b86028 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreator.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java index 8ab1b9c600a..279ab5a5871 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/CallableStatementCreatorFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ConnectionCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ConnectionCallback.java index e09947ebae2..04ae1ccacc6 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ConnectionCallback.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ConnectionCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/InterruptibleBatchPreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/InterruptibleBatchPreparedStatementSetter.java index 57af20c86bf..2b0eeefa32a 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/InterruptibleBatchPreparedStatementSetter.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/InterruptibleBatchPreparedStatementSetter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java index 4cd1e31cd02..8f5a9964cd3 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcOperations.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterMapper.java index d241a538965..e333c738750 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterMapper.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ParameterMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCallback.java index ec1185db4db..bd82ddf9e99 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCallback.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreator.java index 2cb5a1f6483..ee123ceed93 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreator.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java index 6a0a1b944cb..7efe962c642 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementCreatorFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementSetter.java index d8a3ad4a552..462eba3fafa 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementSetter.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/PreparedStatementSetter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetExtractor.java index 44bb3d4e7d0..183b8b2b1bc 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java index cccbd5744a6..7c171637474 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCallbackHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCallbackHandler.java index 4ee5de64e98..47f1e4f57a4 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCallbackHandler.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java index 54b71c18296..7aeb9ee31fc 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowCountCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapper.java index 28e61e18840..48ac7c8d3eb 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapper.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java index dfd334bd886..8ce94536222 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/RowMapperResultSetExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java index 40ae15e785c..9583ec752ce 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SingleColumnRowMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java index ad9cd72c283..9bdb7f0a9f3 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlInOutParameter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameter.java index 1718c349edd..615ab1ae532 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameter.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameterValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameterValue.java index dba3e8c001a..4fdc5b10d31 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameterValue.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameterValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlProvider.java index 708c7e9a079..34b7dbb8923 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlProvider.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java index 4573cb95a57..1120d8f83a0 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnResultSet.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnType.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnType.java index 543ebb3d120..5aeaf7bdf0d 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnType.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlReturnType.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlTypeValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlTypeValue.java index e43a0089751..b1de7edda0d 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlTypeValue.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlTypeValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCallback.java index 47c682070a3..c786232ca96 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCallback.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java index 8f11d0bb740..1e6a263ca4a 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java index 4693b02067d..33087c446c3 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataProviderFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java index 17578e80bb0..af8281fc6d8 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericCallMetaDataProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/HsqlTableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/HsqlTableMetaDataProvider.java index 7ae4ecd9123..cb6796a2d12 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/HsqlTableMetaDataProvider.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/HsqlTableMetaDataProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.java index 340f0fe2ea3..119ed0eb1ed 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleCallMetaDataProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java index 3465522e11e..75ba14dc101 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/OracleTableMetaDataProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java index 25eaa98b568..0dff1678c4c 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/AbstractSqlParameterSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/AbstractSqlParameterSource.java index 9262314c939..f8ff89e4794 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/AbstractSqlParameterSource.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/AbstractSqlParameterSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java index 7f32e498314..fc7b32f4ef1 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/MapSqlParameterSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java index 9c049300e0d..c4ae1b4eeff 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java index 8c36763ca2d..a7f5c9f7c9c 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java index 48b252098c6..1abfdea3c21 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSource.java index 2e0b481873f..bdba8e44383 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSource.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java index 03f2491b996..b23eb8ca4be 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java index d9e7072431e..7c80a14d0fe 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java index 200514aa837..98f0e5991eb 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcInsert.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java index 56109fa9c0e..5c6e2fe775c 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedSingleColumnRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedSingleColumnRowMapper.java index 0f60c5da46f..fa82b651b32 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedSingleColumnRowMapper.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedSingleColumnRowMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCall.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCall.java index 40d805e7691..d687dbc2f6a 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCall.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCall.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCallOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCallOperations.java index 14fe2622a91..cac760a9cb0 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCallOperations.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCallOperations.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcDaoSupport.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcDaoSupport.java index 16a842da184..d0918966585 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcDaoSupport.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcDaoSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsert.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsert.java index 095bc99bdfd..7d29df83018 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsert.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsert.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertOperations.java index 0033f3847ac..30950b72d20 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertOperations.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertOperations.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java index 6b47fc2db30..b22fdee5476 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcOperations.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java index ff1c7479959..a4ec41fc064 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractInterruptibleBatchPreparedStatementSetter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractInterruptibleBatchPreparedStatementSetter.java index 773bb23af8d..83d37435ece 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractInterruptibleBatchPreparedStatementSetter.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractInterruptibleBatchPreparedStatementSetter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobCreatingPreparedStatementCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobCreatingPreparedStatementCallback.java index c48c2e46cb6..7ef0b325832 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobCreatingPreparedStatementCallback.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobCreatingPreparedStatementCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java index 3cc259f679b..83a9aedffc2 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractLobStreamingResultSetExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractSqlTypeValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractSqlTypeValue.java index 64ddf0d544c..d751933913b 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractSqlTypeValue.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/AbstractSqlTypeValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java index 12b7af75509..7039eeacc84 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java index 3acae099700..9a83eec356f 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/SqlLobValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/SqlLobValue.java index 517e8a052fb..2cc5f9f9099 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/SqlLobValue.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/SqlLobValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java index d93bb083bb9..00aedb4c223 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/AbstractDriverBasedDataSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java index bc8f6876d3d..6ed77ef0c13 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionProxy.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionProxy.java index 74eff9a8167..1717032fd51 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionProxy.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/ConnectionProxy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java index aa3d5c9e715..9c6ebcfde2c 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceTransactionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java index b0393030874..5aaf586b3ac 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/IsolationLevelDataSourceAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/IsolationLevelDataSourceAdapter.java index cbc85e13cc3..30f64d47a23 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/IsolationLevelDataSourceAdapter.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/IsolationLevelDataSourceAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java index 1791e82fb17..aae634f2ffd 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java index ba6495727ea..9d2b41f54ee 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SingleConnectionDataSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SmartDataSource.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SmartDataSource.java index f55def12cf8..93e59f66250 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SmartDataSource.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/SmartDataSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java index 08b2f590b54..1321c816627 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/TransactionAwareDataSourceProxy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java index 443b408b7f1..cfcaca4db7b 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java index 9d6ba9236dd..6a3c6c534e9 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/WebSphereDataSourceAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java index 59690693717..05fad271249 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java index 7e1ea19597c..73d54ca46d2 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java index 6ea06ebb3df..5e3db7cff47 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java index d8ad816c588..5b786b955a0 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseType.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java index 6debd6f014d..58b176721bd 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/SimpleDriverDataSourceFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java index a88cd6698be..52cdd430163 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java index e40ddac2a4e..915b3271533 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookup.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookup.java index 55bb0b7493f..f4eff425d3e 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookup.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookup.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookupFailureException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookupFailureException.java index 48afad16aa0..203d733368d 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookupFailureException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/DataSourceLookupFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookup.java index 3e4ebc76ed8..2a48efaaf52 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookup.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookup.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java index e35c827565b..0a4eb32b4ba 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/MapDataSourceLookup.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java index c4898e44b3c..039e5c34f5f 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/BatchSqlUpdate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericSqlQuery.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericSqlQuery.java index c1527f45c3f..1cf222e0029 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericSqlQuery.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericSqlQuery.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericStoredProcedure.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericStoredProcedure.java index 13511bd2d48..46b0a439642 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericStoredProcedure.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/GenericStoredProcedure.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java index 8f7c27ad669..6e8355e639b 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/RdbmsOperation.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/RdbmsOperation.java index 9b6fa94dc44..f2d0bb58a04 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/RdbmsOperation.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/RdbmsOperation.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java index 07e30d8b8a8..ee70d608d34 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlCall.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java index a234a256cd0..455e884ca70 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlFunction.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java index 407356f812d..2f9cc053ce1 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlOperation.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java index 1da3422648d..58f8f3d24bc 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlQuery.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlUpdate.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlUpdate.java index ccb848b0f7b..3b63c0c12b9 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlUpdate.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/SqlUpdate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java index 67fbec476df..2fc21917c56 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/StoredProcedure.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java b/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java index 38e93eb90fa..90603687a1c 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/object/UpdatableSqlQuery.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java index 0f5273cd26c..7b6d91814ce 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/AbstractFallbackSQLExceptionTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseMetaDataCallback.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseMetaDataCallback.java index fa0d270d771..abb9d7e33b3 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseMetaDataCallback.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseMetaDataCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcAccessor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcAccessor.java index 385dd7c72d5..89940f0cf2f 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcAccessor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java index c312fc3a512..95f2ee36435 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/JdbcUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/KeyHolder.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/KeyHolder.java index b4b1031a758..b917ecb95d3 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/KeyHolder.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/KeyHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/MetaDataAccessException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/MetaDataAccessException.java index 1637b89d295..45d9d57f1c7 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/MetaDataAccessException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/MetaDataAccessException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java index c3ec69dd31e..a3290b88251 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java index 3284f80ae13..26b528e9f9e 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionSubclassTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionTranslator.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionTranslator.java index 8543e2b1775..87a84c8dc15 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionTranslator.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SQLExceptionTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SqlValue.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SqlValue.java index 3dddd11cc29..4cfe714a323 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/SqlValue.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/SqlValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java index 3fe391dbb68..3fd0d80f68e 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractDataFieldMaxValueIncrementer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractSequenceMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractSequenceMaxValueIncrementer.java index fc09144c76e..f8796fa214a 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractSequenceMaxValueIncrementer.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/AbstractSequenceMaxValueIncrementer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.java index cb3fe5e1d59..39c5245e27f 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/DerbyMaxValueIncrementer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.java index 455b11171e5..ec863daff15 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseAnywhereMaxValueIncrementer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.java index e98865bdeba..eeb20c00008 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/incrementer/SybaseMaxValueIncrementer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java index 3e09b9776d8..6964172e962 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/DefaultLobHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/JtaLobCreatorSynchronization.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/JtaLobCreatorSynchronization.java index 1b826a4b2bc..19c85608c32 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/JtaLobCreatorSynchronization.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/JtaLobCreatorSynchronization.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java index 57f332309f5..386be938a89 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreatorUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobHandler.java index 17eeee43a28..251a63a0e8d 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobHandler.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/SpringLobCreatorSynchronization.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/SpringLobCreatorSynchronization.java index bfc80b3e7b8..a630b206b6d 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/SpringLobCreatorSynchronization.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/SpringLobCreatorSynchronization.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java index 9112da11d58..186b28babaf 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/C3P0NativeJdbcExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java index 731b2320c3a..964f31d511f 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/CommonsDbcpNativeJdbcExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java index 412b99bcad8..b0113399330 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/Jdbc4NativeJdbcExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractor.java index 83b6c524015..7a18b6d71d9 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java index cb1a19fef13..2614338bec9 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/NativeJdbcExtractorAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/OracleJdbc4NativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/OracleJdbc4NativeJdbcExtractor.java index ec831758c80..1446c894360 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/OracleJdbc4NativeJdbcExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/OracleJdbc4NativeJdbcExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java index 1ac690327a6..0d00da4d9f2 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/SimpleNativeJdbcExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java index f0567bc41c2..e967966aee5 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/WebLogicNativeJdbcExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSet.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSet.java index ebb2e28ad45..69f10432e4a 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSet.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSet.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSetMetaData.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSetMetaData.java index 0c294bfe696..31d9d9e14e6 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSetMetaData.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSetMetaData.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSet.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSet.java index c87d829263d..88900de9191 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSet.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSet.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSetMetaData.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSetMetaData.java index 9a722a607e1..b117177b389 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSetMetaData.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/SqlRowSetMetaData.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java index 697f67f3e97..13f03633776 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/Jdbc4SqlXmlHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlFeatureNotImplementedException.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlFeatureNotImplementedException.java index c32ecfa99e6..d84b3a2e2d2 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlFeatureNotImplementedException.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlFeatureNotImplementedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlHandler.java index acb78b3c063..2a702794eed 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlHandler.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlObjectMappingHandler.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlObjectMappingHandler.java index c1ad737de50..6e55f1ec88a 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlObjectMappingHandler.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/SqlXmlObjectMappingHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlBinaryStreamProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlBinaryStreamProvider.java index df915e46c63..80241275092 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlBinaryStreamProvider.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlBinaryStreamProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlCharacterStreamProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlCharacterStreamProvider.java index 9d899f8057c..9cb13d05a26 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlCharacterStreamProvider.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlCharacterStreamProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlResultProvider.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlResultProvider.java index 49602a6b34d..0e22eff12af 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlResultProvider.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/xml/XmlResultProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/beans/Colour.java b/spring-jdbc/src/test/java/org/springframework/beans/Colour.java index 17fd24fec79..a992a2ebfc6 100644 --- a/spring-jdbc/src/test/java/org/springframework/beans/Colour.java +++ b/spring-jdbc/src/test/java/org/springframework/beans/Colour.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-jdbc/src/test/java/org/springframework/beans/INestedTestBean.java index c5c4ed5e679..e0ae5f20a3f 100644 --- a/spring-jdbc/src/test/java/org/springframework/beans/INestedTestBean.java +++ b/spring-jdbc/src/test/java/org/springframework/beans/INestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/beans/IOther.java b/spring-jdbc/src/test/java/org/springframework/beans/IOther.java index 6a8f74187cb..d7fb346185a 100644 --- a/spring-jdbc/src/test/java/org/springframework/beans/IOther.java +++ b/spring-jdbc/src/test/java/org/springframework/beans/IOther.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java index e136978f9e6..412891c439b 100644 --- a/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/beans/TestBean.java b/spring-jdbc/src/test/java/org/springframework/beans/TestBean.java index 7a27cf0894e..6d71de75764 100644 --- a/spring-jdbc/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-jdbc/src/test/java/org/springframework/beans/TestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java b/spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java index da69a9831f9..7bb3744d60a 100644 --- a/spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java +++ b/spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java index daa891016e5..e6c9fdef47a 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/config/InitializeDatabaseIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java index 996f96f3298..aeffd6f6bb7 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java index 66eb5b54966..709ca312eca 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/BeanPropertyRowMapperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java index e0748aef5af..6b9c9840abd 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java index 14a7d3d0cbe..10df5630c62 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/RowMapperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java index 3ed281abfce..2df1848c213 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/SimpleRowCountCallbackHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java index 7e8631e6ec6..00e229ba9dc 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/StatementCreatorUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java index 60bec568176..6564fe5ee7a 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplateTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java index a2d43fdbba1..80c7a07f2e2 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/namedparam/NamedParameterQueryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java index 681376564d4..232c3843e59 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/ParameterizedBeanPropertyRowMapperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java index f027c15564c..f858444dbbb 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java index 1c763595b61..85b6263e47f 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcInsertTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java index 74a4a17c741..5b52d8ac46b 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java index c661c794211..40ce6b18fbe 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReaderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java index daae639f03d..1aefee1e946 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java index f082720f841..feba295516b 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/LobSupportTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java index 513c702bfd5..8a7cc645469 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/SqlLobValueTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java index 88e6ec73a30..3d6d4d4d177 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceJtaTransactionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java index 02f8f5332d5..4d3a05c2bf8 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java index fd3d4a16547..ec33bdeaf1e 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DriverManagerDataSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java index 23223fc1d7f..221a9e59fbc 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/UserCredentialsDataSourceAdapterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java index f178c5ef2ef..1ad38f1457c 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/BeanFactoryDataSourceLookupTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java index 48174456d94..4967756416f 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/JndiDataSourceLookupTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java index 17276e3aeb8..8ffa829bf5e 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/lookup/StubDataSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java index 9ff252a367e..f325d4891f3 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/BatchSqlUpdateTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java index 85152b9a867..8540edc8a93 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java index 6b1760ac8b5..3280a2edad4 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java index 189c59a1a08..d2d0cd82e42 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/RdbmsOperationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java index 535dca239ed..10a2248c374 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlQueryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java index 07b560f3869..c57e430f67b 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/SqlUpdateTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java index d1bde67770c..6d2ce8106fe 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/StoredProcedureTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java index a637cf1ba9a..213e6a92d7e 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomErrorCodeException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java index 5fb13c22338..1b84b2c1a99 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/CustomSqlExceptionTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java index 1b24276eb63..6d23a8e8284 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DataFieldMaxValueIncrementerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java index 96140c6c9a2..14e4d5bf682 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/DefaultLobHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java index 039a938a76f..68a0a0d8834 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/KeyHolderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/NativeJdbcExtractorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/NativeJdbcExtractorTests.java index 3e6de69dec9..f99ae954dde 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/NativeJdbcExtractorTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/NativeJdbcExtractorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java index 6695bb35aff..c2e07ec7653 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLErrorCodeSQLExceptionTranslatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLStateExceptionTranslatorTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLStateExceptionTranslatorTests.java index 681ef8ff16d..3578c1e93b9 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLStateExceptionTranslatorTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/SQLStateExceptionTranslatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java index becb786a385..0594fec1cb4 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/support/rowset/ResultSetWrappingRowSetTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java b/spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java index 1a01a993da2..ce493179880 100644 --- a/spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java +++ b/spring-jms/src/main/java/org/springframework/jms/IllegalStateException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java b/spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java index b3901d4dc41..c4d248604a2 100644 --- a/spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java +++ b/spring-jms/src/main/java/org/springframework/jms/InvalidClientIDException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java b/spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java index 94bbc434711..500788ff417 100644 --- a/spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java +++ b/spring-jms/src/main/java/org/springframework/jms/InvalidDestinationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java b/spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java index 4c05894eb17..d701186bd11 100644 --- a/spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java +++ b/spring-jms/src/main/java/org/springframework/jms/InvalidSelectorException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/JmsException.java b/spring-jms/src/main/java/org/springframework/jms/JmsException.java index 5572cb415bb..9da83d02ece 100644 --- a/spring-jms/src/main/java/org/springframework/jms/JmsException.java +++ b/spring-jms/src/main/java/org/springframework/jms/JmsException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java b/spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java index bbc6f3041eb..eec0180b871 100644 --- a/spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java +++ b/spring-jms/src/main/java/org/springframework/jms/JmsSecurityException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java b/spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java index 221cce2bae6..77cb7fa1198 100644 --- a/spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java +++ b/spring-jms/src/main/java/org/springframework/jms/MessageEOFException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java b/spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java index b0fc75475c0..90e5fbb2537 100644 --- a/spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java +++ b/spring-jms/src/main/java/org/springframework/jms/MessageFormatException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java b/spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java index 1acb0a05ed5..dbd04c3b805 100644 --- a/spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java +++ b/spring-jms/src/main/java/org/springframework/jms/MessageNotReadableException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java b/spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java index dcf41400b88..526ce6f028d 100644 --- a/spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java +++ b/spring-jms/src/main/java/org/springframework/jms/MessageNotWriteableException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java b/spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java index fff7028c679..591e6d8abc7 100644 --- a/spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java +++ b/spring-jms/src/main/java/org/springframework/jms/ResourceAllocationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java b/spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java index 191a74d5517..14cfa30b559 100644 --- a/spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java +++ b/spring-jms/src/main/java/org/springframework/jms/TransactionInProgressException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java b/spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java index a49029e463f..28f9fc7aa14 100644 --- a/spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java +++ b/spring-jms/src/main/java/org/springframework/jms/TransactionRolledBackException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java b/spring-jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java index fbc4bbd969c..b9531906a4f 100644 --- a/spring-jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java +++ b/spring-jms/src/main/java/org/springframework/jms/UncategorizedJmsException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java b/spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java index ebd02595083..9407db27f4a 100644 --- a/spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java +++ b/spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/config/JmsNamespaceHandler.java b/spring-jms/src/main/java/org/springframework/jms/config/JmsNamespaceHandler.java index 09949d55212..d4642a6bda1 100644 --- a/spring-jms/src/main/java/org/springframework/jms/config/JmsNamespaceHandler.java +++ b/spring-jms/src/main/java/org/springframework/jms/config/JmsNamespaceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java b/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java index e2c006042bc..a668a1d62ec 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/ConnectionFactoryUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/DelegatingConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/DelegatingConnectionFactory.java index 77cd02c1807..e01bfec1f0d 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/DelegatingConnectionFactory.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/DelegatingConnectionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java b/spring-jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java index b8e3e10832f..1438b7e7772 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/JmsResourceHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager.java b/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager.java index cc401957b28..28a683c8f5c 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java b/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java index 53ee2c09560..5d73a3497cb 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager102.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SessionProxy.java b/spring-jms/src/main/java/org/springframework/jms/connection/SessionProxy.java index aab270cd036..bf439aee095 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/SessionProxy.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/SessionProxy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java index 5b5510dc4e4..ed298a1c294 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory102.java b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory102.java index 6b6cec1b3f2..b9097d06a19 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory102.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/SingleConnectionFactory102.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SmartConnectionFactory.java b/spring-jms/src/main/java/org/springframework/jms/connection/SmartConnectionFactory.java index e7ec4ab035f..092ad8fd7d4 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/SmartConnectionFactory.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/SmartConnectionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java b/spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java index 06e060daca0..5c273f98cfd 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/SynchedLocalTransactionFailedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java b/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java index f9ccfb18b97..ccacc0df0b8 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/TransactionAwareConnectionFactoryProxy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java b/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java index 8f8b7824010..2d1cc49b272 100644 --- a/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java +++ b/spring-jms/src/main/java/org/springframework/jms/connection/UserCredentialsConnectionFactoryAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/core/BrowserCallback.java b/spring-jms/src/main/java/org/springframework/jms/core/BrowserCallback.java index 520c2d1ccdb..563503eb075 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/BrowserCallback.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/BrowserCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java index e313ba705b9..152617ee020 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsOperations.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate102.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate102.java index 5b8c2d7b5f7..0aa7fbc49f4 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate102.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate102.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java b/spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java index d7af5cf71b4..3f3d5c14ba9 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/MessageCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java b/spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java index 04904f452f6..6541f116a06 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/ProducerCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java b/spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java index cc095d13cdd..77c57614e2b 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/SessionCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java b/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java index bc426fc77ae..95314fd3b2d 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer102.java b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer102.java index a6adf5c0b29..f15fb92323e 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer102.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/DefaultMessageListenerContainer102.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/SessionAwareMessageListener.java b/spring-jms/src/main/java/org/springframework/jms/listener/SessionAwareMessageListener.java index e6afb9c1f59..15a39df9226 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/SessionAwareMessageListener.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/SessionAwareMessageListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer102.java b/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer102.java index dc4fcabd7b6..758301eb404 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer102.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/SimpleMessageListenerContainer102.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/ListenerExecutionFailedException.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/ListenerExecutionFailedException.java index 5b64b616f30..c8e93d6eedf 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/ListenerExecutionFailedException.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/ListenerExecutionFailedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java index ac915abf7ab..3aa313c9252 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/adapter/MessageListenerAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java index ad366c49e11..0f11609876a 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java index dace0d10a23..392d02b1fa7 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java index 10e1cec3073..7263a4c9937 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java index 7da7f052cf7..dfc481c0e45 100644 --- a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java +++ b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerClientInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java index 682d927cbe5..1b4cce84d70 100644 --- a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java +++ b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerProxyFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java index 95c9f5a0f76..38dbfe53cfc 100644 --- a/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java +++ b/spring-jms/src/main/java/org/springframework/jms/remoting/JmsInvokerServiceExporter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/support/JmsAccessor.java b/spring-jms/src/main/java/org/springframework/jms/support/JmsAccessor.java index a40b42a3b97..80023bc3d01 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/JmsAccessor.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/JmsAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java b/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java index 493077a5e81..7f9212a80bf 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/JmsUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java index ab27354c610..9378d21c472 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java index 9eb8d813a60..c4fa6183535 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/MessageConversionException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java index d9be513bca3..939bd0f2116 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter102.java b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter102.java index e9ae82c1de2..569b9cbedff 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter102.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/converter/SimpleMessageConverter102.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java index 9da3ed1d6be..e3105c223d8 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/BeanFactoryDestinationResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolutionException.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolutionException.java index 3fa407b7378..e5be7c7297d 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolutionException.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolutionException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java index 0569619c8be..cd32ceae941 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/DestinationResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java index a8aaf1a2831..f3d39361f89 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/DynamicDestinationResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/main/java/org/springframework/jms/support/destination/JmsDestinationAccessor.java b/spring-jms/src/main/java/org/springframework/jms/support/destination/JmsDestinationAccessor.java index b27bf022af2..c93c2cd06f7 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/destination/JmsDestinationAccessor.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/destination/JmsDestinationAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/beans/Colour.java b/spring-jms/src/test/java/org/springframework/beans/Colour.java index 17fd24fec79..a992a2ebfc6 100644 --- a/spring-jms/src/test/java/org/springframework/beans/Colour.java +++ b/spring-jms/src/test/java/org/springframework/beans/Colour.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-jms/src/test/java/org/springframework/beans/INestedTestBean.java index c5c4ed5e679..e0ae5f20a3f 100644 --- a/spring-jms/src/test/java/org/springframework/beans/INestedTestBean.java +++ b/spring-jms/src/test/java/org/springframework/beans/INestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/beans/IOther.java b/spring-jms/src/test/java/org/springframework/beans/IOther.java index 6a8f74187cb..d7fb346185a 100644 --- a/spring-jms/src/test/java/org/springframework/beans/IOther.java +++ b/spring-jms/src/test/java/org/springframework/beans/IOther.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java index e136978f9e6..412891c439b 100644 --- a/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/beans/TestBean.java b/spring-jms/src/test/java/org/springframework/beans/TestBean.java index 7815bf1af34..fd998fd69bf 100644 --- a/spring-jms/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-jms/src/test/java/org/springframework/beans/TestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java b/spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java index ccf756b53eb..1ceb66af6d9 100644 --- a/spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java +++ b/spring-jms/src/test/java/org/springframework/core/task/StubTaskExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java b/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java index 4aa339db763..b2f84956353 100644 --- a/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java +++ b/spring-jms/src/test/java/org/springframework/jca/StubActivationSpec.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java b/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java index 0c70d70dd79..582e5fa7ca9 100644 --- a/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java +++ b/spring-jms/src/test/java/org/springframework/jca/StubResourceAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java b/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java index 650c51aa342..8945622e81c 100644 --- a/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java +++ b/spring-jms/src/test/java/org/springframework/jms/StubConnectionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/StubQueue.java b/spring-jms/src/test/java/org/springframework/jms/StubQueue.java index eca20ea2b4e..18d311fa7f1 100644 --- a/spring-jms/src/test/java/org/springframework/jms/StubQueue.java +++ b/spring-jms/src/test/java/org/springframework/jms/StubQueue.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/StubTopic.java b/spring-jms/src/test/java/org/springframework/jms/StubTopic.java index e3b0f1eca64..41e9e2bd04f 100644 --- a/spring-jms/src/test/java/org/springframework/jms/StubTopic.java +++ b/spring-jms/src/test/java/org/springframework/jms/StubTopic.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java index b62e9e41bbc..ee45f0f90f4 100644 --- a/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java b/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java index 4e5a4afc030..78c0de6e9fd 100644 --- a/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/connection/JmsTransactionManagerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java b/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java index b1cd2e2b02a..357174c59f4 100644 --- a/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java +++ b/spring-jms/src/test/java/org/springframework/jms/connection/TestConnection.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java b/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java index 16a20d342e2..f43f2bee0cf 100644 --- a/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java +++ b/spring-jms/src/test/java/org/springframework/jms/connection/TestExceptionListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java index 41c15ccf2b9..cc3d345871f 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102JtaTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java index aa03485dc55..abcb7a7e663 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102Tests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java index de630545c5f..f83c7081982 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplate102TransactedTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java index 0fea92f9564..b23d3a00dc2 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateJtaTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java index 7ede7b3a22c..500874d8a12 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java index bfa36dcb5d0..61abc8ca675 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/JmsTemplateTransactedTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java index 2072342bd62..30b71cf1823 100644 --- a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/AbstractMessageListenerContainerTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/AbstractMessageListenerContainerTests.java index 0e51fae6936..b225303560c 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/AbstractMessageListenerContainerTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/AbstractMessageListenerContainerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java index 388fbe86c8c..6bd5c571236 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/SimpleMessageListenerContainerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java index d34c5597d66..a41851b5ecf 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapter102Tests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java index 6a296262081..8fdf9391088 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessageListenerAdapterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java index 3bd333d3b37..89140fac0a5 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/ResponsiveJmsTextMessageReturningMessageDelegate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java index 218ec707e12..bef54da192b 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java index 324c7bf817e..646ee8a6948 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/adapter/StubMessageListenerAdapter102.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java index 880e535f92b..598c5ada293 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/DefaultJmsActivationSpecFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java index cf433e3352e..b8a04f7b537 100644 --- a/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java +++ b/spring-jms/src/test/java/org/springframework/jms/listener/endpoint/StubJmsActivationSpecFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java b/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java index 49b1f47f6ca..60ee013dc07 100644 --- a/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/remoting/JmsInvokerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java index 861ff0a52b2..7d4663a2859 100644 --- a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java +++ b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverter102Tests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java index 6546fd869d5..147987430b3 100644 --- a/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/support/SimpleMessageConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJacksonMessageConverterTests.java b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJacksonMessageConverterTests.java index 63ea2aa3fc7..54ca352ea0d 100644 --- a/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJacksonMessageConverterTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/support/converter/MappingJacksonMessageConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java b/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java index 531ff04c4cf..9cdf36ef45d 100644 --- a/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java +++ b/spring-jms/src/test/java/org/springframework/jms/support/destination/JndiDestinationResolverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java index 02996e490f8..b1862dd8937 100644 --- a/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java +++ b/spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java index 573e70e2e99..1b8cf3eeba6 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java index c4d9b9ebb3d..d580974a608 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/HeaderValueHolder.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/HeaderValueHolder.java index a6381e92baa..e8f5e91dfb6 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/HeaderValueHolder.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/HeaderValueHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java index 2de79f09c27..99e7722f335 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java index d8e8abdf5ef..be7ebf808e5 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java index 1a98d4c6572..080b8534eaf 100644 --- a/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java +++ b/spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java index 92d78f342c2..efd648ce116 100644 --- a/spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java +++ b/spring-orm/src/main/java/org/springframework/orm/ObjectOptimisticLockingFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java index 806eda51a5d..c2306d33af6 100644 --- a/spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java +++ b/spring-orm/src/main/java/org/springframework/orm/ObjectRetrievalFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java index ab39d5980b4..4475af596a8 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/AbstractSessionFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java index dd3b144bd3c..8bf4dbeffe1 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateInterceptor.java index 1cd28725b73..79339de558f 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateInterceptor.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java index 871d8a4af4a..e43e55f4cc2 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateJdbcException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java index bab18adca8d..37d5fde4f7a 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateObjectRetrievalFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java index ac627de2056..3d142f2256d 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOperations.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java index a63b93f4db1..96d7b3e1558 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateOptimisticLockingFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java index cdbdd49ec89..0dc209bf5cb 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateQueryException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java index e4987e2206d..040eaee1087 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateSystemException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java index 909161b863d..1edc733d3bd 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java index 208c88f60d7..d3d1e137339 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/HibernateTransactionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java index e48abde632e..dcf15059d3a 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalCacheProviderProxy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java index 31d069a9888..17764a5fece 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalJtaDataSourceConnectionProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java index 0a46bc5e9f3..06ab8f3b268 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalRegionFactoryProxy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java index e8d0f2f4626..2b46f7ef841 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/LocalTransactionManagerLookup.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java index 1953a84326b..0254d3cce58 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/SpringSessionContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java index a1895bdf4fe..368dcf54510 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/TransactionAwareDataSourceConnectionProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java index 1e035d7e540..d944ef497dc 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/annotation/AnnotationSessionFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java index 93620c30af4..e30f1e1f1c3 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/AbstractLobType.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java index e1df9f74c7b..bdfaf07bd7d 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobByteArrayType.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java index 8b3d3339fb0..ddcf4f51085 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobSerializableType.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java index 1638d2e0317..3066382286d 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/BlobStringType.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java index 9bf08b94d41..bef035c6f7e 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ClobStringType.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java index a59ed3d9bb8..e495fc8a9c7 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/HibernateDaoSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java index 2328205a9e9..ff962c9f5c8 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/IdTransferringMergeEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java index d48200c270e..fa867d2054e 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java index faf8b0e66f3..70fb9b68f3b 100644 --- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java +++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java index 061e6b9ecc3..8d10aadf8fe 100644 --- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java index 5dd0b4c6075..1379e80b1b0 100644 --- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java +++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientOperations.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java index 4c868c7ec2b..fce0f2ad195 100644 --- a/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java +++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/SqlMapClientTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java index aa227bcaad6..77189f9de70 100644 --- a/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java +++ b/spring-orm/src/main/java/org/springframework/orm/ibatis/support/AbstractLobTypeHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/DefaultJdoDialect.java b/spring-orm/src/main/java/org/springframework/orm/jdo/DefaultJdoDialect.java index 9dbf9c5b7ef..38d0f7263a4 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/DefaultJdoDialect.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/DefaultJdoDialect.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoAccessor.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoAccessor.java index 890c95dce2c..25d466f612b 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoAccessor.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoCallback.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoCallback.java index 4da9c505838..9a217332086 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoCallback.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoDialect.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoDialect.java index de2662d6fe9..464b011e128 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoDialect.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoDialect.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoInterceptor.java index 129f998b8b2..ff105e48ab9 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoInterceptor.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoObjectRetrievalFailureException.java index c2e5b8b2e9b..66cbf03f08f 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoObjectRetrievalFailureException.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoObjectRetrievalFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOptimisticLockingFailureException.java index 1b7e752999c..8e17a034004 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOptimisticLockingFailureException.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoOptimisticLockingFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoResourceFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoResourceFailureException.java index 30a3f2bdeec..314d3c2f560 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoResourceFailureException.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoResourceFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java index 868ad6050ff..d1089705ddf 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoSystemException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java index 3ec8e037fde..ce0f61aefcb 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTransactionManager.java index 62a1670ff16..412a12087af 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTransactionManager.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoTransactionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java index 918007b6a78..128ef3dd978 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/JdoUsageException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java index e0aa2c76852..112a1c5758a 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java b/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java index 55c5d6b33c2..a5d5938cbf7 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java b/spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java index b0603ebf5a1..671a09d0cad 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/TransactionAwarePersistenceManagerFactoryProxy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java index 81e1362c6a6..828cf7b479e 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/support/JdoDaoSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewFilter.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewFilter.java index 506cfde95e9..6612c08c450 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewFilter.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java b/spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java index 16dbe855c9c..9176c63791f 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/jdo/support/SpringPersistenceManagerProxyBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java index cdd4f423306..6d20ec34d93 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java index c71b63f214c..63df63e531e 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/DefaultJpaDialect.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java index 61fd9480a0d..3d7c0041bec 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java index 9e89098473c..bdb38dcd664 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerFactoryInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerProxy.java b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerProxy.java index 14419ff1443..71aaa4cd663 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerProxy.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/EntityManagerProxy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java index 0dfd3c9b51a..5f9783d2a17 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/ExtendedEntityManagerCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaAccessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaAccessor.java index 4495341ec46..cb4b282a841 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaAccessor.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaCallback.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaCallback.java index f3b1c81b9a5..4606c6258a4 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaCallback.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java index 6af89c88c90..a75fb9f85af 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaDialect.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaInterceptor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaInterceptor.java index b1cbfd409d6..cdb4830d3d3 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaInterceptor.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java index 1f0d8db5a0a..4bc69e6ad9b 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaObjectRetrievalFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOperations.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOperations.java index 0eaa5a6b612..b3355da5ec0 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOperations.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOperations.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java index b69740301c3..d4d116179ec 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaOptimisticLockingFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java index be71b0153d1..250b5ebfb3d 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaSystemException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTemplate.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTemplate.java index d853b300fbd..1b039f65730 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTemplate.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java index 714a28fdb99..259c6e37567 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaTransactionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java index 975f07e1065..24151fa6d7a 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java index 065431b7ea6..0913d234f03 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java index 32133baa822..00f15cfa4cf 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/SharedEntityManagerCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java index dcc6f13f1a7..b96413c5124 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/ClassFileTransformerAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitManager.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitManager.java index e5a8cbd8859..c6fff22ae85 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitManager.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitPostProcessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitPostProcessor.java index 85e49035552..2828ddd715a 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitPostProcessor.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/JpaDaoSupport.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/JpaDaoSupport.java index 02bbf299ea2..55d1b8b51b4 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/JpaDaoSupport.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/JpaDaoSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java index a203d4136a9..14864f4d0dc 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/support/SharedEntityManagerBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java index 6f40effd055..18499e412d4 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/AbstractJpaVendorAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/Database.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/Database.java index 3bbd6b17dfe..fbdcd48f531 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/Database.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/Database.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java index d2cf726e27e..1dd5764059c 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java index e7faa52d246..1293b335d4a 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java index 8a3a5f53486..065cf759a77 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaSessionFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java index 0ba1a3ee54f..d48a7b762ea 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java index 1ab02f213eb..e7db382d0ed 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaDialect.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaVendorAdapter.java index 15b59356e64..34fc0d4a1c3 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaVendorAdapter.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/OpenJpaVendorAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.java index c10bb362abb..36e18be4ef0 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/TopLinkJpaVendorAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/beans/Colour.java b/spring-orm/src/test/java/org/springframework/beans/Colour.java index 17fd24fec79..a992a2ebfc6 100644 --- a/spring-orm/src/test/java/org/springframework/beans/Colour.java +++ b/spring-orm/src/test/java/org/springframework/beans/Colour.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-orm/src/test/java/org/springframework/beans/INestedTestBean.java index c5c4ed5e679..e0ae5f20a3f 100644 --- a/spring-orm/src/test/java/org/springframework/beans/INestedTestBean.java +++ b/spring-orm/src/test/java/org/springframework/beans/INestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/beans/IOther.java b/spring-orm/src/test/java/org/springframework/beans/IOther.java index 6a8f74187cb..d7fb346185a 100644 --- a/spring-orm/src/test/java/org/springframework/beans/IOther.java +++ b/spring-orm/src/test/java/org/springframework/beans/IOther.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java index e136978f9e6..412891c439b 100644 --- a/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/beans/TestBean.java b/spring-orm/src/test/java/org/springframework/beans/TestBean.java index 7a27cf0894e..6d71de75764 100644 --- a/spring-orm/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-orm/src/test/java/org/springframework/beans/TestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java index cd4a7ef25f4..44cc004f89e 100644 --- a/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java +++ b/spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java index 9b3d10470da..71736866063 100644 --- a/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java +++ b/spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java index 5ab0d313777..4e1641b2cd8 100644 --- a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java +++ b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java index 32908a306aa..883db7bfd3f 100644 --- a/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java +++ b/spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java index db0b7901baf..ba1415f6402 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java index 7d6a94844bc..c44277644b5 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateJtaTransactionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java index 37539cc0a58..680520f6de4 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTemplateTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java index 3eff114c3f3..707d17b9fe4 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/HibernateTransactionManagerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java index 0ba20000bf8..c87a423c4a3 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java index 50b8d0631eb..2f264aa25f1 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/HibernateDaoSupportTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java index dc90981e931..3bc4f20b2b7 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/LobTypeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java index c6931097ce5..0c1a0ed1cd9 100644 --- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/support/ScopedBeanInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java b/spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java index 4e4068ce507..43a44e3498b 100644 --- a/spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/ibatis/SqlMapClientTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java b/spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java index c0b9717a22a..d92b60d3f4a 100644 --- a/spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/ibatis/support/LobTypeHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java index b7a1a64631d..21fa381178b 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java index 890fdb1f8c6..2baf4d205a1 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTemplateTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java index a7ab5fa9e69..6dde6a8c5dd 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jdo/JdoTransactionManagerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java index c5a20a83b15..1bf0d91fbb0 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jdo/LocalPersistenceManagerFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java index cfbd52a4164..20bc73dbfe2 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jdo/support/JdoDaoSupportTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java index 32b43d0cb69..aac1b766bef 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java index 225289d63a6..80912a34798 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java index 15148f29c65..8b40e31b1eb 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java index e82060c9a05..23f241e5ab1 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/ApplicationManagedEntityManagerIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java index 9d9ac1bb804..391a067a580 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/ContainerManagedEntityManagerIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java index d145444a7b9..0f7efcafe7e 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/DefaultJpaDialectTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryBeanSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryBeanSupportTests.java index e88c59dc31a..1d4578b372b 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryBeanSupportTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryBeanSupportTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java index c9ba5d1d464..137912e5b23 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/EntityManagerFactoryUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java index f2f545dcf94..5f2c0d0aa91 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java index 41bb0352694..4d25da36591 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTemplateTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java index e9ba8b86851..a1a7db067b6 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java index a0ebba76b67..393d316db0a 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalContainerEntityManagerFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java index 8371e18766b..048eb2d4ae9 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/LocalEntityManagerFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/DriversLicense.java b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/DriversLicense.java index da0ad4e1388..e2e15647551 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/DriversLicense.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/DriversLicense.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java index 4c5ba65c63a..598c07f755c 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/domain/Person.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java index 67f586adb06..1802b16d2f9 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/eclipselink/EclipseLinkEntityManagerFactoryIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java index 8759b3710b9..3a6b77b0d69 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateEntityManagerFactoryIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java index 68e82f5f800..e823e57a32f 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java index 28b03587ab9..b2b509f3dfa 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/JpaDaoSupportTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java index 4675422aab0..7e84430678c 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceInjectionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java index 93072c225fc..3296f1f258d 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/SharedEntityManagerFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkEntityManagerFactoryIntegrationTests.java index 64e43ed7d4f..c3bef0c2837 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkEntityManagerFactoryIntegrationTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkEntityManagerFactoryIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java index 8cb7fd87440..ec2b9499e56 100644 --- a/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java +++ b/spring-orm/src/test/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java index b99e20d03fc..c71e846dcdd 100644 --- a/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java +++ b/spring-orm/src/test/java/org/springframework/test/AbstractSingleSpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractSpringContextTests.java index c775ae95d81..696b9b79cf3 100644 --- a/spring-orm/src/test/java/org/springframework/test/AbstractSpringContextTests.java +++ b/spring-orm/src/test/java/org/springframework/test/AbstractSpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java index 1f0b6123dbd..a3aa264cec4 100644 --- a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java +++ b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java index e45774e1c9e..637aa5b7948 100644 --- a/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java +++ b/spring-orm/src/test/java/org/springframework/test/AbstractTransactionalSpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java b/spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java index 8c9dc686d94..f2403b649a8 100644 --- a/spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java +++ b/spring-orm/src/test/java/org/springframework/test/ConditionalTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java b/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java index fa6dd008a0a..03a76601538 100644 --- a/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java +++ b/spring-orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/DirtiesContext.java b/spring-orm/src/test/java/org/springframework/test/annotation/DirtiesContext.java index b13160181e1..51a41778812 100644 --- a/spring-orm/src/test/java/org/springframework/test/annotation/DirtiesContext.java +++ b/spring-orm/src/test/java/org/springframework/test/annotation/DirtiesContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/IfProfileValue.java b/spring-orm/src/test/java/org/springframework/test/annotation/IfProfileValue.java index 825e134aac0..662eb69d515 100644 --- a/spring-orm/src/test/java/org/springframework/test/annotation/IfProfileValue.java +++ b/spring-orm/src/test/java/org/springframework/test/annotation/IfProfileValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueSource.java b/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueSource.java index ee1c07f14c9..05ee407f5f1 100644 --- a/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueSource.java +++ b/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueUtils.java b/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueUtils.java index f6dbf80587a..75cb9c14231 100644 --- a/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueUtils.java +++ b/spring-orm/src/test/java/org/springframework/test/annotation/ProfileValueUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/Rollback.java b/spring-orm/src/test/java/org/springframework/test/annotation/Rollback.java index f2df990bb4a..754888cc146 100644 --- a/spring-orm/src/test/java/org/springframework/test/annotation/Rollback.java +++ b/spring-orm/src/test/java/org/springframework/test/annotation/Rollback.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java b/spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java index 7bd17b9bd5c..5a39918a770 100644 --- a/spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java +++ b/spring-orm/src/test/java/org/springframework/test/annotation/SystemProfileValueSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/test/jdbc/JdbcTestUtils.java b/spring-orm/src/test/java/org/springframework/test/jdbc/JdbcTestUtils.java index c4ec73bc3f4..a34cbc6309e 100644 --- a/spring-orm/src/test/java/org/springframework/test/jdbc/JdbcTestUtils.java +++ b/spring-orm/src/test/java/org/springframework/test/jdbc/JdbcTestUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java index b4cb804032a..bcd5704c80d 100644 --- a/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java +++ b/spring-orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java b/spring-orm/src/test/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java index 8bb2d00acbb..9cf1ded10a8 100644 --- a/spring-orm/src/test/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java +++ b/spring-orm/src/test/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java b/spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java index de79edcd747..e2066af4d92 100644 --- a/spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java +++ b/spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java index ccc8039a8f6..77115d08b52 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java index c66d642fddb..fab56e5e5aa 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/Marshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/Marshaller.java index 85253a810cf..9dfb7214d20 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/Marshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/Marshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java index 925558f7ae2..dea843c0a22 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java index f7eba5c93bc..ceff466c669 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/MarshallingFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java b/spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java index 9986ad58b28..79644134e1a 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/UncategorizedMappingException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/Unmarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/Unmarshaller.java index bdbebf2c8bd..e5fbb959adc 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/Unmarshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/Unmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java b/spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java index 350cdb2b0eb..901ff9f0537 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/UnmarshallingFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java b/spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java index f39ddfd6d37..02b30141958 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/ValidationFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java b/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java index dff92dd3095..3f38f2c9bf0 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/XmlMappingException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java index 6139df1f2af..20be49ceceb 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java b/spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java index d3895ebccc3..e2f6a3f25bb 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java b/spring-oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java index 447c425da8a..2529b9ca079 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/config/Jaxb2MarshallerBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* -* Copyright 2002-2009 the original author or authors. +* Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java b/spring-oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java index aa99d312e27..a83051b9b02 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java b/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java index 6ff085146a7..19bf683caeb 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java b/spring-oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java index 3fb94cddda6..0f5dc4c0f1a 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/config/XmlBeansMarshallerBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java index 9acf2322857..f7535781b3a 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/mime/MimeContainer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java index 983655abf05..cf584efa88e 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java b/spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java index 9c208afcfb0..7fbe4b4745c 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/support/MarshallingSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/support/SaxResourceUtils.java b/spring-oxm/src/main/java/org/springframework/oxm/support/SaxResourceUtils.java index 98dc0a248f6..881a3ca20ba 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/support/SaxResourceUtils.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/support/SaxResourceUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java index 6d9604dde84..991d2626456 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java index f3e75920be9..d5d668bac68 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamUtils.java b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamUtils.java index c2c26b3d46d..04f53b6973b 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamUtils.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java index 0c574a4df15..8a7f1f82f1f 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/test/java/org/springframework/oxm/config/OxmNamespaceHandlerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/config/OxmNamespaceHandlerTests.java index 90e8bdf738d..38f03876791 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/config/OxmNamespaceHandlerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/config/OxmNamespaceHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java index 503b01cc016..7a7a21d39c1 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/BinaryObject.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java index 92e98b4d060..5e982d76133 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Primitives.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java index 89e41d3c656..00daa798f45 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/StandardClasses.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java b/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java index aa445748bdf..422f8d00355 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/jibx/Flights.java @@ -1,5 +1,5 @@ /* - * Copyright 2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTests.java index 0c3b71eca5a..4123df65fd1 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/test/java/org/springframework/oxm/xstream/Flight.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/Flight.java index 0f6698f8dbb..15037de3a53 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/xstream/Flight.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/xstream/Flight.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java index cf42f1bd783..7979e4d5c52 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java index d48113b6e1c..3bc05c28b31 100644 --- a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java +++ b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/ComponentControllerSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java index 3ac220ce339..4905e411f0e 100644 --- a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java +++ b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesJstlView.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesJstlView.java index 232f1b49ff0..cbec3678174 100644 --- a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesJstlView.java +++ b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesJstlView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java index f46433e040a..7e952690eab 100644 --- a/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java +++ b/spring-struts/src/main/java/org/springframework/web/servlet/view/tiles/TilesView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-struts/src/main/java/org/springframework/web/struts/ActionServletAwareProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/ActionServletAwareProcessor.java index e2eb6e1fb6f..54c46c76a28 100644 --- a/spring-struts/src/main/java/org/springframework/web/struts/ActionServletAwareProcessor.java +++ b/spring-struts/src/main/java/org/springframework/web/struts/ActionServletAwareProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-struts/src/main/java/org/springframework/web/struts/ActionSupport.java b/spring-struts/src/main/java/org/springframework/web/struts/ActionSupport.java index c12b895766e..b87823a8364 100644 --- a/spring-struts/src/main/java/org/springframework/web/struts/ActionSupport.java +++ b/spring-struts/src/main/java/org/springframework/web/struts/ActionSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-struts/src/main/java/org/springframework/web/struts/AutowiringRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/AutowiringRequestProcessor.java index f14091729d9..27a5368ca35 100644 --- a/spring-struts/src/main/java/org/springframework/web/struts/AutowiringRequestProcessor.java +++ b/spring-struts/src/main/java/org/springframework/web/struts/AutowiringRequestProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-struts/src/main/java/org/springframework/web/struts/AutowiringTilesRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/AutowiringTilesRequestProcessor.java index 96a24c8c6e8..c9df6c84921 100644 --- a/spring-struts/src/main/java/org/springframework/web/struts/AutowiringTilesRequestProcessor.java +++ b/spring-struts/src/main/java/org/springframework/web/struts/AutowiringTilesRequestProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java b/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java index 74214470d54..d1d68e69956 100644 --- a/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java +++ b/spring-struts/src/main/java/org/springframework/web/struts/ContextLoaderPlugIn.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java index b43d3f5152b..860f79c2415 100644 --- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java +++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionProxy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionUtils.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionUtils.java index 32d08f5cf31..79fa1228281 100644 --- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionUtils.java +++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingActionUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java index 063ad2f9a78..a9ebf4d7c66 100644 --- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java +++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingRequestProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java index b614dd30b04..62ea98fc819 100644 --- a/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java +++ b/spring-struts/src/main/java/org/springframework/web/struts/DelegatingTilesRequestProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-struts/src/main/java/org/springframework/web/struts/DispatchActionSupport.java b/spring-struts/src/main/java/org/springframework/web/struts/DispatchActionSupport.java index ff18cff838a..b9a0b186ded 100644 --- a/spring-struts/src/main/java/org/springframework/web/struts/DispatchActionSupport.java +++ b/spring-struts/src/main/java/org/springframework/web/struts/DispatchActionSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-struts/src/main/java/org/springframework/web/struts/LookupDispatchActionSupport.java b/spring-struts/src/main/java/org/springframework/web/struts/LookupDispatchActionSupport.java index 1533d81a102..a6cb4ed1092 100644 --- a/spring-struts/src/main/java/org/springframework/web/struts/LookupDispatchActionSupport.java +++ b/spring-struts/src/main/java/org/springframework/web/struts/LookupDispatchActionSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-struts/src/main/java/org/springframework/web/struts/MappingDispatchActionSupport.java b/spring-struts/src/main/java/org/springframework/web/struts/MappingDispatchActionSupport.java index b67b34f481d..1187c84f9a2 100644 --- a/spring-struts/src/main/java/org/springframework/web/struts/MappingDispatchActionSupport.java +++ b/spring-struts/src/main/java/org/springframework/web/struts/MappingDispatchActionSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java b/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java index 65bcd408b77..3cb29fb4e92 100644 --- a/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java +++ b/spring-struts/src/main/java/org/springframework/web/struts/SpringBindingActionForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TestComponentController.java b/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TestComponentController.java index 941dd59517e..a0499247dbc 100644 --- a/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TestComponentController.java +++ b/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TestComponentController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TilesViewTests.java b/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TilesViewTests.java index 389c18f9b37..34a09a170f7 100644 --- a/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TilesViewTests.java +++ b/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TilesViewTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.java b/spring-struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.java index 5e77137f534..ad97b300b55 100644 --- a/spring-struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.java +++ b/spring-struts/src/test/java/org/springframework/web/struts/StrutsSupportTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-struts/src/test/java/org/springframework/web/struts/TestAction.java b/spring-struts/src/test/java/org/springframework/web/struts/TestAction.java index e89fe77b455..caded1a7f39 100644 --- a/spring-struts/src/test/java/org/springframework/web/struts/TestAction.java +++ b/spring-struts/src/test/java/org/springframework/web/struts/TestAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java index c71d6e86810..d35fbdc8657 100644 --- a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java +++ b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java index f21936897b3..449c45facaf 100644 --- a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java +++ b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java index 66ce8a2b076..f97e60e2ebb 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java +++ b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java index 784e160483a..23694170305 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java +++ b/spring-test/src/main/java/org/springframework/mock/web/DelegatingServletOutputStream.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java b/spring-test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java index a6381e92baa..e8f5e91dfb6 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java +++ b/spring-test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java b/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java index 4894fe4eb9b..6b69fdb7048 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockExpressionEvaluator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java b/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java index 2ea463ce8d9..b492c1fa980 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockPageContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletConfig.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletConfig.java index 985c1e20dca..9d3a878026a 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletConfig.java +++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java index 89dbaf0d74b..b1193ff5e1e 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java +++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java index d6ba452f238..70e90567b0c 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java +++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java index 477493f4f0f..93800340b85 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java +++ b/spring-test/src/main/java/org/springframework/mock/web/portlet/MockPortletSession.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java index 83096ddf9f8..0ef706abe11 100644 --- a/spring-test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java +++ b/spring-test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java index bd83c9eaffa..0d5d0784801 100644 --- a/spring-test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java +++ b/spring-test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/AbstractSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractSpringContextTests.java index c420225a632..d01144ede93 100644 --- a/spring-test/src/main/java/org/springframework/test/AbstractSpringContextTests.java +++ b/spring-test/src/main/java/org/springframework/test/AbstractSpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java index fae16151d2a..0f697d115f5 100644 --- a/spring-test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java +++ b/spring-test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java b/spring-test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java index bae411345d7..af3c68663e0 100644 --- a/spring-test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java +++ b/spring-test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/AssertThrows.java b/spring-test/src/main/java/org/springframework/test/AssertThrows.java index b810d3381cb..8e56f2e9e6e 100644 --- a/spring-test/src/main/java/org/springframework/test/AssertThrows.java +++ b/spring-test/src/main/java/org/springframework/test/AssertThrows.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java b/spring-test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java index 7664b0f4609..30c08a22cb9 100644 --- a/spring-test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java +++ b/spring-test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java b/spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java index 72ae28bb338..53a9b877e64 100644 --- a/spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java +++ b/spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/annotation/ExpectedException.java b/spring-test/src/main/java/org/springframework/test/annotation/ExpectedException.java index 91962ee8273..944f3aeaead 100644 --- a/spring-test/src/main/java/org/springframework/test/annotation/ExpectedException.java +++ b/spring-test/src/main/java/org/springframework/test/annotation/ExpectedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/annotation/IfProfileValue.java b/spring-test/src/main/java/org/springframework/test/annotation/IfProfileValue.java index 322c7a7fd9f..c5c718468d6 100644 --- a/spring-test/src/main/java/org/springframework/test/annotation/IfProfileValue.java +++ b/spring-test/src/main/java/org/springframework/test/annotation/IfProfileValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/annotation/NotTransactional.java b/spring-test/src/main/java/org/springframework/test/annotation/NotTransactional.java index 76983acf728..c8539186644 100644 --- a/spring-test/src/main/java/org/springframework/test/annotation/NotTransactional.java +++ b/spring-test/src/main/java/org/springframework/test/annotation/NotTransactional.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSource.java b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSource.java index ee1c07f14c9..05ee407f5f1 100644 --- a/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSource.java +++ b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSourceConfiguration.java b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSourceConfiguration.java index e21ace4ce78..4e240aa6ea7 100644 --- a/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSourceConfiguration.java +++ b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueSourceConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueUtils.java b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueUtils.java index 42fc03f1f4f..922e34c6295 100644 --- a/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueUtils.java +++ b/spring-test/src/main/java/org/springframework/test/annotation/ProfileValueUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/annotation/Repeat.java b/spring-test/src/main/java/org/springframework/test/annotation/Repeat.java index 7ab79068137..4c3dcd3a91e 100644 --- a/spring-test/src/main/java/org/springframework/test/annotation/Repeat.java +++ b/spring-test/src/main/java/org/springframework/test/annotation/Repeat.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/annotation/Rollback.java b/spring-test/src/main/java/org/springframework/test/annotation/Rollback.java index 3498074cb1c..bb0bc88cd58 100644 --- a/spring-test/src/main/java/org/springframework/test/annotation/Rollback.java +++ b/spring-test/src/main/java/org/springframework/test/annotation/Rollback.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/annotation/Timed.java b/spring-test/src/main/java/org/springframework/test/annotation/Timed.java index 96729e409e4..a78960ce82d 100644 --- a/spring-test/src/main/java/org/springframework/test/annotation/Timed.java +++ b/spring-test/src/main/java/org/springframework/test/annotation/Timed.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/context/TestContext.java b/spring-test/src/main/java/org/springframework/test/context/TestContext.java index fc64520476c..27100be94c1 100644 --- a/spring-test/src/main/java/org/springframework/test/context/TestContext.java +++ b/spring-test/src/main/java/org/springframework/test/context/TestContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java index 0b844447e97..0f2ceb73a48 100644 --- a/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java +++ b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/context/TestExecutionListeners.java b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListeners.java index 7a820b42cbf..50cfa74474e 100644 --- a/spring-test/src/main/java/org/springframework/test/context/TestExecutionListeners.java +++ b/spring-test/src/main/java/org/springframework/test/context/TestExecutionListeners.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java index 81658f379d9..732c1e0bf5f 100644 --- a/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java +++ b/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractTransactionalJUnit38SpringContextTests.java b/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractTransactionalJUnit38SpringContextTests.java index 91dc025aacb..9b7fd03ec70 100644 --- a/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractTransactionalJUnit38SpringContextTests.java +++ b/spring-test/src/main/java/org/springframework/test/context/junit38/AbstractTransactionalJUnit38SpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java b/spring-test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java index a01f214f600..5496b4ee633 100644 --- a/spring-test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java +++ b/spring-test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java index f625c3fa5cb..c3d6c8f5c7b 100644 --- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java +++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunAfterTestClassCallbacks.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestClassCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestClassCallbacks.java index 3112cfcc5bf..16c6f97d8c2 100644 --- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestClassCallbacks.java +++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestClassCallbacks.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestMethodCallbacks.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestMethodCallbacks.java index c35ff652460..92d32ea5172 100644 --- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestMethodCallbacks.java +++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/RunBeforeTestMethodCallbacks.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java index 51b04ce41fc..093ae49b107 100644 --- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java +++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java index e3242621581..0aa21888cb9 100644 --- a/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java +++ b/spring-test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestExecutionListener.java index beaa77ca1a1..34dfe47ec7f 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestExecutionListener.java +++ b/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestExecutionListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java index ca380e68bd8..cb852237171 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java +++ b/spring-test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java index fef3aa74cc0..7c784741899 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java +++ b/spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/context/support/GenericPropertiesContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/GenericPropertiesContextLoader.java index a4fa110e983..823688797ff 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/GenericPropertiesContextLoader.java +++ b/spring-test/src/main/java/org/springframework/test/context/support/GenericPropertiesContextLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/context/support/GenericXmlContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/GenericXmlContextLoader.java index 1fffaebd967..9c636e0e705 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/GenericXmlContextLoader.java +++ b/spring-test/src/main/java/org/springframework/test/context/support/GenericXmlContextLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java b/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java index 21be2d3da41..bb25f1f8e64 100644 --- a/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java +++ b/spring-test/src/main/java/org/springframework/test/context/transaction/AfterTransaction.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java b/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java index f047b156d37..d36250099dd 100644 --- a/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java +++ b/spring-test/src/main/java/org/springframework/test/context/transaction/BeforeTransaction.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/jpa/AbstractAspectjJpaTests.java b/spring-test/src/main/java/org/springframework/test/jpa/AbstractAspectjJpaTests.java index 3ccb4000e68..dd55d0e78b1 100644 --- a/spring-test/src/main/java/org/springframework/test/jpa/AbstractAspectjJpaTests.java +++ b/spring-test/src/main/java/org/springframework/test/jpa/AbstractAspectjJpaTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java b/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java index 3afa5165861..ba959d162f2 100644 --- a/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java +++ b/spring-test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java b/spring-test/src/main/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java index 8bb2d00acbb..9cf1ded10a8 100644 --- a/spring-test/src/main/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java +++ b/spring-test/src/main/java/org/springframework/test/jpa/OrmXmlOverridingShadowingClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/main/java/org/springframework/test/web/AbstractModelAndViewTests.java b/spring-test/src/main/java/org/springframework/test/web/AbstractModelAndViewTests.java index 887adccf109..fefc31e1615 100644 --- a/spring-test/src/main/java/org/springframework/test/web/AbstractModelAndViewTests.java +++ b/spring-test/src/main/java/org/springframework/test/web/AbstractModelAndViewTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/beans/Employee.java b/spring-test/src/test/java/org/springframework/beans/Employee.java index 3a47dfd6903..9289e451370 100644 --- a/spring-test/src/test/java/org/springframework/beans/Employee.java +++ b/spring-test/src/test/java/org/springframework/beans/Employee.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-test/src/test/java/org/springframework/beans/INestedTestBean.java index c5c4ed5e679..e0ae5f20a3f 100644 --- a/spring-test/src/test/java/org/springframework/beans/INestedTestBean.java +++ b/spring-test/src/test/java/org/springframework/beans/INestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/beans/IOther.java b/spring-test/src/test/java/org/springframework/beans/IOther.java index 6a8f74187cb..d7fb346185a 100644 --- a/spring-test/src/test/java/org/springframework/beans/IOther.java +++ b/spring-test/src/test/java/org/springframework/beans/IOther.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java index e136978f9e6..412891c439b 100644 --- a/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/beans/TestBean.java b/spring-test/src/test/java/org/springframework/beans/TestBean.java index 66e2624f05c..3ce93f7c439 100644 --- a/spring-test/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-test/src/test/java/org/springframework/beans/TestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/mock/web/MockPageContextTests.java b/spring-test/src/test/java/org/springframework/mock/web/MockPageContextTests.java index 5a6c915365d..493cdc755dd 100644 --- a/spring-test/src/test/java/org/springframework/mock/web/MockPageContextTests.java +++ b/spring-test/src/test/java/org/springframework/mock/web/MockPageContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java index f02ce343039..06c94aa4417 100644 --- a/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2007-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java index a8908bfd8f0..07b0cf4b5eb 100644 --- a/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java index 1872385e619..08523c79492 100644 --- a/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2007-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java index 496bbc1b010..4b3223f4ba6 100644 --- a/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2007-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java index 9701ab3364a..192d005f4a8 100644 --- a/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java index 7ec007c0160..bb715753aff 100644 --- a/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java +++ b/spring-test/src/test/java/org/springframework/test/annotation/ProfileValueUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/ClassLevelDirtiesContextTests.java b/spring-test/src/test/java/org/springframework/test/context/ClassLevelDirtiesContextTests.java index 613dc3acce8..3768b03cb63 100644 --- a/spring-test/src/test/java/org/springframework/test/context/ClassLevelDirtiesContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/ClassLevelDirtiesContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/TestContextCacheKeyTests.java b/spring-test/src/test/java/org/springframework/test/context/TestContextCacheKeyTests.java index a504642a928..d7659379409 100644 --- a/spring-test/src/test/java/org/springframework/test/context/TestContextCacheKeyTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/TestContextCacheKeyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/TestContextManagerTests.java b/spring-test/src/test/java/org/springframework/test/context/TestContextManagerTests.java index 69c5ba2d433..97f303b809b 100644 --- a/spring-test/src/test/java/org/springframework/test/context/TestContextManagerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/TestContextManagerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java index 869d41ab270..eb6f44f176a 100644 --- a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java index 10f0e1ef419..81f51d459a9 100644 --- a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java index 70778c7f1c4..147679ed5f1 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java index 85a7c0a244c..6cecd0c267d 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/AbsolutePathSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/AbsolutePathSpringJUnit4ClassRunnerAppCtxTests.java index 419997161eb..0e53eef4824 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/AbsolutePathSpringJUnit4ClassRunnerAppCtxTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/AbsolutePathSpringJUnit4ClassRunnerAppCtxTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/AbstractTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/AbstractTransactionalSpringRunnerTests.java index ebe40daa0ac..5ada9b5c618 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/AbstractTransactionalSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/AbstractTransactionalSpringRunnerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java index a9ce65e0d3f..7ae72d581f8 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java index 78075bc3f3d..02c0dcf0fa5 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests.java index a9284c78f08..4bb3fb5bfa4 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java index 59ad1be4f5f..bab1df5ff8d 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java index ad7de4f2701..0c068820875 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests.java index c51b95cb3f2..08f91b536af 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests.java index cc5ad01ff25..d7bfb8c2cd4 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/EnabledAndIgnoredSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/EnabledAndIgnoredSpringRunnerTests.java index 80366aed5aa..ca7b3126628 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/EnabledAndIgnoredSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/EnabledAndIgnoredSpringRunnerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java index 72a98004def..cea2a29c79d 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java index db69a60506c..6cc35c641b8 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java index 75a32cda3af..a77f7239d1b 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java index 5c2d39499c4..d41dbb50269 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java index c41eb332386..a662b7b8bff 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit47ClassRunnerRuleTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit47ClassRunnerRuleTests.java index 61059c36399..3229df93d56 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit47ClassRunnerRuleTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit47ClassRunnerRuleTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java index c65ab7c9394..399f6a61030 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java index d8446ea5791..2f293d88475 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java index ad6090ab612..751ec07e92d 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/TrackingRunListener.java b/spring-test/src/test/java/org/springframework/test/context/junit4/TrackingRunListener.java index 2b387520827..4c257540b96 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/TrackingRunListener.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/TrackingRunListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java index 835398cb1bb..219010f12b8 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java index 70e1a8dd5c0..46dfd6725a6 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingExplicitConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingExplicitConfigClassesInheritedTests.java index 223c5a6f592..54a9dd26bac 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingExplicitConfigClassesInheritedTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingExplicitConfigClassesInheritedTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java index 87738909689..469e35f8d9d 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java index aed661d8385..e426d1e7f3b 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java index db1c4bca19d..9f29d9a54aa 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingExplicitConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingExplicitConfigClassesInheritedTests.java index cfc0a5fd533..26dd5f470ec 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingExplicitConfigClassesInheritedTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingExplicitConfigClassesInheritedTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java index f2b001e10d1..278804817e4 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java index 6ba03e1bc4a..3cf8f064d0c 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java index b2e4fedb24f..b54613b4910 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java index f769cb1a133..c060ea4b555 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java index da02bb82281..a3d2ecee168 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java index 6a384d8c6ac..54596ae6d29 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java index bd69ae15ff6..0208925227c 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.java index 464ff84af01..dc06571f19d 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/DriversLicense.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.java index 882578a189b..c6f765ea952 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/domain/Person.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/PersonRepository.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/PersonRepository.java index 56bd2987393..409aade593a 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/PersonRepository.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/PersonRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java index bb90b212fdf..eac2522cd2a 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/PersonService.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/PersonService.java index e8a7c2f5a56..76421e3706c 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/PersonService.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/PersonService.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java index b6247e4a7e1..92602e1527f 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/service/impl/StandardPersonService.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java index 47d7dab773b..6bdeeee2348 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr6128/AutowiredQualifierTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/support/AnnotatedFooConfigInnerClassTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/AnnotatedFooConfigInnerClassTestCase.java index 85da86b3f55..bb2e80b9f30 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/AnnotatedFooConfigInnerClassTestCase.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/AnnotatedFooConfigInnerClassTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/support/AnnotationConfigContextLoaderTests.java b/spring-test/src/test/java/org/springframework/test/context/support/AnnotationConfigContextLoaderTests.java index d56c24f5e5d..9d071b1647f 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/AnnotationConfigContextLoaderTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/AnnotationConfigContextLoaderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/support/ContextConfigurationInnerClassTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/ContextConfigurationInnerClassTestCase.java index adaff61eb02..ea0c4e8401d 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/ContextConfigurationInnerClassTestCase.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/ContextConfigurationInnerClassTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java b/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java index 847dbd97e8b..1d930831d08 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/support/FinalConfigInnerClassTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/FinalConfigInnerClassTestCase.java index 7cde8c0190b..1c5d85d6059 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/FinalConfigInnerClassTestCase.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/FinalConfigInnerClassTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java b/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java index d8fc57b3f16..bf53acc5425 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/support/MultipleStaticConfigurationClassesTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/MultipleStaticConfigurationClassesTestCase.java index e9e69e1a19b..a9069a1d06c 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/MultipleStaticConfigurationClassesTestCase.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/MultipleStaticConfigurationClassesTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/support/NonStaticConfigInnerClassesTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/NonStaticConfigInnerClassesTestCase.java index a8ae4fcc8bc..db9d91790c5 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/NonStaticConfigInnerClassesTestCase.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/NonStaticConfigInnerClassesTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/support/PlainVanillaFooConfigInnerClassTestCase.java b/spring-test/src/test/java/org/springframework/test/context/support/PlainVanillaFooConfigInnerClassTestCase.java index a5693135559..427191bcfcc 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/PlainVanillaFooConfigInnerClassTestCase.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/PlainVanillaFooConfigInnerClassTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java index f395a90a66e..0ad8862c2ed 100644 --- a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java index 09d76fb8832..7a2cb97c8f9 100644 --- a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java index cdc23e35bf3..bedd776bce9 100644 --- a/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/testng/TimedTransactionalTestNGSpringContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/transaction/TransactionTestUtils.java b/spring-test/src/test/java/org/springframework/test/transaction/TransactionTestUtils.java index 3be9e53ca87..d5598c26f5f 100644 --- a/spring-test/src/test/java/org/springframework/test/transaction/TransactionTestUtils.java +++ b/spring-test/src/test/java/org/springframework/test/transaction/TransactionTestUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-test/src/test/java/org/springframework/test/util/subpackage/Person.java b/spring-test/src/test/java/org/springframework/test/util/subpackage/Person.java index eac5e7b76f5..66304779575 100644 --- a/spring-test/src/test/java/org/springframework/test/util/subpackage/Person.java +++ b/spring-test/src/test/java/org/springframework/test/util/subpackage/Person.java @@ -1,5 +1,5 @@ /* - * Copyright 2007-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java b/spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java index b9c8aa80e99..82cd00574b4 100644 --- a/spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java +++ b/spring-tx/src/main/java/org/springframework/dao/CannotAcquireLockException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/CannotSerializeTransactionException.java b/spring-tx/src/main/java/org/springframework/dao/CannotSerializeTransactionException.java index b75a74281ea..1e303dd9075 100644 --- a/spring-tx/src/main/java/org/springframework/dao/CannotSerializeTransactionException.java +++ b/spring-tx/src/main/java/org/springframework/dao/CannotSerializeTransactionException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/CleanupFailureDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/CleanupFailureDataAccessException.java index 4e77ce5a162..b6801d20bca 100644 --- a/spring-tx/src/main/java/org/springframework/dao/CleanupFailureDataAccessException.java +++ b/spring-tx/src/main/java/org/springframework/dao/CleanupFailureDataAccessException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/ConcurrencyFailureException.java b/spring-tx/src/main/java/org/springframework/dao/ConcurrencyFailureException.java index 48404930548..eda824bb3e8 100644 --- a/spring-tx/src/main/java/org/springframework/dao/ConcurrencyFailureException.java +++ b/spring-tx/src/main/java/org/springframework/dao/ConcurrencyFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java index 4ee94c17aed..bc1c8ce35b9 100644 --- a/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java +++ b/spring-tx/src/main/java/org/springframework/dao/DataAccessException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/DataAccessResourceFailureException.java b/spring-tx/src/main/java/org/springframework/dao/DataAccessResourceFailureException.java index c1af3068a71..c7b6c88e36e 100644 --- a/spring-tx/src/main/java/org/springframework/dao/DataAccessResourceFailureException.java +++ b/spring-tx/src/main/java/org/springframework/dao/DataAccessResourceFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/DataIntegrityViolationException.java b/spring-tx/src/main/java/org/springframework/dao/DataIntegrityViolationException.java index 445e7e5171b..ae06fa821f1 100644 --- a/spring-tx/src/main/java/org/springframework/dao/DataIntegrityViolationException.java +++ b/spring-tx/src/main/java/org/springframework/dao/DataIntegrityViolationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java b/spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java index c28811f4cce..4631790d62d 100644 --- a/spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java +++ b/spring-tx/src/main/java/org/springframework/dao/DataRetrievalFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/DeadlockLoserDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/DeadlockLoserDataAccessException.java index 17592afe479..7b41fe7d559 100644 --- a/spring-tx/src/main/java/org/springframework/dao/DeadlockLoserDataAccessException.java +++ b/spring-tx/src/main/java/org/springframework/dao/DeadlockLoserDataAccessException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/DuplicateKeyException.java b/spring-tx/src/main/java/org/springframework/dao/DuplicateKeyException.java index 08de0dbaca7..4ec0b72512c 100644 --- a/spring-tx/src/main/java/org/springframework/dao/DuplicateKeyException.java +++ b/spring-tx/src/main/java/org/springframework/dao/DuplicateKeyException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java index cec38dc16bf..3179a3adc9d 100644 --- a/spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java +++ b/spring-tx/src/main/java/org/springframework/dao/IncorrectUpdateSemanticsDataAccessException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessApiUsageException.java b/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessApiUsageException.java index 7a401c24d37..907f621809f 100644 --- a/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessApiUsageException.java +++ b/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessApiUsageException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java b/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java index fc29c8a0c16..f284362602f 100644 --- a/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java +++ b/spring-tx/src/main/java/org/springframework/dao/InvalidDataAccessResourceUsageException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessException.java index 7970724c43e..d41930a6d95 100644 --- a/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessException.java +++ b/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessResourceException.java b/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessResourceException.java index 5bf9e388782..99bdcf324be 100644 --- a/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessResourceException.java +++ b/spring-tx/src/main/java/org/springframework/dao/NonTransientDataAccessResourceException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/OptimisticLockingFailureException.java b/spring-tx/src/main/java/org/springframework/dao/OptimisticLockingFailureException.java index f42faa26a39..131bbd6fd90 100644 --- a/spring-tx/src/main/java/org/springframework/dao/OptimisticLockingFailureException.java +++ b/spring-tx/src/main/java/org/springframework/dao/OptimisticLockingFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/PermissionDeniedDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/PermissionDeniedDataAccessException.java index ce08465ae4e..4ec552b2173 100644 --- a/spring-tx/src/main/java/org/springframework/dao/PermissionDeniedDataAccessException.java +++ b/spring-tx/src/main/java/org/springframework/dao/PermissionDeniedDataAccessException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/PessimisticLockingFailureException.java b/spring-tx/src/main/java/org/springframework/dao/PessimisticLockingFailureException.java index 698e3d07d03..a5ab2dc9d8a 100644 --- a/spring-tx/src/main/java/org/springframework/dao/PessimisticLockingFailureException.java +++ b/spring-tx/src/main/java/org/springframework/dao/PessimisticLockingFailureException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/RecoverableDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/RecoverableDataAccessException.java index 5c30bd6bafa..64e940b5223 100644 --- a/spring-tx/src/main/java/org/springframework/dao/RecoverableDataAccessException.java +++ b/spring-tx/src/main/java/org/springframework/dao/RecoverableDataAccessException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessException.java index 94f31e0bfb6..699d2eca64b 100644 --- a/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessException.java +++ b/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessResourceException.java b/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessResourceException.java index 032abe67f44..592bf859a4d 100644 --- a/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessResourceException.java +++ b/spring-tx/src/main/java/org/springframework/dao/TransientDataAccessResourceException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/TypeMismatchDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/TypeMismatchDataAccessException.java index 875db8c3194..fe93de4cae4 100644 --- a/spring-tx/src/main/java/org/springframework/dao/TypeMismatchDataAccessException.java +++ b/spring-tx/src/main/java/org/springframework/dao/TypeMismatchDataAccessException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/UncategorizedDataAccessException.java b/spring-tx/src/main/java/org/springframework/dao/UncategorizedDataAccessException.java index 0b5d532c33c..69d5e94cc2f 100644 --- a/spring-tx/src/main/java/org/springframework/dao/UncategorizedDataAccessException.java +++ b/spring-tx/src/main/java/org/springframework/dao/UncategorizedDataAccessException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java b/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java index 19b5cba0a19..2b8358d678c 100644 --- a/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java +++ b/spring-tx/src/main/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java b/spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java index 4310c88371d..bdaddb8c55a 100644 --- a/spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java +++ b/spring-tx/src/main/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java b/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java index cc78d086e5a..4b5f6865c7d 100644 --- a/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java +++ b/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/support/DataAccessUtils.java b/spring-tx/src/main/java/org/springframework/dao/support/DataAccessUtils.java index cbfeceb996f..d4c086695ec 100644 --- a/spring-tx/src/main/java/org/springframework/dao/support/DataAccessUtils.java +++ b/spring-tx/src/main/java/org/springframework/dao/support/DataAccessUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java b/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java index 5cd145bb303..9cf7432c435 100644 --- a/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java +++ b/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslationInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslator.java b/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslator.java index b86d256a627..0c660ce0d6e 100644 --- a/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslator.java +++ b/spring-tx/src/main/java/org/springframework/dao/support/PersistenceExceptionTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java b/spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java index 71025dbf6f7..d211087b372 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java b/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java index d977f44576d..252a5255e64 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java b/spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java index 8ecf30261d3..e6b66461463 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java b/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java index 14185f79200..7e3200a3d5f 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java b/spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java index 8eefbd7cc86..d0256cb1c76 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java index e2061896c88..aa7d38943d9 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java index d9860a38bac..482a8dc0c92 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java index 693345dc629..d6ad87f02b7 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java index 532f12c007a..78f3b29a716 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java index 24337ad0c0e..f01ac831008 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java index 2fb9c1378ee..bf1808db812 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/NotSupportedRecordFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java index e9d43f4094c..fe391c88056 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/SingleConnectionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java b/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java index fed1e44a994..f5b2b5d0ec4 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/connection/TransactionAwareConnectionFactoryProxy.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java index 11a9c147c95..d55909ebe07 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/CciTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java index 70ff9111e94..df138bdc0ae 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/ConnectionCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java index 969a90115d8..7145d36b001 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/InteractionCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java index fea0d11ac9d..f19f6ac2c3d 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordCreator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java index 8dbfd91b21b..51ec87b2656 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/RecordExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java index 107391e0a24..65cf5652870 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java index f69c1137ac0..982b43064b9 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/core/support/CommAreaRecord.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingCommAreaOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingCommAreaOperation.java index 638ae9d23aa..79612bea39c 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingCommAreaOperation.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingCommAreaOperation.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java index 006ef3b8b39..413a034ae72 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/object/MappingRecordOperation.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/cci/object/SimpleRecordOperation.java b/spring-tx/src/main/java/org/springframework/jca/cci/object/SimpleRecordOperation.java index b7ad70d01c3..efbec34e4a7 100644 --- a/spring-tx/src/main/java/org/springframework/jca/cci/object/SimpleRecordOperation.java +++ b/spring-tx/src/main/java/org/springframework/jca/cci/object/SimpleRecordOperation.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAware.java b/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAware.java index d256310dfef..326b7f977c8 100644 --- a/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAware.java +++ b/spring-tx/src/main/java/org/springframework/jca/context/BootstrapContextAware.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java b/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java index 8e91d93394f..25bac956685 100644 --- a/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java +++ b/spring-tx/src/main/java/org/springframework/jca/context/SpringContextResourceAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java b/spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java index df965959bc6..01f27f23ffe 100644 --- a/spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java +++ b/spring-tx/src/main/java/org/springframework/jca/endpoint/AbstractMessageEndpointFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java index 731467a77c0..fac5eba990c 100644 --- a/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java +++ b/spring-tx/src/main/java/org/springframework/jca/endpoint/GenericMessageEndpointFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java b/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java index ac6ed06d323..d26fea73320 100644 --- a/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java +++ b/spring-tx/src/main/java/org/springframework/jca/support/SimpleBootstrapContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/CannotCreateTransactionException.java b/spring-tx/src/main/java/org/springframework/transaction/CannotCreateTransactionException.java index 76a84a53414..6e6fde8405b 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/CannotCreateTransactionException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/CannotCreateTransactionException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java b/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java index bd4910f1aef..1b60ca1606d 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/HeuristicCompletionException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/IllegalTransactionStateException.java b/spring-tx/src/main/java/org/springframework/transaction/IllegalTransactionStateException.java index c234ec1a185..b5380bd9d1f 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/IllegalTransactionStateException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/IllegalTransactionStateException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/InvalidIsolationLevelException.java b/spring-tx/src/main/java/org/springframework/transaction/InvalidIsolationLevelException.java index 5db61b37409..196caa86d23 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/InvalidIsolationLevelException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/InvalidIsolationLevelException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java b/spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java index 2e483881520..bf6f4c39677 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/InvalidTimeoutException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/NestedTransactionNotSupportedException.java b/spring-tx/src/main/java/org/springframework/transaction/NestedTransactionNotSupportedException.java index a237550a017..e4831a66603 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/NestedTransactionNotSupportedException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/NestedTransactionNotSupportedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/NoTransactionException.java b/spring-tx/src/main/java/org/springframework/transaction/NoTransactionException.java index 57ebb3804b3..40c34d52a6c 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/NoTransactionException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/NoTransactionException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/PlatformTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/PlatformTransactionManager.java index 406efe17ac9..2c2030f6bc9 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/PlatformTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/PlatformTransactionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/SavepointManager.java b/spring-tx/src/main/java/org/springframework/transaction/SavepointManager.java index 1d5a102d42c..56cb13e474d 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/SavepointManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/SavepointManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java index df7afdc1c81..5eda8a28d26 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java +++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionException.java index 8facfc5a6c2..7bb67d4780c 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/TransactionException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionSuspensionNotSupportedException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionSuspensionNotSupportedException.java index f3274c2e920..7076fe0f5f0 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/TransactionSuspensionNotSupportedException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionSuspensionNotSupportedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java index 88713688991..43518ee9306 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionSystemException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionTimedOutException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionTimedOutException.java index e98eb1c4f43..e8e9a351fe9 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/TransactionTimedOutException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionTimedOutException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java b/spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java index 5c757474a07..8a6c2e4d463 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/TransactionUsageException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/UnexpectedRollbackException.java b/spring-tx/src/main/java/org/springframework/transaction/UnexpectedRollbackException.java index 1a48ca044ec..03b4a28af27 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/UnexpectedRollbackException.java +++ b/spring-tx/src/main/java/org/springframework/transaction/UnexpectedRollbackException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/Isolation.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Isolation.java index 457eb87d47f..e574705c692 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Isolation.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Isolation.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java index 3a140590d58..707207574e3 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Propagation.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionAnnotationParser.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionAnnotationParser.java index e6722d469c3..cc07a9ae16b 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionAnnotationParser.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionAnnotationParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java index 312169b6fdc..856d24ace55 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/config/AnnotationDrivenBeanDefinitionParser.java b/spring-tx/src/main/java/org/springframework/transaction/config/AnnotationDrivenBeanDefinitionParser.java index 4c897e2fd6c..07bea12ee54 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/config/AnnotationDrivenBeanDefinitionParser.java +++ b/spring-tx/src/main/java/org/springframework/transaction/config/AnnotationDrivenBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/config/TxNamespaceHandler.java b/spring-tx/src/main/java/org/springframework/transaction/config/TxNamespaceHandler.java index bf4647cb220..28736d0177e 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/config/TxNamespaceHandler.java +++ b/spring-tx/src/main/java/org/springframework/transaction/config/TxNamespaceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java index 514dd625e6c..551eb287daa 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/BeanFactoryTransactionAttributeSourceAdvisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java index 8837a05eb4a..1deed0c7205 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/CompositeTransactionAttributeSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/DefaultTransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/DefaultTransactionAttribute.java index eea06e27065..f505b8bf5cd 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/DefaultTransactionAttribute.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/DefaultTransactionAttribute.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java index c4ef1953f5c..32c66e68ddf 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/DelegatingTransactionAttribute.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java index fbf824f5c54..b67ed6982b0 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java index c6745d9d9b9..c71f01d6815 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java index 9d52c141b5b..8fa8be22a3d 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NameMatchTransactionAttributeSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java index 2588187ddd8..f6748ef890e 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/NoRollbackRuleAttribute.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java index 5e7021b0f2f..0f605308add 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java index eeb0046baba..0d45ed9b9c4 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttribute.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttribute.java index 9f6a0bddfdf..debf7a9523d 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttribute.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttribute.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeEditor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeEditor.java index 055d42c797b..a7d2abdfede 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeEditor.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java index f253c2a8b56..a5a632411da 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java index 31c739cbd7b..21e8e92baf7 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java index 53f78b9a535..4b9314edf70 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourcePointcut.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java index 75133366d9d..11f72759a7f 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java index d60cf2f8aff..fded50e1675 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java +++ b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaAfterCompletionSynchronization.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java index 47e6773bd4f..35f30be7f7c 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java b/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java index 2026ada3bae..e4ecffce744 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java +++ b/spring-tx/src/main/java/org/springframework/transaction/jta/SpringJtaSynchronizationAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/TransactionFactory.java b/spring-tx/src/main/java/org/springframework/transaction/jta/TransactionFactory.java index 50d4cf7c386..aac7f91e5e3 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/jta/TransactionFactory.java +++ b/spring-tx/src/main/java/org/springframework/transaction/jta/TransactionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java index 6381bea66d4..d493e950b47 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/jta/WebLogicJtaTransactionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java index d622ff97998..de51a5425c5 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/jta/WebSphereUowTransactionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java index 6d0f16f8eda..ef30ce0af4a 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractTransactionStatus.java b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractTransactionStatus.java index 3b4a4c10da3..1e2f4455c9c 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/AbstractTransactionStatus.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/AbstractTransactionStatus.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/CallbackPreferringPlatformTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/CallbackPreferringPlatformTransactionManager.java index f3d62a4b827..6a1f9decf02 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/CallbackPreferringPlatformTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/CallbackPreferringPlatformTransactionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java index b7e77b6f608..f1a63abc119 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java index 8b730722670..9569dc1098d 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionStatus.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java b/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java index 30bfd66a02e..4bc84fb3927 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/DelegatingTransactionDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSynchronization.java b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSynchronization.java index 7dab8d56188..b9e668fc572 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSynchronization.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceHolderSynchronization.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceTransactionManager.java index c2188a108f1..760d7b69515 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/ResourceTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/ResourceTransactionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java b/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java index 85be9f8bca6..fd6f184304e 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/SimpleTransactionStatus.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallback.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallback.java index 0ba452e84f2..98841f3cbe9 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallback.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallbackWithoutResult.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallbackWithoutResult.java index 0083f2dd245..e3168e1b7bc 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallbackWithoutResult.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionCallbackWithoutResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionOperations.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionOperations.java index 1d576966b57..bc1ffbc820d 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionOperations.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionOperations.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronization.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronization.java index c9600ca0a11..bfb35698bcb 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronization.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronization.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java index c18ee985155..7b203821049 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java index f7f429a7982..b31eab96af0 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java index 8d7df115f91..47d8319af68 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/beans/Colour.java b/spring-tx/src/test/java/org/springframework/beans/Colour.java index 17fd24fec79..a992a2ebfc6 100644 --- a/spring-tx/src/test/java/org/springframework/beans/Colour.java +++ b/spring-tx/src/test/java/org/springframework/beans/Colour.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java index 8ada7848fa9..c5360de5316 100644 --- a/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/INestedTestBean.java index c5c4ed5e679..e0ae5f20a3f 100644 --- a/spring-tx/src/test/java/org/springframework/beans/INestedTestBean.java +++ b/spring-tx/src/test/java/org/springframework/beans/INestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/beans/IOther.java b/spring-tx/src/test/java/org/springframework/beans/IOther.java index 6a8f74187cb..d7fb346185a 100644 --- a/spring-tx/src/test/java/org/springframework/beans/IOther.java +++ b/spring-tx/src/test/java/org/springframework/beans/IOther.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java index e136978f9e6..412891c439b 100644 --- a/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/beans/TestBean.java b/spring-tx/src/test/java/org/springframework/beans/TestBean.java index 7a27cf0894e..6d71de75764 100644 --- a/spring-tx/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-tx/src/test/java/org/springframework/beans/TestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java b/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java index c1be3a57455..ea1ad34afd6 100644 --- a/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java +++ b/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java index 9142a73b5bc..c7c1970cc35 100644 --- a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java +++ b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationAdvisorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java index 2bd949d3ad1..fb6259de932 100644 --- a/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java +++ b/spring-tx/src/test/java/org/springframework/dao/annotation/PersistenceExceptionTranslationPostProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslatorTests.java b/spring-tx/src/test/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslatorTests.java index 5cd19f8f02d..9998d9af65a 100644 --- a/spring-tx/src/test/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslatorTests.java +++ b/spring-tx/src/test/java/org/springframework/dao/support/ChainedPersistenceExceptionTranslatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java b/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java index bdab740fbaa..74953d4d370 100644 --- a/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java +++ b/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java index ce88bbf03d0..2038b8ecc07 100644 --- a/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java +++ b/spring-tx/src/test/java/org/springframework/jca/cci/CciLocalTransactionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java index f8a72506215..ddbdc800693 100644 --- a/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java +++ b/spring-tx/src/test/java/org/springframework/jca/cci/CciTemplateTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java b/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java index a7e40c6bf4b..4e5a3281d49 100644 --- a/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java +++ b/spring-tx/src/test/java/org/springframework/jca/cci/EisOperationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java index 9b3d10470da..71736866063 100644 --- a/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java +++ b/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java index 5ab0d313777..4e1641b2cd8 100644 --- a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java +++ b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java index 32908a306aa..883db7bfd3f 100644 --- a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java +++ b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java index 02996e490f8..b1862dd8937 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java +++ b/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java index ecacf398aae..11566aeee71 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java index b2522b08a87..8bb61812009 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java index 7c250610542..df1604401f1 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java +++ b/spring-tx/src/test/java/org/springframework/transaction/MockCallbackPreferringTransactionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java b/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java index de79edcd747..e2066af4d92 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java +++ b/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java index 579e1a815f3..67f965a6502 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java +++ b/spring-tx/src/test/java/org/springframework/transaction/TestTransactionManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java b/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java index e29ecca39fb..2e42257b422 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java index e76730f727c..38c7e20d224 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java index 72f1bdac10a..7808f43b991 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java index 16f29f90f6d..7caafe92c21 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java index a38057e1086..21c5f5374fb 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java index 564887d4248..0f0deca8663 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java index 11eff8c216a..417859b43ec 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java b/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java index 5768b1bd9b7..d6a79128d0f 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/config/TransactionalService.java b/spring-tx/src/test/java/org/springframework/transaction/config/TransactionalService.java index 4ae36b3c1dd..f7ecfb89c09 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/config/TransactionalService.java +++ b/spring-tx/src/test/java/org/springframework/transaction/config/TransactionalService.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java index ffad95f811f..7a818f701be 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/ImplementsNoInterfaces.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/ImplementsNoInterfaces.java index 75e100602f2..302026a7aaa 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/ImplementsNoInterfaces.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/ImplementsNoInterfaces.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java index 7c2eed8ac97..e21ded175d5 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/MapTransactionAttributeSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/MyRuntimeException.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/MyRuntimeException.java index 1e804de1321..4778f5925d9 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/MyRuntimeException.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/MyRuntimeException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java index a6cc819e628..0970132a940 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/PlatformTransactionManagerFacade.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java index d1884954fd7..0a45d64be46 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/RollbackRuleTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeEditorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeEditorTests.java index f32779ef369..327675aaa24 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeEditorTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeEditorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisorTests.java index 81364f12b41..bfd9071cdc8 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisorTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceAdvisorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java index ff21ee0a8bc..5aa47465428 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java index a9f3775b948..9b41bc3997f 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java b/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java index 7eaad371bfe..aed9bdb27f8 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java +++ b/spring-tx/src/test/java/org/springframework/transaction/jta/MockUOWManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java index 5f9d5ba6309..12c70ed91c2 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java b/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java index 7f699d8e909..99f791a5328 100644 --- a/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java +++ b/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/http/MediaTypeEditor.java b/spring-web/src/main/java/org/springframework/http/MediaTypeEditor.java index 7c1bfcfdc8e..eac003d0c84 100644 --- a/spring-web/src/main/java/org/springframework/http/MediaTypeEditor.java +++ b/spring-web/src/main/java/org/springframework/http/MediaTypeEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequest.java index 55a3f5188d1..7137365507d 100644 --- a/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/ClientHttpRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java index ab13bc68c77..3e833d44590 100644 --- a/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java b/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java index de141afc41c..9d397604799 100644 --- a/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/client/InterceptingClientHttpRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/http/converter/AbstractHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/AbstractHttpMessageConverter.java index c95a20c4307..680225e928a 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/AbstractHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/AbstractHttpMessageConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/http/converter/ByteArrayHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/ByteArrayHttpMessageConverter.java index 23543c384f8..f1ddc0080f7 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/ByteArrayHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/ByteArrayHttpMessageConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/http/converter/HttpMessageConversionException.java b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageConversionException.java index 600082bfe43..a27bef02c46 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/HttpMessageConversionException.java +++ b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageConversionException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotReadableException.java b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotReadableException.java index 4b7b747d2f4..6271a198da5 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotReadableException.java +++ b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotReadableException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotWritableException.java b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotWritableException.java index 5c2cebb357c..d8f8f33f973 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotWritableException.java +++ b/spring-web/src/main/java/org/springframework/http/converter/HttpMessageNotWritableException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java index ae0c080131a..189bf9b2188 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java index 1aee1d6a05b..87cddf189fa 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/xml/XmlAwareFormHttpMessageConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java index 9b819edc8df..28b6bd50876 100644 --- a/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java +++ b/spring-web/src/main/java/org/springframework/remoting/caucho/BurlapClientInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java index e02fb1e2308..ff89f1bb86f 100644 --- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java +++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianClientInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java index 55ffc30c638..5aba1cb1544 100644 --- a/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java +++ b/spring-web/src/main/java/org/springframework/remoting/caucho/HessianExporter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java index 7dd174260bc..5a024973eae 100644 --- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java +++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/AbstractHttpInvokerRequestExecutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration.java index 2177d0d297a..7e894a53e44 100644 --- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration.java +++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java index 7f6c8eeb640..18668f53004 100644 --- a/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java +++ b/spring-web/src/main/java/org/springframework/remoting/httpinvoker/HttpInvokerClientInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortClientInterceptor.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortClientInterceptor.java index 7a754e198b8..373b301dc7f 100644 --- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortClientInterceptor.java +++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortClientInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java index 9f6a53ef8ba..610168c678e 100644 --- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java +++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcPortProxyFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java index 1242cad1218..9087aaf2095 100644 --- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java +++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/JaxRpcSoapFaultException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactory.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactory.java index f6ef74740fc..9713e21d213 100644 --- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactory.java +++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactoryBean.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactoryBean.java index 4a27d8b7a4d..35d8afa8c57 100644 --- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactoryBean.java +++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/LocalJaxRpcServiceFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java index 1e642e37553..4a3d34185b3 100644 --- a/spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java +++ b/spring-web/src/main/java/org/springframework/remoting/jaxrpc/ServletEndpointSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java index cf2cb7d2216..65ff59c8150 100644 --- a/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java +++ b/spring-web/src/main/java/org/springframework/remoting/jaxws/JaxWsSoapFaultException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeException.java b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeException.java index b9f2357dcaf..f41a2b8f92c 100644 --- a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeException.java +++ b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotAcceptableException.java b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotAcceptableException.java index 2c015834c3b..0434e6174bc 100644 --- a/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotAcceptableException.java +++ b/spring-web/src/main/java/org/springframework/web/HttpMediaTypeNotAcceptableException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java b/spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java index 1f76983228c..f76aad06fb7 100644 --- a/spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java +++ b/spring-web/src/main/java/org/springframework/web/HttpRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java b/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java index 97be2859205..a70b37386c3 100644 --- a/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java +++ b/spring-web/src/main/java/org/springframework/web/HttpRequestMethodNotSupportedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java b/spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java index 84880225b54..448bd4eddf6 100644 --- a/spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java +++ b/spring-web/src/main/java/org/springframework/web/HttpSessionRequiredException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java b/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java index 10863f82fc6..67144395e29 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java +++ b/spring-web/src/main/java/org/springframework/web/bind/EscapedErrors.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java b/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java index 71619890579..4d685333ca9 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java +++ b/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java b/spring-web/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java index d27a5dd6286..24a69ad9eb8 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java +++ b/spring-web/src/main/java/org/springframework/web/bind/MissingServletRequestParameterException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestBindingException.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestBindingException.java index 2c28431a4cf..240f29d8c2e 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestBindingException.java +++ b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestBindingException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java index 83c0660e5a9..2b59850fbc2 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java +++ b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestDataBinder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java index febc333f2b7..fa5d2c6746b 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java +++ b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestParameterPropertyValues.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestUtils.java b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestUtils.java index 1bb0351ea66..0745e9494f9 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/ServletRequestUtils.java +++ b/spring-web/src/main/java/org/springframework/web/bind/ServletRequestUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java b/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java index 8adf208b32c..4adf614f9a2 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java +++ b/spring-web/src/main/java/org/springframework/web/bind/UnsatisfiedServletRequestParameterException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java b/spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java index d48e3d611df..175750c027d 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java +++ b/spring-web/src/main/java/org/springframework/web/bind/WebDataBinder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java index a071859af9d..7f469a43185 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/CookieValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java index 760fd840ff2..90191f1d8df 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/InitBinder.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/InitBinder.java index 3608d9c7e45..2f6096168e3 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/InitBinder.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/InitBinder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/MatrixVariable.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/MatrixVariable.java index 73b1ab56823..1f29473baa5 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/MatrixVariable.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/MatrixVariable.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.java index 24ade7d0fd1..9d094d75d32 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java index 0782b22a67c..43032ba5981 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestParam.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java index a6e90fb981a..a299313dce3 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestPart.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttributes.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttributes.java index 6ea979dea55..04d7d8cb092 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttributes.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/SessionAttributes.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/ValueConstants.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/ValueConstants.java index 3d2717c4c1c..fda9ae23dd3 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/ValueConstants.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/ValueConstants.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvocationException.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvocationException.java index b6c07ee59af..98ad9992b3e 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvocationException.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvocationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java index f9ea11e44ba..4e77885aba6 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/support/HandlerMethodInvoker.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java b/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java index 92b78c17213..bab588d5a48 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java +++ b/spring-web/src/main/java/org/springframework/web/bind/support/DefaultDataBinderFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/SessionAttributeStore.java b/spring-web/src/main/java/org/springframework/web/bind/support/SessionAttributeStore.java index db5ce0aef9d..47a9b103c73 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/support/SessionAttributeStore.java +++ b/spring-web/src/main/java/org/springframework/web/bind/support/SessionAttributeStore.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/SimpleSessionStatus.java b/spring-web/src/main/java/org/springframework/web/bind/support/SimpleSessionStatus.java index 7eac9e58e92..f9d1d7c1026 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/support/SimpleSessionStatus.java +++ b/spring-web/src/main/java/org/springframework/web/bind/support/SimpleSessionStatus.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/WebArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/bind/support/WebArgumentResolver.java index 6faa10fddc0..143edb28e45 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/support/WebArgumentResolver.java +++ b/spring-web/src/main/java/org/springframework/web/bind/support/WebArgumentResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/WebDataBinderFactory.java b/spring-web/src/main/java/org/springframework/web/bind/support/WebDataBinderFactory.java index d10d7c81dd6..03f13d86ff6 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/support/WebDataBinderFactory.java +++ b/spring-web/src/main/java/org/springframework/web/bind/support/WebDataBinderFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java b/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java index 3b14991df2b..bc870ea5d55 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java +++ b/spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java index 31bc57888ce..b4232ff47c4 100644 --- a/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java +++ b/spring-web/src/main/java/org/springframework/web/client/HttpMessageConverterExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/client/ResponseErrorHandler.java b/spring-web/src/main/java/org/springframework/web/client/ResponseErrorHandler.java index de03dc36698..39ddfe4dd14 100644 --- a/spring-web/src/main/java/org/springframework/web/client/ResponseErrorHandler.java +++ b/spring-web/src/main/java/org/springframework/web/client/ResponseErrorHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java b/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java index 5529a0dbb06..b9585787d86 100644 --- a/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java +++ b/spring-web/src/main/java/org/springframework/web/context/WebApplicationContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java b/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java index e65e7a75056..155eadeb7ea 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java b/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java index 46dc4234380..27202c36bec 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/DestructionCallbackBindingListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java b/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java index 42615d3401a..8570211fa31 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/FacesRequestAttributes.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java index 839c13b5a67..f921d2a5417 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/FacesWebRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/request/NativeWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/NativeWebRequest.java index 820f57a2a11..2b0df14d95a 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/NativeWebRequest.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/NativeWebRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/request/RequestAttributes.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestAttributes.java index b7c201f7fc0..8286de1bebe 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/RequestAttributes.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/RequestAttributes.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java index 20fe615e23a..8cf39688a38 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/request/RequestContextListener.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextListener.java index 207e6a6c26d..6c8ff6de889 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/RequestContextListener.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/RequestContextListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java b/spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java index a92085dfb7b..b95814a00e5 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/RequestScope.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java b/spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java index dedc298753d..19bcb0d7725 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/SessionScope.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/request/WebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/WebRequest.java index f45ef255aa7..cce42d4c5fa 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/WebRequest.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/WebRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/request/WebRequestInterceptor.java b/spring-web/src/main/java/org/springframework/web/context/request/WebRequestInterceptor.java index 2ffa1e99fef..1a5089bd969 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/WebRequestInterceptor.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/WebRequestInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java index c01de6e6fc0..34df1b1de19 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/HttpRequestHandlerServlet.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java b/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java index 685a0571429..343aad71c5d 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/RequestHandledEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java index fec95de6ff7..6af3d808634 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextParameterFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java index 97a9e86073d..ea6cda9767c 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertyPlaceholderConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertySource.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertySource.java index 4dc22c2449a..d5c3cdbf1c0 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertySource.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextPropertySource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java index e1e54b6b218..8ce1a653920 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextResourcePatternResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java index 59b043910f8..180645580f9 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletContextScope.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java b/spring-web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java index 37e5d2519d5..a2eca47b119 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/ServletRequestHandledEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/support/SpringBeanAutowiringSupport.java b/spring-web/src/main/java/org/springframework/web/context/support/SpringBeanAutowiringSupport.java index 7a64224ce08..15af5f435de 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/SpringBeanAutowiringSupport.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/SpringBeanAutowiringSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java b/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java index a0ef9e29fc7..9aa2547d62f 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/WebApplicationObjectSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/filter/CompositeFilter.java b/spring-web/src/main/java/org/springframework/web/filter/CompositeFilter.java index b85cb1e23e1..a3551ff7671 100644 --- a/spring-web/src/main/java/org/springframework/web/filter/CompositeFilter.java +++ b/spring-web/src/main/java/org/springframework/web/filter/CompositeFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java b/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java index 9864566193c..816a52c3c16 100644 --- a/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java +++ b/spring-web/src/main/java/org/springframework/web/filter/GenericFilterBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java b/spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java index 45a76d97a06..5d9ea1a0d39 100644 --- a/spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java +++ b/spring-web/src/main/java/org/springframework/web/filter/HiddenHttpMethodFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java index 84c41caa592..d554e05cf59 100644 --- a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java +++ b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingPhaseListenerMulticaster.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java index f044157f48f..4b3b4858bfe 100644 --- a/spring-web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java +++ b/spring-web/src/main/java/org/springframework/web/jsf/DelegatingVariableResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/jsf/FacesContextUtils.java b/spring-web/src/main/java/org/springframework/web/jsf/FacesContextUtils.java index eb9edbaf162..3c2519f5a6d 100644 --- a/spring-web/src/main/java/org/springframework/web/jsf/FacesContextUtils.java +++ b/spring-web/src/main/java/org/springframework/web/jsf/FacesContextUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java index 7dcaf3ebfca..949f0042e4f 100644 --- a/spring-web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java +++ b/spring-web/src/main/java/org/springframework/web/jsf/WebApplicationContextVariableResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java index cb4af40c706..be9f6888af4 100644 --- a/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java +++ b/spring-web/src/main/java/org/springframework/web/jsf/el/SpringBeanFacesELResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java b/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java index f1ae54882d3..712e50f341c 100644 --- a/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java +++ b/spring-web/src/main/java/org/springframework/web/jsf/el/WebApplicationContextFacesELResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/method/HandlerMethodSelector.java b/spring-web/src/main/java/org/springframework/web/method/HandlerMethodSelector.java index c0ea3fc3450..4d93eff7f2c 100644 --- a/spring-web/src/main/java/org/springframework/web/method/HandlerMethodSelector.java +++ b/spring-web/src/main/java/org/springframework/web/method/HandlerMethodSelector.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java index 4f25d7633b9..07c44b32a88 100644 --- a/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java +++ b/spring-web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java index 083e6fe5e54..92a2aa88d13 100644 --- a/spring-web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java +++ b/spring-web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/InitBinderDataBinderFactory.java b/spring-web/src/main/java/org/springframework/web/method/annotation/InitBinderDataBinderFactory.java index c7520687e10..b00f6e46d82 100644 --- a/spring-web/src/main/java/org/springframework/web/method/annotation/InitBinderDataBinderFactory.java +++ b/spring-web/src/main/java/org/springframework/web/method/annotation/InitBinderDataBinderFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/ModelFactory.java b/spring-web/src/main/java/org/springframework/web/method/annotation/ModelFactory.java index 5cac3e8eb6a..ee5672cfa44 100644 --- a/spring-web/src/main/java/org/springframework/web/method/annotation/ModelFactory.java +++ b/spring-web/src/main/java/org/springframework/web/method/annotation/ModelFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java index 57a622118e5..e7b46bdb6a9 100644 --- a/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java +++ b/spring-web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolver.java b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolver.java index 79a49c1cad9..e2a7b7d7982 100644 --- a/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolver.java +++ b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodArgumentResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandler.java b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandler.java index 4b77ba622ec..d97fe876d19 100644 --- a/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandler.java +++ b/spring-web/src/main/java/org/springframework/web/method/support/HandlerMethodReturnValueHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MaxUploadSizeExceededException.java b/spring-web/src/main/java/org/springframework/web/multipart/MaxUploadSizeExceededException.java index 94aa67671e6..36eb573b57e 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/MaxUploadSizeExceededException.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/MaxUploadSizeExceededException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartException.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartException.java index 6aec889ab6a..c4a74bdd0de 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartException.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java index 632e9fb4720..86f73591a47 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartRequest.java index ed1ce75a97b..f24bb2207de 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartRequest.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java index 93e0ee5b65e..3fd05f91518 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/MultipartResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java index c50df92d4b9..e05e110a7d8 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsFileUploadSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java index 677613a61ad..ae9ae6ecf10 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java index 92e20f3044f..25f743befc9 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/commons/CommonsMultipartResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java index ab995b112fd..ee0a9b7f65a 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/support/DefaultMultipartHttpServletRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java b/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java index ad002782ae4..b78ad775f91 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java b/spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java index 2d8c260ef65..1329c782320 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java b/spring-web/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java index 7d8e8dff17a..9b6b909283e 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/support/StringMultipartFileEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java index 3d7c91cee07..0fc4ee78e8f 100644 --- a/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java +++ b/spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java b/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java index 23e9a81f669..2c93058c5b9 100644 --- a/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java +++ b/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java b/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java index cb0367c2e23..ab7a7101478 100644 --- a/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java +++ b/spring-web/src/main/java/org/springframework/web/util/HttpSessionMutexListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java b/spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java index 0d0e7de648a..bf0ed911b4a 100644 --- a/spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java +++ b/spring-web/src/main/java/org/springframework/web/util/IntrospectorCleanupListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/util/Log4jConfigListener.java b/spring-web/src/main/java/org/springframework/web/util/Log4jConfigListener.java index 6ee0c086269..0ca9e35d32b 100644 --- a/spring-web/src/main/java/org/springframework/web/util/Log4jConfigListener.java +++ b/spring-web/src/main/java/org/springframework/web/util/Log4jConfigListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/util/NestedServletException.java b/spring-web/src/main/java/org/springframework/web/util/NestedServletException.java index 81d3e0f5971..adeddf78afb 100644 --- a/spring-web/src/main/java/org/springframework/web/util/NestedServletException.java +++ b/spring-web/src/main/java/org/springframework/web/util/NestedServletException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/util/TagUtils.java b/spring-web/src/main/java/org/springframework/web/util/TagUtils.java index cf8d45148cf..ee9daf8feaa 100644 --- a/spring-web/src/main/java/org/springframework/web/util/TagUtils.java +++ b/spring-web/src/main/java/org/springframework/web/util/TagUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java index 6682a0a0098..a8699042e97 100644 --- a/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java +++ b/spring-web/src/main/java/org/springframework/web/util/UriTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java b/spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java index 437216a9692..832ea24d31a 100644 --- a/spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java +++ b/spring-web/src/main/java/org/springframework/web/util/WebAppRootListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/main/java/org/springframework/web/util/WebUtils.java b/spring-web/src/main/java/org/springframework/web/util/WebUtils.java index 0a901294a09..c7acf095029 100644 --- a/spring-web/src/main/java/org/springframework/web/util/WebUtils.java +++ b/spring-web/src/main/java/org/springframework/web/util/WebUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/beans/Colour.java b/spring-web/src/test/java/org/springframework/beans/Colour.java index 17fd24fec79..a992a2ebfc6 100644 --- a/spring-web/src/test/java/org/springframework/beans/Colour.java +++ b/spring-web/src/test/java/org/springframework/beans/Colour.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java index 8ada7848fa9..c5360de5316 100644 --- a/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-web/src/test/java/org/springframework/beans/INestedTestBean.java index c5c4ed5e679..e0ae5f20a3f 100644 --- a/spring-web/src/test/java/org/springframework/beans/INestedTestBean.java +++ b/spring-web/src/test/java/org/springframework/beans/INestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/beans/IOther.java b/spring-web/src/test/java/org/springframework/beans/IOther.java index 6a8f74187cb..d7fb346185a 100644 --- a/spring-web/src/test/java/org/springframework/beans/IOther.java +++ b/spring-web/src/test/java/org/springframework/beans/IOther.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java index e136978f9e6..412891c439b 100644 --- a/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/beans/Person.java b/spring-web/src/test/java/org/springframework/beans/Person.java index a78998ad5d4..7c66f4b451b 100644 --- a/spring-web/src/test/java/org/springframework/beans/Person.java +++ b/spring-web/src/test/java/org/springframework/beans/Person.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java index 9a2a3193df2..dbe365f4937 100644 --- a/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java +++ b/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/beans/TestBean.java b/spring-web/src/test/java/org/springframework/beans/TestBean.java index e553f31f5b7..1fc36aba374 100644 --- a/spring-web/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-web/src/test/java/org/springframework/beans/TestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java index f3d6eedefe1..6fc7e36aa90 100644 --- a/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java +++ b/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/core/task/MockRunnable.java b/spring-web/src/test/java/org/springframework/core/task/MockRunnable.java index a826a9c2076..3ee1f452dac 100644 --- a/spring-web/src/test/java/org/springframework/core/task/MockRunnable.java +++ b/spring-web/src/test/java/org/springframework/core/task/MockRunnable.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java b/spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java index 43dc47e3c6f..18412ce33cc 100644 --- a/spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java +++ b/spring-web/src/test/java/org/springframework/http/MockHttpInputMessage.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java b/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java index 75f5db49b25..c8dfbfc079b 100644 --- a/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java +++ b/spring-web/src/test/java/org/springframework/http/MockHttpOutputMessage.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java b/spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java index 113f3d4910a..83add2ceaff 100644 --- a/spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java +++ b/spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java index 6adeed5ecab..ccb91450a4a 100644 --- a/spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/StreamingSimpleHttpRequestFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java index 7f1110d6efe..2344269b634 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/FormHttpMessageConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java index 803bd80d240..d29b2b71298 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/HttpMessageConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java index 3f5171390d4..2af8ea38167 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/StringHttpMessageConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java index e2545123fe1..2f12bc988b7 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java +++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java index a273cfffab0..afafe13a36a 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java b/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java index 17369efaa5d..6617a787d52 100644 --- a/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java +++ b/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java index 6fec403c7e4..de4b1e9f14f 100644 --- a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java +++ b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderNotFoundException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java index 4cd69cbb416..b109cdcd6da 100644 --- a/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java +++ b/spring-web/src/test/java/org/springframework/remoting/jaxws/OrderServiceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java b/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java index 8c8686df691..a02fcae95b9 100644 --- a/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java +++ b/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java b/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java index d55954f32e2..200546dd020 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/CompositeFilterTests.java @@ -1,6 +1,6 @@ /* * Copyright 2004, 2005 Acegi Technology Pty Limited - * Copyright 2006-2012 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java b/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java index 69df4dd5f1d..5af02f2cbe3 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java +++ b/spring-web/src/test/java/org/springframework/web/filter/DelegatingFilterProxyTests.java @@ -1,6 +1,6 @@ /* * Copyright 2004, 2005 Acegi Technology Pty Limited - * Copyright 2006-2012 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java b/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java index d1af1f1fcc0..2793790da6d 100644 --- a/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java +++ b/spring-web/src/test/java/org/springframework/web/filter/HiddenHttpMethodFilterTest.java @@ -1,5 +1,5 @@ /* - * Copyright ${YEAR} the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java index 0138ccd067e..d74bf8a6ae9 100644 --- a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java +++ b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingPhaseListenerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java index 0eefcba0c7e..ad49f664d11 100644 --- a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java b/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java index 7faee579e7c..485f1a757ef 100644 --- a/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java +++ b/spring-web/src/test/java/org/springframework/web/jsf/MockFacesContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java b/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java index 0ab7d46b39c..a9e9b97e482 100644 --- a/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java +++ b/spring-web/src/test/java/org/springframework/web/jsf/MockLifecycle.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java index 4ac6a733487..ba216f20bf8 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/ExceptionHandlerMethodResolverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodArgumentResolverCompositeTests.java b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodArgumentResolverCompositeTests.java index 4b700225e8e..f93d915ecab 100644 --- a/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodArgumentResolverCompositeTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodArgumentResolverCompositeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java index 9acab34ec60..2fcd856e62d 100644 --- a/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/support/HandlerMethodReturnValueHandlerCompositeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java b/spring-web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java index bd0c80565c3..3e09c5e523f 100644 --- a/spring-web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/support/ModelAndViewContainerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java b/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java index 918894fb5fd..2110548d81a 100644 --- a/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java +++ b/spring-web/src/test/java/org/springframework/web/method/support/StubArgumentResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java b/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java index 0320b886129..ca63af02366 100644 --- a/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java +++ b/spring-web/src/test/java/org/springframework/web/method/support/StubReturnValueHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java b/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java index d2eab76bc3c..1baf35219cd 100644 --- a/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java +++ b/spring-web/src/test/java/org/springframework/web/util/MockLog4jAppender.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java index 3803551a63e..9fb45c609a5 100644 --- a/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/TagUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java index 0439504c8c5..29585bb05d5 100644 --- a/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java +++ b/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java index a7763c7a350..13b981b9415 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/GenericPortletBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java index e1aa117b1c7..9785904d11f 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExceptionResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExceptionResolver.java index b3a1a4ecc1f..c43b8892156 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExceptionResolver.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExceptionResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExecutionChain.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExecutionChain.java index 74e7157d455..80c64e29545 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExecutionChain.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerExecutionChain.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerInterceptor.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerInterceptor.java index ee051a334ea..d741971ca52 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerInterceptor.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java index e41af64b5cd..388d0ec21d9 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/HandlerMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndView.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndView.java index 74478d33761..fb6f8521b40 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndView.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java index 0893d4be7f9..5ff78ab1e59 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/ModelAndViewDefiningException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/NoHandlerFoundException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/NoHandlerFoundException.java index 64fefc1f733..758794d754d 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/NoHandlerFoundException.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/NoHandlerFoundException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java index 693c33643b6..630f2e89b7e 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/MissingPortletRequestParameterException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java index 3ac235dcaf2..69cc5ff3d32 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestBindingException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java index 776731753d6..88a495abf50 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java index 32420d02e41..358fc9370e4 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValues.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestUtils.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestUtils.java index 269b7ce0459..43eef92bef1 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestUtils.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ActionMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ActionMapping.java index f8dbdbdc3e7..12c490b7775 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ActionMapping.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/bind/annotation/ActionMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/ConfigurablePortletApplicationContext.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/ConfigurablePortletApplicationContext.java index bd56e6bda26..a6572e537fb 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/ConfigurablePortletApplicationContext.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/ConfigurablePortletApplicationContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java index 2f074204e9e..0007c187e41 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationObjectSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigAware.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigAware.java index 7e64034a49c..d3fcbb4ce36 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigAware.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletConfigAware.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAware.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAware.java index 5b0b1e40aef..b11a4707e45 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAware.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAware.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java index 07e60b45ad8..b9df018158f 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextAwareProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java index 100b3fb0a76..dd2bb549092 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextResourcePatternResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java index 6564db90d13..5dd52cfd49f 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletContextScope.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestAttributes.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestAttributes.java index e0a6eb783df..6a7e1c83db5 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestAttributes.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestAttributes.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java index 4d3c6e5277a..cf52db05c3d 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletRequestHandledEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java index e1dfa25f9a2..fe6348dd6d0 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletWebRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/StaticPortletApplicationContext.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/StaticPortletApplicationContext.java index ce44602bb6d..d1c1b2ad2a3 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/StaticPortletApplicationContext.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/StaticPortletApplicationContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerExceptionResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerExceptionResolver.java index db031e1717a..64365dfa480 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerExceptionResolver.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/AbstractHandlerExceptionResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java index e5ae5a0095d..9c3bff5f2a1 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/HandlerInterceptorAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterHandlerMapping.java index 235a25f8fbf..ae24f492088 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterHandlerMapping.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterHandlerMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java index 5d9f1c4b151..dc7166db01a 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/ParameterMappingInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletContentGenerator.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletContentGenerator.java index b23756f87c4..4ac0d32e417 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletContentGenerator.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletContentGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java index 9c9391c4989..2957d73aed6 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeHandlerMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMapping.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMapping.java index 5b2f7745d0c..e53dcb0b6dd 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMapping.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java index 53ead92e54f..7037f831263 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletRequestMethodNotSupportedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java index 7c4b8687e3a..0911834e612 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/PortletSessionRequiredException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolver.java index 2be0716c961..5025a024e0e 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolver.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java index f727716bb37..5ef81bb0aea 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletHandlerAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java index bdab9c3380a..c9cde4b1b01 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/SimplePortletPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java index 9fb40675df6..6026dd17b47 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/handler/WebRequestHandlerInterceptorAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java index c8b8b268f79..04897215097 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/CommonsPortletMultipartResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java index a2b8184f9aa..a46f14b9b14 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/DefaultMultipartActionRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java index b2a607f4e23..2cb58beffd7 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/multipart/PortletMultipartResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractCommandController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractCommandController.java index 233ba4fb86f..dca2fd1717c 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractCommandController.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractCommandController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java index dc4b3c2288e..271906d4a21 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java index edf58821fc5..b901b5314e3 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractFormController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java index bd7971d5bbc..e9f98b1cac8 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/AbstractWizardFormController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java index ebb1bcc83f4..d1d1451e596 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/BaseCommandController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java index 8f93ba48af9..38bfb5075ec 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/Controller.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java index fa2dcb26068..ab4818effa1 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ParameterizableViewController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java index db95e9edeae..f8a1df3d204 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/PortletWrappingController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ResourceAwareController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ResourceAwareController.java index 2839a209c37..3d679dccff2 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ResourceAwareController.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/ResourceAwareController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleFormController.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleFormController.java index 47e5f5e3457..980afcd3e92 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleFormController.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/mvc/SimpleFormController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java index 61950386903..d9dae6dcdb0 100644 --- a/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java +++ b/spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/util/PortletUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java index 17fd24fec79..a992a2ebfc6 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java index 8ada7848fa9..c5360de5316 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/INestedTestBean.java index c5c4ed5e679..e0ae5f20a3f 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/INestedTestBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/INestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/IOther.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/IOther.java index 6a8f74187cb..d7fb346185a 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/IOther.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/IOther.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java index e136978f9e6..412891c439b 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java index 7a27cf0894e..6d71de75764 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java index 9c8be8ac4c4..b588561321f 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java index f3d6eedefe1..6fc7e36aa90 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java index 191b3509c73..013a65a0e49 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java index 17fd2145987..b9a7925ad82 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java index 2a624d5c97f..7fa8a8263d8 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/ACATester.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java index fe8201644ba..a7207435209 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java index bd15215911b..f3163636829 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatBroadcasts.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java index a4c79b2e2c0..ab40da4b896 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/BeanThatListens.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java index c4d9b9ebb3d..d580974a608 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/HeaderValueHolder.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/HeaderValueHolder.java index a6381e92baa..e8f5e91dfb6 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/HeaderValueHolder.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/HeaderValueHolder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java index dbcfa62be33..7d154808d3c 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java index 2f5c773e0c2..423cbb0c34b 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockActionResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java index fcdc50acdc0..28662358c02 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockBaseURL.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java index cac1a83d5ff..109133a2b64 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockCacheControl.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java index 8fa396de4d5..beccbcf59a5 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockClientDataRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java index c2c82febae7..daa15e51565 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java index af4725dea72..d29d7865c40 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java index f7c846e028f..1114d0081bd 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockEventResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java index cbfb70bca1e..0a48975f691 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMimeResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java index 54201b8ec8b..e269a621e1a 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockMultipartActionRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java index 8731438d70c..824df6f70d3 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortalContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java index 8d9157e1d2f..cf7f48bb176 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java index a37c747e12a..902991ab987 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java index d5dab011ced..2cbefb79c1a 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java index 5ba423ed0e5..f4e0dc98fde 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletRequestDispatcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java index 9fe6d6315f7..513a6c8c9c8 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java index e589e6a1034..963ae040f27 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java index 53deff09162..89fe6a5b170 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletURL.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java index 672a51dcb72..8b9ed2e41ad 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java index 7f70be9a051..e359b0b52cc 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockRenderResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java index e889d923149..5878e7b96ef 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java index 00a267b1d83..4c7f45279b9 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java index 12b7fd4a39e..a0cf72f022c 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockResourceURL.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java index 6d2f6d74faf..93ddad81d00 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockStateAwareResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java index bb7e68319ce..8a7150757a5 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/ServletWrappingPortletContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java index 0bed2747f11..6cb7e3ae5f3 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/GenericPortletBeanTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/GenericPortletBeanTests.java index e0256a341de..7028c8bb336 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/GenericPortletBeanTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/GenericPortletBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java index 128f169bb82..f4a1eeae4ae 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValuesTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValuesTests.java index 765e4c65523..a40f0d47c0e 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValuesTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestParameterPropertyValuesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java index 13fafe991a7..8aeeb819b5d 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java index 58118d77117..a5186f3b654 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletConfigAwareBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java index 405bc5d9fee..0773459f5e8 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareProcessorTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareProcessorTests.java index 28b89a96cf7..2f526c27e8a 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareProcessorTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletContextAwareProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletWebRequestTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletWebRequestTests.java index 5ae98802923..e52c722b2c3 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletWebRequestTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletWebRequestTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java index 61a42a0257e..9ec0c1be3bb 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java index f260a375057..b942d1dfb38 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterHandlerMappingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterMappingInterceptorTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterMappingInterceptorTests.java index 4c071f74023..dea0e2c82a4 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterMappingInterceptorTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/ParameterMappingInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java index d1b9f80628b..26e4d9600fd 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeHandlerMappingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java index 09206812b03..6cfd9440f4d 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/PortletModeParameterHandlerMappingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java index a1bd2834d91..e00e74589a5 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/SimpleMappingExceptionResolverTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptorTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptorTests.java index ef70c03718e..873b7a5fadc 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptorTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/handler/UserRoleAuthorizationInterceptorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java index f68e3b8d2d1..96080dd6c94 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/ParameterizableViewControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/ParameterizableViewControllerTests.java index dc35d85acde..3cb40f68cf6 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/ParameterizableViewControllerTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/ParameterizableViewControllerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java index af1d41ae3ec..1f2f9a8d620 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletModeNameViewControllerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java index 93490aa4611..2058bbb224a 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/PortletWrappingControllerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java index c1bc5ab6763..072476b61da 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java index 66903c3b910..c291a8e74b1 100644 --- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java +++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-20011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java index 056fa247bcf..db4ae5973d6 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java index f200ccb1192..13407758767 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerExceptionResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerInterceptor.java index 0b59d5f6d3c..3ed6dbf3570 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerInterceptor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java index daf05bcf7ea..791e169a016 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/LocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/LocaleResolver.java index bed0733813b..d580afe766e 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/LocaleResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/LocaleResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java index b07d4d50829..d58ea7de6a8 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java index 08bd4f6abdc..ffb22c02f58 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndViewDefiningException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/RequestToViewNameTranslator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/RequestToViewNameTranslator.java index d0a503ca376..7c47cd3aa89 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/RequestToViewNameTranslator.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/RequestToViewNameTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ResourceServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ResourceServlet.java index d280c8229cb..b286661489b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ResourceServlet.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ResourceServlet.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/SmartView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/SmartView.java index 209c1bc092c..31539c1653a 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/SmartView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/SmartView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ThemeResolver.java index c44619e313f..39c0cbd8b18 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ThemeResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ThemeResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java index db6f31186c7..dbc4ad5f3d0 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewRendererServlet.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewResolver.java index 8e2429af866..e6a50cc2dfb 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/ViewResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/DefaultServletHandlerBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/DefaultServletHandlerBeanDefinitionParser.java index 68f0220540c..d842b4d689c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/DefaultServletHandlerBeanDefinitionParser.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/DefaultServletHandlerBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java index 2b4af21e86f..d1d887700bc 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceUtils.java index a0defb43f11..abf53b4e2c8 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceUtils.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java index 8a05cf73829..97df07e544a 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java index d218be939cd..e580aea38b7 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java index eaae024b2b7..6b6f5d1acf8 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java index 2daa59c4761..178569b4c4c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/EnableWebMvc.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistration.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistration.java index b406d284ae4..8ce3914180e 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistration.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistration.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java index 914c9cfaa39..96fdcaf4e09 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistration.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistration.java index 155aa38536c..bc3b1738ce6 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistration.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistration.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java index 9cbbadf4f19..fcc284989f8 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractDetectingUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractDetectingUrlHandlerMapping.java index 9cbc2c14892..c06bb4eefff 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractDetectingUrlHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractDetectingUrlHandlerMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java index a86ed1ddb72..fdef487e481 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java index 0e74e57384b..ea079c49386 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java index 4501a8fe37f..5a4c7d92480 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodExceptionResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java index f9b8cbc344a..f7349c93de6 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/ConversionServiceExposingInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java index f9e1e7c393b..8716f20cef6 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerExceptionResolverComposite.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java index 9f149b19492..e72e011c7ae 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletHandlerAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java index e3ca75d02d3..663786ff294 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleServletPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java index b581ca2b387..abef0a7ff7e 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleUrlHandlerMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java index 551c790d533..661bb62ac75 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java index 66f5bcae6a8..94c7d03723f 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/CookieLocaleResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java index a2abd437154..f56590f4698 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/FixedLocaleResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/SessionLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/SessionLocaleResolver.java index 66f7b3990f9..de1bdd57c7c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/SessionLocaleResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/SessionLocaleResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractCommandController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractCommandController.java index fad6bb9dc94..6c4731ff1fc 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractCommandController.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractCommandController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java index a6d57754632..a0ef16cc32f 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java index f3a3939a10b..da72de2f51f 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java index 8033b21fe86..14b1e82caad 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractUrlViewController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java index 0b40a12d047..a53836a7a4d 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java index b34b7f99235..2f47edaa25a 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/CancellableFormController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/CancellableFormController.java index 87d6a019019..1bd9ef89706 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/CancellableFormController.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/CancellableFormController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/Controller.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/Controller.java index b02d72d3cdd..654062ed958 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/Controller.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/Controller.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java index 6ed540dcdde..8ca1b33a3d3 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/LastModified.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java index f8365a14701..c5493d0ec64 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ParameterizableViewController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java index c96e356e60b..73607f6d7fe 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletForwardingController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java index 79c8bf3851f..10dffda157b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/ServletWrappingController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java index c589641dded..030c2dca2c5 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java index 604bea9b6c1..50a20e51b97 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java index d4c6cccab32..d204e33e89b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java index a7580c500ac..0d58e8c134c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java index 62bbc4ebc79..5c0282f527d 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java index dd050ca81c3..3915ffc7618 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractNameValueExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractRequestCondition.java index 5328d5e799a..921ecb249a0 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractRequestCondition.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/AbstractRequestCondition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java index 20b4ee8381a..3ece7e8d73b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/HeadersRequestCondition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/MediaTypeExpression.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/MediaTypeExpression.java index 9df8949dac7..986d9a4fe9b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/MediaTypeExpression.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/MediaTypeExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/NameValueExpression.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/NameValueExpression.java index 83a01ea56a8..6bb9c818727 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/NameValueExpression.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/NameValueExpression.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java index 66d6e51009a..294d4e6ed13 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ParamsRequestCondition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java index d6bce0d4829..9824b80e0e5 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java index 765ed74a645..6d0e3941e6c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java index f271cfe4794..14c74c60771 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java index ee09382f23a..8d3d77acd99 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletWebArgumentResolverAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletWebArgumentResolverAdapter.java index 54a4e2265eb..5513dddae00 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletWebArgumentResolverAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletWebArgumentResolverAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/AbstractUrlMethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/AbstractUrlMethodNameResolver.java index 444b45dce5d..ed781d99c78 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/AbstractUrlMethodNameResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/AbstractUrlMethodNameResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MethodNameResolver.java index 4df1b6acff5..d67f3019f86 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MethodNameResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/MethodNameResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java index 5dc2d264fa8..00917177e81 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/NoSuchRequestHandlingMethodException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/ParameterMethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/ParameterMethodNameResolver.java index 8c5d93844df..bd9405b65bb 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/ParameterMethodNameResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/ParameterMethodNameResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java index ed43904a3f4..3cbcb08a8f7 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/multiaction/PropertiesMethodNameResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AbstractControllerUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AbstractControllerUrlHandlerMapping.java index 40f7aa68d5c..7c4f94535f4 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AbstractControllerUrlHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AbstractControllerUrlHandlerMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java index c824754eb1f..dfa46ec0ec3 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/AnnotationControllerTypePredicate.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java index 6977c4e5592..168781491f7 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerBeanNameHandlerMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java index 34a3e0a2e86..4b8f9b33c57 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/ControllerClassNameHandlerMapping.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java index daeaa970c51..d23b050cbc9 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributes.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMap.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMap.java index 27c0e25bbc8..6db27a10d4f 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMap.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMap.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java index 4c1ca19ef16..0a928be3a45 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/BindStatus.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/BindStatus.java index e78a6ac5498..c5f9e6a3e32 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/BindStatus.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/BindStatus.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java index 4b44bd98323..69d5cefe803 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JspAwareRequestContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JstlUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JstlUtils.java index 34d44b5c725..f568f362137 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JstlUtils.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/JstlUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java index e5a74646218..3f586a94467 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java index a8ca8ca2562..6dd24b78265 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestDataValueProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java index 3cc1b41fca4..7f759e8c97f 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/WebContentGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java index 28e5aa57227..cf037fc1158 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindErrorsTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java index 0b6e91eb023..f5b45233e11 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/BindTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EditorAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EditorAwareTag.java index 05fd7845a3a..290c70f2a91 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EditorAwareTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EditorAwareTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java index 73cf45267f6..2c0056def49 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java index dbf878f047a..6ec63b58c8d 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java index 578c9e69cef..8e610458101 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapeTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java index 6e72f1f91d1..05db5eb70a3 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java index c195208d980..a3a0c4c7f50 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java index bc3ee3b24f6..1f8ddd28432 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/NestedPathTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/Param.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/Param.java index d37d05a9eb2..8909c3598dd 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/Param.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/Param.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamAware.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamAware.java index 32df5d7412e..a99f4378bbb 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamAware.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamAware.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java index 8b222e3d3a4..a0b62747ea2 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ParamTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java index 8e8091f5ff0..b02021fbb60 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/RequestContextAwareTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java index 370a842360c..182247bf6f6 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/ThemeTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java index 90f8b3ae569..a0379d88000 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java index 0bdaef89ceb..370bf196882 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java index cebf23c64f0..a1035d4da1e 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java index b526096c239..a0d569a5090 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java index 08200ab8d92..67f62f3d368 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractFormTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java index f0e48baaae3..a31cc1ebe62 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java index 5b70045309d..6316ac8b3c2 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java index d1d3dcf9ed8..1718b08feaf 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlInputElementTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java index be41b85a6ed..5c431cc7353 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractMultiCheckedElementTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java index 71ca75cd65b..9d26dc554aa 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractSingleCheckedElementTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java index db85b752d26..d3468aed0b5 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ButtonTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java index 51a846808fa..6244a2d5373 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java index 29d6e93376e..50cd7447ee3 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/CheckboxesTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java index 60a00ffe326..c05a4468874 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ErrorsTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java index 4b776488ad9..f827631d62e 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java index b1d32e4b869..7a6de1dd26b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/HiddenInputTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java index a451f8840e6..514d9400ab5 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/InputTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java index 474f9c913a0..f8dd7f28e82 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java index 278887344a6..3e9ee381ce3 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java index 1c47096591e..062b4900d4c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java index 02712da2465..0c57b8dd9be 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/OptionsTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/PasswordInputTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/PasswordInputTag.java index 6ee579519af..02b5b9b7a8a 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/PasswordInputTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/PasswordInputTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java index facbde6d241..3d4dc779952 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java index 90033186c92..e95064e4f95 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/RadioButtonsTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java index c840f3e8474..e0afe0f431a 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java index 63c41341eed..8446f9f2b14 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/SelectedValueComparator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagIdGenerator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagIdGenerator.java index 8062d17c57d..ae4185f86f8 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagIdGenerator.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagIdGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java index a3163671726..b4d2d914f86 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java index c2ac715ca83..09539fbbb81 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TextareaTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ValueFormatter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ValueFormatter.java index c10ac1ee02a..70ae90264b9 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ValueFormatter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/ValueFormatter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java index 12ab0f5feac..26660987349 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/CookieThemeResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/FixedThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/FixedThemeResolver.java index 2c6bdee4352..75aae57b619 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/FixedThemeResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/FixedThemeResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/SessionThemeResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/SessionThemeResolver.java index 766058f4633..686f7a2708d 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/SessionThemeResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/theme/SessionThemeResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractUrlBasedView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractUrlBasedView.java index 757a42aadf7..9e17d98f8fd 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractUrlBasedView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/AbstractUrlBasedView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java index 066242271d1..a8ca84e6645 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java index c73b81cc18e..9ffb54e7b79 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/DefaultRequestToViewNameTranslator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java index b19385c1070..83c2bb55c26 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceViewResolver.java index 9b50d346d6a..cd55f05377f 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/InternalResourceViewResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java index 164f51b2b50..7906b33f047 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/JstlView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ResourceBundleViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ResourceBundleViewResolver.java index 22e6a1fafc3..2726e0537c3 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ResourceBundleViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ResourceBundleViewResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java index f9b4a77e31f..56a3a3effb8 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java index 68ecc69edba..59b45a8a800 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractJExcelView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractJExcelView.java index 0050f40313c..2ce37aeea3c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractJExcelView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractJExcelView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java index 34bc3071cf7..89402557098 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/document/AbstractPdfView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java index 6773d689c84..643231404a1 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsView.java index 6ace4da3fe4..f2a579bef68 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvView.java index 61ba6142ef3..f8297f3b144 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java index b6bc188d17a..83ac59115c2 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsHtmlView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatView.java index 54cbae7e857..00bb4439fb7 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfView.java index 4d7199e71ea..f10937f2e21 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java index d496d56fd00..f646898b936 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsViewResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsView.java index 712b7ca740b..33ae346f0a0 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java index 84fe7d1d030..ef4faaf2e0a 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/AbstractSpringPreparerFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java index 6f1e2b9b0c8..050aad09cf5 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles2/TilesConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfig.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfig.java index f8b7c475921..9bffdadf102 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfig.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java index 1eaf045c1f1..5d547a639e3 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutView.java index 0933aeb57c5..65493af17c8 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutViewResolver.java index 8678b62e58e..873421473e8 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityLayoutViewResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java index 5a8081c30b9..d094d75e9f5 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityViewResolver.java index d0eec2ea82b..11ce8c62d80 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/velocity/VelocityViewResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java index dd68939008d..c08daa0a851 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MarshallingView.java @@ -1,5 +1,5 @@ /* - * Copyright 2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java index 1db1ef7da7f..24a6d018db4 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/AbstractXsltView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java index 7fad0bf3299..9753b9b5760 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltViewResolver.java index cb731e19de6..8ba15e391ca 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/xslt/XsltViewResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/beans/Colour.java b/spring-webmvc/src/test/java/org/springframework/beans/Colour.java index 17fd24fec79..a992a2ebfc6 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/Colour.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/Colour.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java index 8ada7848fa9..c5360de5316 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/INestedTestBean.java index c5c4ed5e679..e0ae5f20a3f 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/INestedTestBean.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/INestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/beans/IOther.java b/spring-webmvc/src/test/java/org/springframework/beans/IOther.java index 6a8f74187cb..d7fb346185a 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/IOther.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/IOther.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java index e136978f9e6..412891c439b 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/beans/Person.java b/spring-webmvc/src/test/java/org/springframework/beans/Person.java index a78998ad5d4..7c66f4b451b 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/Person.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/Person.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java index 9a2a3193df2..dbe365f4937 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java index 7a27cf0894e..6d71de75764 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java index f3d6eedefe1..6fc7e36aa90 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java index 191b3509c73..013a65a0e49 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java index 17fd2145987..b9a7925ad82 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/access/TestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/access/TestBean.java index 3a77af2f711..ac3b91c5ffb 100644 --- a/spring-webmvc/src/test/java/org/springframework/beans/factory/access/TestBean.java +++ b/spring-webmvc/src/test/java/org/springframework/beans/factory/access/TestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/context/ACATester.java b/spring-webmvc/src/test/java/org/springframework/context/ACATester.java index 2a624d5c97f..7fa8a8263d8 100644 --- a/spring-webmvc/src/test/java/org/springframework/context/ACATester.java +++ b/spring-webmvc/src/test/java/org/springframework/context/ACATester.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java b/spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java index bd15215911b..f3163636829 100644 --- a/spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java +++ b/spring-webmvc/src/test/java/org/springframework/context/BeanThatBroadcasts.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java b/spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java index a4c79b2e2c0..ab40da4b896 100644 --- a/spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java +++ b/spring-webmvc/src/test/java/org/springframework/context/BeanThatListens.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/http/client/FreePortScanner.java b/spring-webmvc/src/test/java/org/springframework/http/client/FreePortScanner.java index 113f3d4910a..83add2ceaff 100644 --- a/spring-webmvc/src/test/java/org/springframework/http/client/FreePortScanner.java +++ b/spring-webmvc/src/test/java/org/springframework/http/client/FreePortScanner.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java index 2e0e3a0d3cd..161475869f5 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java b/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java index 018dd1cfeb8..7276af86ae9 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/ServletConfigAwareBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java b/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java index 2272378104b..9363468268d 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java +++ b/spring-webmvc/src/test/java/org/springframework/web/context/ServletContextAwareBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java index 17bbabaa3db..1e44c2f8156 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/FlashMapTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/FlashMapTests.java index dba96246098..f9ad57ba052 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/FlashMapTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/FlashMapTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java index 85a0756fb7a..dbbb25fe5a9 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java index c55aeb7d0ca..3f72adf22e5 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistryTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistryTests.java index 888cdfe9b28..0695958fa74 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistryTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewControllerRegistryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java index 53cb85a215e..e8025b835a5 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/Controller.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java index b8fa5d7e662..eb05fe9bba1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/WelcomeController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java index 43c8c22dd6d..3d77c292373 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java index 43c83b7ef41..8a0518c5607 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java index 2fcc677126b..4d5b846832b 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/RequestDataValueProcessorWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java index 976fcb923e6..95a8e0ddf0a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagOutsideDispatcherServletTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java index 6f22532bdc5..98764500996 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java index 3795717267e..5ac42a02d06 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagOutsideDispatcherServletTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java index 8148682f0f8..3c5f1207594 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagOutsideDispatcherServletTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java index bff2b1eef95..fc6321a2c4d 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTests.java index 49d305cc4e5..4231d24ad23 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java index 9beea85f112..d0113f95fe4 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java index 3937e95dc10..edabd11d4fb 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java index ebe0e344a27..1d299c222ad 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java index 77e0a6fa315..70aae8f0e49 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java index b0baea78846..055580d5a34 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java index 26828da7bd3..60beaccb6d1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java index 878b666d1ab..7ca869480b1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ItemPet.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ItemPet.java index c2fcc67a0df..e3cd3eab0d5 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ItemPet.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ItemPet.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java index cfb6528ae70..7144652045e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java index 50485dec42b..c4787c01058 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java index 12652ed2e6a..bcb5eeebaff 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java index de6e902eb2a..93f6a04080a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java index 127656b9789..fd2674f9ab0 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SimpleFloatEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java index 82de492c307..9c64ac0e26e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TagWriterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java index 2fc7c3100e8..4684b5b659a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java index 56feded2d67..654378cf362 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ResourceBundleViewResolverNoCacheTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java index 8b49f3ba55f..962b3fa33c3 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerConfigurerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithStreamTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithStreamTests.java index 046d3cfc55e..3f248d1931c 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithStreamTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithStreamTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithWriterTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithWriterTests.java index 349f455f3e2..2c509c49738 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithWriterTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ConfigurableJasperReportsViewWithWriterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java index 09cb2aa70be..7b32ec733c8 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsCsvViewTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewTests.java index 093afd7853d..bbb12663c20 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewWithCustomMappingsTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewWithCustomMappingsTests.java index b7b1e9ebea3..0ad16202a35 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewWithCustomMappingsTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsMultiFormatViewWithCustomMappingsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java index 6fbf2076b63..0ab3e04aaf1 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsPdfViewTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java index 2f09e9bf0f2..4b3b6f0cd61 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/JasperReportsXlsViewTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java index 92f0b4c4bf9..63c320b73f5 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/TestVelocityEngine.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java index bf51bed1c78..69f8ea613aa 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityConfigurerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java b/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java index 231ae393a26..7472033a36b 100644 --- a/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java +++ b/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java index 93a34f14666..74ff0825e65 100644 --- a/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java +++ b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java b/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java index 01155d3f3b1..0f0fc64ac81 100644 --- a/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java +++ b/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java b/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java index 89964f2e850..b213a2a4e0f 100644 --- a/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java +++ b/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java b/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java index 194c455f218..baa911c8f23 100644 --- a/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java +++ b/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java b/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java index 9ee6eb4a8cf..e0712b69c66 100644 --- a/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java +++ b/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java b/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java index ee65521d4d1..f30afd1ca17 100644 --- a/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java +++ b/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/springframework/core/env/PropertyPlaceholderConfigurerEnvironmentIntegrationTests.java b/src/test/java/org/springframework/core/env/PropertyPlaceholderConfigurerEnvironmentIntegrationTests.java index 89010245486..8028a4cf0fd 100644 --- a/src/test/java/org/springframework/core/env/PropertyPlaceholderConfigurerEnvironmentIntegrationTests.java +++ b/src/test/java/org/springframework/core/env/PropertyPlaceholderConfigurerEnvironmentIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java b/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java index e095fd1e568..366f338f113 100644 --- a/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java +++ b/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java b/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java index 0ddec74625e..5fe702c3bee 100644 --- a/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java +++ b/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2002-2012 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.expression.spel.support; import java.lang.reflect.Method; diff --git a/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java index 943a9e1e1b5..ff94b0dd222 100644 --- a/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java +++ b/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java @@ -1,6 +1,5 @@ -package org.springframework.transaction; /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +14,8 @@ package org.springframework.transaction; * limitations under the License. */ +package org.springframework.transaction; + import org.springframework.transaction.support.AbstractPlatformTransactionManager; diff --git a/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java b/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java index ced09c321ff..d4f33e642e8 100644 --- a/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java +++ b/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java b/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java index 26bc6fdb192..a3b509d8a7f 100644 --- a/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java +++ b/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/test/advice/CountingAfterReturningAdvice.java b/src/test/java/test/advice/CountingAfterReturningAdvice.java index fe373ecc7e8..a8a3a01e3a3 100644 --- a/src/test/java/test/advice/CountingAfterReturningAdvice.java +++ b/src/test/java/test/advice/CountingAfterReturningAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/test/advice/CountingBeforeAdvice.java b/src/test/java/test/advice/CountingBeforeAdvice.java index 89fc45aeb5e..5aa37b61e14 100644 --- a/src/test/java/test/advice/CountingBeforeAdvice.java +++ b/src/test/java/test/advice/CountingBeforeAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/test/advice/MethodCounter.java b/src/test/java/test/advice/MethodCounter.java index 8c29886a3df..e0e45d6f142 100644 --- a/src/test/java/test/advice/MethodCounter.java +++ b/src/test/java/test/advice/MethodCounter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/test/beans/Colour.java b/src/test/java/test/beans/Colour.java index 5be4dfa761a..533d0df36e3 100644 --- a/src/test/java/test/beans/Colour.java +++ b/src/test/java/test/beans/Colour.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/test/beans/INestedTestBean.java b/src/test/java/test/beans/INestedTestBean.java index 1023dbbc139..2b63908467c 100644 --- a/src/test/java/test/beans/INestedTestBean.java +++ b/src/test/java/test/beans/INestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/test/beans/IOther.java b/src/test/java/test/beans/IOther.java index 80fe4e84983..f0c6aa7bf46 100644 --- a/src/test/java/test/beans/IOther.java +++ b/src/test/java/test/beans/IOther.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/test/beans/ITestBean.java b/src/test/java/test/beans/ITestBean.java index c452bdc1dda..0434b6ad114 100644 --- a/src/test/java/test/beans/ITestBean.java +++ b/src/test/java/test/beans/ITestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/test/beans/IndexedTestBean.java b/src/test/java/test/beans/IndexedTestBean.java index 951b732346a..160681e5565 100644 --- a/src/test/java/test/beans/IndexedTestBean.java +++ b/src/test/java/test/beans/IndexedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/test/beans/NestedTestBean.java b/src/test/java/test/beans/NestedTestBean.java index 610931b50c8..c6d1acd27b5 100644 --- a/src/test/java/test/beans/NestedTestBean.java +++ b/src/test/java/test/beans/NestedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/test/beans/Pet.java b/src/test/java/test/beans/Pet.java index b62b5c8bf3c..f81ac4f0921 100644 --- a/src/test/java/test/beans/Pet.java +++ b/src/test/java/test/beans/Pet.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/test/beans/TestBean.java b/src/test/java/test/beans/TestBean.java index d237316c8a3..b76f12a75e8 100644 --- a/src/test/java/test/beans/TestBean.java +++ b/src/test/java/test/beans/TestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/test/interceptor/NopInterceptor.java b/src/test/java/test/interceptor/NopInterceptor.java index ccda8189944..b1cdf832a4a 100644 --- a/src/test/java/test/interceptor/NopInterceptor.java +++ b/src/test/java/test/interceptor/NopInterceptor.java @@ -1,6 +1,6 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/test/interceptor/SerializableNopInterceptor.java b/src/test/java/test/interceptor/SerializableNopInterceptor.java index f33e0d1e1b4..d2fbdc584af 100644 --- a/src/test/java/test/interceptor/SerializableNopInterceptor.java +++ b/src/test/java/test/interceptor/SerializableNopInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/test/util/SerializationTestUtils.java b/src/test/java/test/util/SerializationTestUtils.java index 132bd33d4eb..e9bc9fee04a 100644 --- a/src/test/java/test/util/SerializationTestUtils.java +++ b/src/test/java/test/util/SerializationTestUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2012 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 11d975bfef06e1edbc3eb17a3a89e18600c944f0 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 28 Dec 2012 15:42:08 -0500 Subject: [PATCH 07/34] Polish contributor guidelines --- CONTRIBUTING.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 71739dc4006..65db556fabd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,7 +23,7 @@ truly trivial, e.g. typo fixes, removing compiler warnings, etc. If you're considering anything more than correcting a typo or fixing a minor bug, please discuss it on the [spring-framework-contrib][] mailing list before -submitting a pull request. We're happy to provide guidance but please spend an +submitting a pull request. We're happy to provide guidance, but please spend an hour or two researching the subject on your own including searching the mailing list for prior discussions. @@ -31,26 +31,26 @@ list for prior discussions. If you have not previously done so, please fill out and submit the [SpringSource CLA form][]. You'll receive a token when this process is complete. -Keep track of this, you may be asked for it later! +Keep track of this; you may be asked for it later! Note that emailing/postal mailing a signed copy is _not_ necessary. Submission of the web form is all that is required. -When you've completed the web form, simply add the following in a comment on +Once you've completed the web form, simply add the following in a comment on your pull request: I have signed and agree to the terms of the SpringSource Individual Contributor License Agreement. You do not need to include your token/id. Please add the statement above to all -future pull requests as well, simply so the Spring Framework team knows +future pull requests as well, simply so that the Spring Framework team knows immediately that this process is complete. ## Create your branch from `3.2.x` If your pull request addresses a bug or improvement, please create your branch -Spring Framework's `3.2.x` branch. `master` is reserved for work on new features +from Spring Framework's `3.2.x` branch. `master` is reserved for work on new features for the next major version of the framework. Rest assured that if your pull request is accepted and merged into `3.2.x`, these changes will also eventually be merged into `master`. @@ -72,7 +72,7 @@ Please carefully follow the whitespace and formatting conventions already present in the framework. 1. Tabs, not spaces -1. Unix (LF), not dos (CRLF) line endings +1. Unix (LF), not DOS (CRLF) line endings 1. Eliminate all trailing whitespace 1. Wrap Javadoc at 90 characters 1. Aim to wrap code at 90 characters, but favor readability over wrapping @@ -228,11 +228,11 @@ Most importantly, please format your commit messages in the following way 1. Use imperative statements in the subject line, e.g. "Fix broken Javadoc link" 1. Begin the subject line sentence with a capitalized verb, e.g. "Add, Prune, - Fix, Introduce, Avoid, etc" + Fix, Introduce, Avoid, etc." 1. Do not end the subject line with a period 1. Keep the subject line to 50 characters or less if possible 1. Wrap lines in the body at 72 characters or less -1. Mention associated jira issue(s) at the end of the commit comment, prefixed +1. Mention associated JIRA issue(s) at the end of the commit comment, prefixed with "Issue: " as above 1. In the body of the commit message, explain how things worked before this commit, what has changed, and how things work now From 005ee7385f9e58651deb8a44f120d6f3954ac52d Mon Sep 17 00:00:00 2001 From: Tom Mack Date: Fri, 28 Dec 2012 11:13:56 -0800 Subject: [PATCH 08/34] Remove extra URL prefix in the MVC chapter A link in the MVC chapter of the reference manual contained an extra "http://" URL prefix. This commit removes the extra "http://" URL prefix. --- src/reference/docbook/mvc.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/reference/docbook/mvc.xml b/src/reference/docbook/mvc.xml index 53150169770..ffe081c1e09 100644 --- a/src/reference/docbook/mvc.xml +++ b/src/reference/docbook/mvc.xml @@ -2484,9 +2484,9 @@ deferredResult.setResult(data); resumes with the asynchronously produced result. - Explaining the motivation for async request processing, when or why to use it - is beyond the scope of this document. For further information you may wish to read - this blog post series. + Explaining the motivation for async request processing and when or why to use it + are beyond the scope of this document. For further information you may wish to read + this blog post series.
From c005757775732db07a889ed734be2bd878de6b1c Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Sat, 29 Dec 2012 00:14:48 +0100 Subject: [PATCH 09/34] Add quartz scheduling test to TestGroup.PERFORMANCE Issue: SPR-9984 --- .../springframework/scheduling/quartz/QuartzSupportTests.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java index 855bf686929..40994bfcde0 100644 --- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java +++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java @@ -57,6 +57,8 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.support.StaticListableBeanFactory; +import org.springframework.build.junit.Assume; +import org.springframework.build.junit.TestGroup; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.context.support.StaticApplicationContext; import org.springframework.core.io.FileSystemResourceLoader; @@ -964,6 +966,8 @@ public class QuartzSupportTests { // SPR-6038: detect HSQL and stop illegal locks being taken @Test public void testSchedulerWithHsqlDataSource() throws Exception { + Assume.group(TestGroup.PERFORMANCE); + DummyJob.param = 0; DummyJob.count = 0; From 90d1886cbda778977ae810fe016fc5c76ab12062 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Sat, 29 Dec 2012 00:14:48 +0100 Subject: [PATCH 10/34] Add aop target source test to TestGroup.PERFORMANCE Issue: SPR-9984 --- .../aop/target/dynamic/RefreshableTargetSourceTests.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java index 3f90fb8aefc..a94504567e8 100644 --- a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java @@ -19,6 +19,8 @@ package org.springframework.aop.target.dynamic; import static org.junit.Assert.*; import org.junit.Test; +import org.springframework.build.junit.Assume; +import org.springframework.build.junit.TestGroup; /** * @author Rob Harrop @@ -75,6 +77,8 @@ public final class RefreshableTargetSourceTests { @Test public void testRefreshOverTime() throws Exception { + Assume.group(TestGroup.PERFORMANCE); + CountingRefreshableTargetSource ts = new CountingRefreshableTargetSource(true); ts.setRefreshCheckDelay(100); From d91a419fdc4f520ba8e443e689998f4e7b5a2b2c Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Mon, 31 Dec 2012 11:40:53 +0100 Subject: [PATCH 11/34] Fix SpEL JavaBean compliance for setters Prior to this change, SpEL was capable of handling getter methods for property names having a lowercase first letter and uppercase second letter such as: public String getiD() { ... } However, setters with the same naming arrangement were not supported, e.g.: public void setiD() { ... } This commit ensures that setters and getters are treated by SpEL equally in this regard, such that "iD"-style property names may be used anywhere within SpEL expressions. Issue: SPR-10122, SPR-9123 --- .../support/ReflectivePropertyAccessor.java | 24 +++++++++++-------- .../spel/support/ReflectionHelperTests.java | 15 +++++++++++- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java index 6e112b0e01c..97d87d50c3b 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java @@ -311,15 +311,10 @@ public class ReflectivePropertyAccessor implements PropertyAccessor { */ protected Method findGetterForProperty(String propertyName, Class clazz, boolean mustBeStatic) { Method[] ms = clazz.getMethods(); - String propertyWriteMethodSuffix; - if (propertyName.length() > 1 && Character.isUpperCase(propertyName.charAt(1))) { - propertyWriteMethodSuffix = propertyName; - } - else { - propertyWriteMethodSuffix = StringUtils.capitalize(propertyName); - } + String propertyMethodSuffix = getPropertyMethodSuffix(propertyName); + // Try "get*" method... - String getterName = "get" + propertyWriteMethodSuffix; + String getterName = "get" + propertyMethodSuffix; for (Method method : ms) { if (!method.isBridge() && method.getName().equals(getterName) && method.getParameterTypes().length == 0 && (!mustBeStatic || Modifier.isStatic(method.getModifiers()))) { @@ -327,7 +322,7 @@ public class ReflectivePropertyAccessor implements PropertyAccessor { } } // Try "is*" method... - getterName = "is" + propertyWriteMethodSuffix; + getterName = "is" + propertyMethodSuffix; for (Method method : ms) { if (!method.isBridge() && method.getName().equals(getterName) && method.getParameterTypes().length == 0 && (boolean.class.equals(method.getReturnType()) || Boolean.class.equals(method.getReturnType())) && @@ -343,7 +338,7 @@ public class ReflectivePropertyAccessor implements PropertyAccessor { */ protected Method findSetterForProperty(String propertyName, Class clazz, boolean mustBeStatic) { Method[] methods = clazz.getMethods(); - String setterName = "set" + StringUtils.capitalize(propertyName); + String setterName = "set" + getPropertyMethodSuffix(propertyName); for (Method method : methods) { if (!method.isBridge() && method.getName().equals(setterName) && method.getParameterTypes().length == 1 && (!mustBeStatic || Modifier.isStatic(method.getModifiers()))) { @@ -353,6 +348,15 @@ public class ReflectivePropertyAccessor implements PropertyAccessor { return null; } + protected String getPropertyMethodSuffix(String propertyName) { + if (propertyName.length() > 1 && Character.isUpperCase(propertyName.charAt(1))) { + return propertyName; + } + else { + return StringUtils.capitalize(propertyName); + } + } + /** * Find a field of a certain name on a specified class */ diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java index 85764aa7a27..523fe69a687 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java @@ -22,7 +22,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; import org.springframework.core.convert.TypeDescriptor; @@ -329,6 +329,10 @@ public class ReflectionHelperTests extends ExpressionTestCase { // note: "Id" is not a valid JavaBean name, nevertheless it is treated as "id" Assert.assertEquals("id",rpr.read(ctx,t,"Id").getValue()); Assert.assertTrue(rpr.canRead(ctx,t,"Id")); + + // SPR-10122, ReflectivePropertyAccessor JavaBean property names compliance tests - setters + rpr.write(ctx, t, "pEBS","Test String"); + Assert.assertEquals("Test String",rpr.read(ctx,t,"pEBS").getValue()); } @Test @@ -419,6 +423,7 @@ public class ReflectionHelperTests extends ExpressionTestCase { String iD = "iD"; String id = "id"; String ID = "ID"; + String pEBS = "pEBS"; public String getProperty() { return property; } public void setProperty(String value) { property = value; } @@ -434,6 +439,14 @@ public class ReflectionHelperTests extends ExpressionTestCase { public String getId() { return id; } public String getID() { return ID; } + + public String getpEBS() { + return pEBS; + } + + public void setpEBS(String pEBS) { + this.pEBS = pEBS; + } } static class Super { From 7a19fd575045333b970e645f6db8a15302484038 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Mon, 31 Dec 2012 14:16:38 +0100 Subject: [PATCH 12/34] Fix regression in static setter method support The intention of ExtendedBeanInfo, introduced with SPR-8079 in v3.1.0.M2, was to support dependency injection against non-void returning write methods. However, it also inadvertently introduced support for injection against static setter methods. When use of ExtendedBeanInfo was made optional with SPR-9723 in v3.2.0.M2, ExtendedBeanInfo continued to support static write methods, but its new BeanInfoFactory-based approach to testing whether or not a given bean class contains candidate write methods was written in a fashion exclusive of static methods, and this thereby introduced a regression - a regression in an otherwise undocumented and unintended feature, but a regression nevertheless. The reporting of SPR-10115 proves that at least one user has come to depend on this behavior allowing injection against static write methods, and so this commit fixes the regression by ensuring that the candidacy test includes standard and non-void setter methods having a static modifier. Issue: SPR-10115, SPR-9723, SPR-8079 --- .../beans/ExtendedBeanInfo.java | 21 +++++++++------- .../beans/ExtendedBeanInfoFactory.java | 2 +- .../beans/BeanWrapperTests.java | 18 ++++++++++++++ .../beans/ExtendedBeanInfoTests.java | 24 +++++++++++++++++++ 4 files changed, 55 insertions(+), 10 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java index 76c295490e0..54467cd3ea8 100644 --- a/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java +++ b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfo.java @@ -41,8 +41,8 @@ import static org.springframework.beans.PropertyDescriptorUtils.*; /** * Decorator for a standard {@link BeanInfo} object, e.g. as created by - * {@link Introspector#getBeanInfo(Class)}, designed to discover and register non-void - * returning setter methods. For example: + * {@link Introspector#getBeanInfo(Class)}, designed to discover and register static + * and/or non-void returning setter methods. For example: * 
{@code
  * public class Bean {
  *     private Foo foo;
@@ -102,37 +102,40 @@ class ExtendedBeanInfo implements BeanInfo {
 					new SimpleNonIndexedPropertyDescriptor(pd));
 		}
 
-		for (Method method : findNonVoidWriteMethods(delegate.getMethodDescriptors())) {
-			handleNonVoidWriteMethod(method);
+		for (Method method : findCandidateWriteMethods(delegate.getMethodDescriptors())) {
+			handleCandidateWriteMethod(method);
 		}
 	}
 
 
-	private List findNonVoidWriteMethods(MethodDescriptor[] methodDescriptors) {
+	private List findCandidateWriteMethods(MethodDescriptor[] methodDescriptors) {
 		List matches = new ArrayList();
 		for (MethodDescriptor methodDescriptor : methodDescriptors) {
 			Method method = methodDescriptor.getMethod();
-			if (isNonVoidWriteMethod(method)) {
+			if (isCandidateWriteMethod(method)) {
 				matches.add(method);
 			}
 		}
 		return matches;
 	}
 
-	public static boolean isNonVoidWriteMethod(Method method) {
+	public static boolean isCandidateWriteMethod(Method method) {
 		String methodName = method.getName();
 		Class[] parameterTypes = method.getParameterTypes();
 		int nParams = parameterTypes.length;
 		if (methodName.length() > 3 && methodName.startsWith("set") &&
 				Modifier.isPublic(method.getModifiers()) &&
-				!void.class.isAssignableFrom(method.getReturnType()) &&
+				(
+						!void.class.isAssignableFrom(method.getReturnType()) ||
+						Modifier.isStatic(method.getModifiers())
+				) &&
 				(nParams == 1 || (nParams == 2 && parameterTypes[0].equals(int.class)))) {
 			return true;
 		}
 		return false;
 	}
 
-	private void handleNonVoidWriteMethod(Method method) throws IntrospectionException {
+	private void handleCandidateWriteMethod(Method method) throws IntrospectionException {
 		int nParams = method.getParameterTypes().length;
 		String propertyName = propertyNameFor(method);
 		Class propertyType = method.getParameterTypes()[nParams-1];
diff --git a/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfoFactory.java b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfoFactory.java
index 7e462119226..183ffe4e2a3 100644
--- a/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfoFactory.java
+++ b/spring-beans/src/main/java/org/springframework/beans/ExtendedBeanInfoFactory.java
@@ -51,7 +51,7 @@ public class ExtendedBeanInfoFactory implements Ordered, BeanInfoFactory {
 	 */
 	private boolean supports(Class beanClass) {
 		for (Method method : beanClass.getMethods()) {
-			if (ExtendedBeanInfo.isNonVoidWriteMethod(method)) {
+			if (ExtendedBeanInfo.isCandidateWriteMethod(method)) {
 				return true;
 			}
 		}
diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
index 7da97104176..9ea8c569e7e 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
@@ -1550,6 +1550,24 @@ public final class BeanWrapperTests {
 		assertEquals(TestEnum.TEST_VALUE, consumer.getEnumValue());
 	}
 
+	@Test
+	public void cornerSpr10115() {
+		Spr10115Bean foo = new Spr10115Bean();
+		BeanWrapperImpl bwi = new BeanWrapperImpl();
+		bwi.setWrappedInstance(foo);
+		bwi.setPropertyValue("prop1", "val1");
+		assertEquals("val1", Spr10115Bean.prop1);
+	}
+
+
+	static class Spr10115Bean {
+		private static String prop1;
+
+		public static void setProp1(String prop1) {
+			Spr10115Bean.prop1 = prop1;
+		}
+	}
+
 
 	private static class Foo {
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java b/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
index fd53b58af71..44062a9107b 100644
--- a/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
@@ -946,4 +946,28 @@ public class ExtendedBeanInfoTests {
 			assertThat(hasIndexedWriteMethodForProperty(bi, "address"), is(true));
 		}
 	}
+
+	@Test
+	public void shouldSupportStaticWriteMethod() throws IntrospectionException {
+		{
+			BeanInfo bi = Introspector.getBeanInfo(WithStaticWriteMethod.class);
+			assertThat(hasReadMethodForProperty(bi, "prop1"), is(false));
+			assertThat(hasWriteMethodForProperty(bi, "prop1"), is(false));
+			assertThat(hasIndexedReadMethodForProperty(bi, "prop1"), is(false));
+			assertThat(hasIndexedWriteMethodForProperty(bi, "prop1"), is(false));
+		}
+		{
+			BeanInfo bi = new ExtendedBeanInfo(Introspector.getBeanInfo(WithStaticWriteMethod.class));
+			assertThat(hasReadMethodForProperty(bi, "prop1"), is(false));
+			assertThat(hasWriteMethodForProperty(bi, "prop1"), is(true));
+			assertThat(hasIndexedReadMethodForProperty(bi, "prop1"), is(false));
+			assertThat(hasIndexedWriteMethodForProperty(bi, "prop1"), is(false));
+		}
+	}
+
+	static class WithStaticWriteMethod {
+		@SuppressWarnings("unused")
+		public static void setProp1(String prop1) {
+		}
+	}
 }

From 938c24bb9e36375f8289082d2f4de047a5da1cda Mon Sep 17 00:00:00 2001
From: Phillip Webb 
Date: Tue, 1 Jan 2013 12:20:49 -0800
Subject: [PATCH 13/34] Improve 'build' folder ignores

Update .gitignore to only ignore 'build' folders in the project roots
rather than throughout the source tree.
---
 .gitignore | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index c79bac73423..c9e0aca55ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,12 +13,15 @@ jmx.log
 derby.log
 spring-test/test-output/
 .gradle
-build
 .classpath
 .project
 argfile*
 pom.xml
 
+/build
+buildSrc/build
+/spring-*/build
+
 # IDEA artifacts and output dirs
 *.iml
 *.ipr

From 9364043a6436dc8ea170ed4c4cac62088660ef13 Mon Sep 17 00:00:00 2001
From: Phillip Webb 
Date: Tue, 1 Jan 2013 13:26:49 -0800
Subject: [PATCH 14/34] Upgrade to xmlunit version 1.3

---
 build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index b2e7af70c62..82f21df72db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -258,7 +258,7 @@ project("spring-core") {
 		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 		optional("net.sf.jopt-simple:jopt-simple:3.0")
 		optional("log4j:log4j:1.2.17")
-		testCompile("xmlunit:xmlunit:1.2")
+		testCompile("xmlunit:xmlunit:1.3")
 		testCompile("org.codehaus.woodstox:wstx-asl:3.2.7")
 	}
 
@@ -395,7 +395,7 @@ project("spring-oxm") {
 		optional("org.apache.xmlbeans:xmlbeans:2.4.0")
 		optional("org.codehaus.castor:castor-xml:1.3.2")
 		testCompile("org.codehaus.jettison:jettison:1.0.1")
-		testCompile("xmlunit:xmlunit:1.2")
+		testCompile("xmlunit:xmlunit:1.3")
 		testCompile("xmlpull:xmlpull:1.1.3.4a")
 		testCompile(files(genCastor.classesDir).builtBy(genCastor))
 		testCompile(files(genJaxb.classesDir).builtBy(genJaxb))
@@ -500,7 +500,7 @@ project("spring-web") {
 		}
 		optional("log4j:log4j:1.2.17")
 		testCompile(project(":spring-context-support"))  // for JafMediaTypeFactory
-		testCompile("xmlunit:xmlunit:1.2")
+		testCompile("xmlunit:xmlunit:1.3")
 	}
 
 	// pick up ContextLoader.properties in src/main
@@ -592,7 +592,7 @@ project("spring-webmvc") {
 		testCompile(project(":spring-aop"))
 		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 		testCompile("rhino:js:1.7R1")
-		testCompile("xmlunit:xmlunit:1.2")
+		testCompile("xmlunit:xmlunit:1.3")
 		testCompile("dom4j:dom4j:1.6.1") {
 			exclude group: "xml-apis", module: "xml-apis"
 		}
@@ -701,7 +701,7 @@ project("spring-test-mvc") {
 		provided("javax.servlet:javax.servlet-api:3.0.1")
 		optional("org.hamcrest:hamcrest-core:1.3")
 		optional("com.jayway.jsonpath:json-path:0.8.1")
-		optional("xmlunit:xmlunit:1.2")
+		optional("xmlunit:xmlunit:1.3")
 		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 		testCompile("javax.servlet:jstl:1.2")
 		testCompile("org.hibernate:hibernate-validator:4.3.0.Final")

From 6626a38730050c83a0dd6cdc1bfc510024e9ca95 Mon Sep 17 00:00:00 2001
From: Phillip Webb 
Date: Mon, 31 Dec 2012 13:08:39 -0800
Subject: [PATCH 15/34] Fix [deprecation] compiler warnings

Fix deprecation compiler warnings by refactoring code or applying
@SuppressWarnings("deprecation") annotations. JUnit tests of
internally deprecated classes are now themselves marked as
@Deprecated.

Numerous EasyMock deprecation warnings will remain until the
migration to mockito can be completed.
---
 ...AopNamespaceHandlerPointcutErrorTests.java |  14 +-
 .../aop/framework/PrototypeTargetTests.java   |  17 +-
 .../ExposeInvocationInterceptorTests.java     |   9 +-
 .../aop/scope/ScopedProxyAutowireTests.java   |   9 +-
 ...MethodPointcutAdvisorIntegrationTests.java |  13 +-
 .../target/HotSwappableTargetSourceTests.java |  12 +-
 .../aop/target/LazyInitTargetSourceTests.java |  16 +-
 .../PrototypeBasedTargetSourceTests.java      |   6 +-
 .../target/PrototypeTargetSourceTests.java    |   7 +-
 .../target/ThreadLocalTargetSourceTests.java  |  12 +-
 ...nDrivenStaticEntityMockingControlTest.java |  26 +-
 .../mock/staticmock/Delegate.java             |  10 +-
 .../config/CustomEditorConfigurer.java        |   2 +
 .../xml/BeanDefinitionParserDelegate.java     |   1 +
 .../factory/xml/ResourceEntityResolver.java   |   4 +-
 .../ComponentBeanDefinitionParserTest.java    |  18 +-
 .../beans/factory/BeanFactoryUtilsTests.java  |  27 +-
 .../factory/ConcurrentBeanFactoryTests.java   |   9 +-
 .../DefaultListableBeanFactoryTests.java      | 100 +++++---
 .../beans/factory/FactoryBeanLookupTests.java |   8 +-
 .../beans/factory/FactoryBeanTests.java       |  16 +-
 ...wiredAnnotationBeanPostProcessorTests.java |  23 +-
 ...njectAnnotationBeanPostProcessorTests.java |   9 +-
 .../config/CommonsLogFactoryBeanTests.java    |   3 +-
 .../config/CustomEditorConfigurerTests.java   |  28 ++-
 .../config/DeprecatedBeanWarnerTests.java     |   1 +
 ...ObjectFactoryCreatingFactoryBeanTests.java |  23 +-
 .../config/PropertyPathFactoryBeanTests.java  |  20 +-
 .../PropertyResourceConfigurerTests.java      |  10 +-
 .../support/BeanDefinitionBuilderTests.java   |   7 +-
 .../factory/support/BeanDefinitionTests.java  |   8 +-
 .../support/BeanFactoryGenericsTests.java     |  68 +++--
 .../security/CallbacksSecurityTests.java      |  17 +-
 .../factory/xml/AbstractBeanFactoryTests.java |   5 +-
 .../xml/AbstractListableBeanFactoryTests.java |  22 +-
 .../xml/AutowireWithExclusionTests.java       |  61 +++--
 .../xml/CollectingReaderEventListener.java    |   7 +-
 .../xml/CollectionsWithDefaultTypesTests.java |  17 +-
 .../xml/DefaultLifecycleMethodsTests.java     |  11 +-
 .../factory/xml/MetadataAttachmentTests.java  |   7 +-
 .../xml/ProfileXmlBeanDefinitionTests.java    |   2 +-
 ...impleConstructorNamespaceHandlerTests.java |  30 ++-
 .../SimplePropertyNamespaceHandlerTests.java  |  29 ++-
 .../factory/xml/XmlBeanCollectionTests.java   |  21 +-
 .../xml/XmlListableBeanFactoryTests.java      | 130 +++++-----
 .../mail/javamail/JavaMailSenderTests.java    |   8 +-
 .../scheduling/quartz/QuartzSupportTests.java |   5 +-
 .../JasperReportsUtilsTests.java              |   2 +-
 .../weaving/DefaultContextLoadTimeWeaver.java |   1 +
 .../config/ScriptBeanDefinitionParser.java    |   1 +
 .../scripting/jruby/JRubyScriptUtils.java     |   1 +
 .../aop/framework/ProxyFactoryBeanTests.java  |  81 ++++--
 .../autoproxy/AutoProxyCreatorTests.java      |   3 +-
 .../aop/scope/ScopedProxyTests.java           |  20 +-
 .../target/CommonsPoolTargetSourceTests.java  |  14 +-
 .../factory/AbstractBeanFactoryTests.java     |   5 +-
 .../AbstractListableBeanFactoryTests.java     |  22 +-
 .../CollectingReaderEventListener.java        |   7 +-
 .../factory/xml/XmlBeanFactoryTests.java      | 232 ++++++++++++------
 .../AnnotationNamespaceDrivenTests.java       |   6 +-
 .../cache/config/EnableCachingTests.java      |   5 +-
 ...ntextSingletonBeanFactoryLocatorTests.java |  14 +-
 ...ommonAnnotationBeanPostProcessorTests.java |  21 +-
 .../AutowiredConfigurationTests.java          |   7 +-
 ...figurationClassAspectIntegrationTests.java |  13 +-
 .../EventPublicationInterceptorTests.java     |   2 +-
 ...ticApplicationContextMulticasterTests.java |   4 +-
 .../StaticApplicationContextTests.java        |   4 +-
 .../support/StaticMessageSourceTests.java     |   4 +-
 .../FormattingConversionServiceTests.java     |   5 +-
 .../jmx/export/MBeanExporterTests.java        |  14 +-
 .../ConcurrentTaskExecutorTests.java          |   3 +-
 .../scheduling/timer/TimerSupportTests.java   |   1 +
 .../timer/TimerTaskExecutorTests.java         |   1 +
 .../jruby/JRubyScriptFactoryTests.java        |  33 ++-
 .../ScriptFactoryPostProcessorTests.java      |   2 +-
 .../DataBinderFieldAccessTests.java           |   5 +-
 .../core/CollectionFactoryTests.java          |   5 +
 .../GenericCollectionTypeResolverTests.java   |   6 +-
 .../core/NestedExceptionTests.java            |   5 +-
 .../support/DefaultConversionTests.java       |   2 +-
 .../core/enums/LabeledEnumTests.java          |   1 +
 .../ResourceArrayPropertyEditorTests.java     |   5 +-
 .../core/style/ToStringCreatorTests.java      |   7 +-
 .../util/AutoPopulatingListTests.java         |   5 +-
 .../util/CachingMapDecoratorTests.java        |   1 +
 .../springframework/util/ClassUtilsTests.java |  78 +++---
 .../util/xml/StaxSourceTests.java             |  10 +-
 .../spel/DefaultComparatorUnitTests.java      |  63 ++---
 .../spel/ExpressionLanguageScenarioTests.java |  47 ++--
 .../expression/spel/ExpressionStateTests.java | 119 ++++-----
 .../expression/spel/ExpressionTestCase.java   |  87 +++----
 ...essionTestsUsingCoreConversionService.java |   6 +-
 .../expression/spel/InProgressTests.java      |  12 +-
 .../spel/LiteralExpressionTests.java          |  44 ++--
 .../expression/spel/LiteralTests.java         |   9 +-
 .../expression/spel/MapAccessTests.java       |  10 +-
 .../spel/OperatorOverloaderTests.java         |   8 +-
 .../expression/spel/OperatorTests.java        |  35 +--
 .../expression/spel/ParsingTests.java         |   9 +-
 .../expression/spel/PerformanceTests.java     |  19 +-
 .../expression/spel/PropertyAccessTests.java  |  38 +--
 .../spel/ScenariosForSpringSecurity.java      |  26 +-
 .../expression/spel/SetValueTests.java        |  48 ++--
 .../spel/SpelDocumentationTests.java          | 111 +++++----
 .../spel/StandardTypeLocatorTests.java        |  26 +-
 .../spel/TemplateExpressionParsingTests.java  | 117 ++++-----
 .../spel/VariableAndFunctionTests.java        |   6 +-
 .../spel/support/ReflectionHelperTests.java   | 177 ++++++-------
 .../config/JdbcNamespaceIntegrationTests.java |  16 +-
 .../jdbc/core/JdbcTemplateTests.java          |   1 -
 .../core/simple/SimpleJdbcTemplateTests.java  |   1 +
 .../jdbc/object/GenericSqlQueryTests.java     |   7 +-
 .../object/GenericStoredProcedureTests.java   |   7 +-
 .../LocalSessionFactoryBeanTests.java         |   9 +-
 .../oxm/castor/CastorMarshallerTests.java     |  20 +-
 .../oxm/jaxb/Jaxb2MarshallerTests.java        |  26 +-
 .../view/tiles/TestComponentController.java   |   1 +
 .../servlet/view/tiles/TilesViewTests.java    |   1 +
 .../springframework/test/AssertThrows.java    |   2 +-
 .../CollectingReaderEventListener.java        |   7 +-
 .../BeanFactoryTransactionTests.java          |  14 +-
 .../web/util/UrlPathHelper.java               |   1 +
 .../CommonsHttpRequestFactoryTests.java       |   1 +
 .../xml/SourceHttpMessageConverterTests.java  |  19 +-
 .../web/test/MockExpressionEvaluator.java     |   1 +
 .../mock/web/test/MockPageContext.java        |   4 +-
 .../remoting/jaxrpc/JaxRpcSupportTests.java   |   1 +
 .../jsf/DelegatingVariableResolverTests.java  |   1 +
 .../CommonsMultipartResolverTests.java        |  11 +-
 .../util/ExpressionEvaluationUtilsTests.java  |   1 +
 .../web/util/UriUtilsTests.java               |   3 +
 .../factory/AbstractBeanFactoryTests.java     |   5 +-
 .../AbstractListableBeanFactoryTests.java     |  22 +-
 .../bind/PortletRequestDataBinderTests.java   |   4 +-
 .../portlet/mvc/CommandControllerTests.java   |   1 +
 .../web/context/AbstractBeanFactoryTests.java |   3 +-
 .../AbstractListableBeanFactoryTests.java     |  18 +-
 .../support/ServletContextSupportTests.java   |  24 +-
 .../web/servlet/DispatcherServletTests.java   |   5 +-
 .../web/servlet/mvc/FormControllerTests.java  |   1 +
 .../mvc/WizardFormControllerTests.java        |   1 +
 ...onMethodHandlerExceptionResolverTests.java |   1 +
 ...estSpecificMappingInfoComparatorTests.java |   1 +
 .../ServletAnnotationControllerTests.java     |  10 +-
 .../ServletAnnotationMappingUtilsTests.java   |   5 +-
 .../servlet/mvc/annotation/Spr7766Tests.java  |   1 +
 .../servlet/mvc/annotation/Spr7839Tests.java  |   1 +
 ...plateServletAnnotationControllerTests.java |   4 +-
 .../web/servlet/mvc/mapping/BuyForm.java      |   3 +-
 .../AbstractServletHandlerMethodTests.java    |   2 +-
 .../view/velocity/VelocityRenderTests.java    |   2 +-
 .../servlet/view/xslt/TestXsltViewTests.java  |   1 +
 153 files changed, 1665 insertions(+), 1188 deletions(-)

diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java
index ba0b767921d..19ea1742c0b 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java
@@ -16,13 +16,15 @@
 
 package org.springframework.aop.config;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static test.util.TestResourceUtils.qualifiedResource;
 
 import org.junit.Test;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 
 /**
  * @author Mark Fisher
@@ -33,7 +35,9 @@ public final class AopNamespaceHandlerPointcutErrorTests {
 	@Test
 	public void testDuplicatePointcutConfig() {
 		try {
-			new XmlBeanFactory(qualifiedResource(getClass(), "pointcutDuplication.xml"));
+			DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+			new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
+					qualifiedResource(getClass(), "pointcutDuplication.xml"));
 			fail("parsing should have caused a BeanDefinitionStoreException");
 		}
 		catch (BeanDefinitionStoreException ex) {
@@ -44,7 +48,9 @@ public final class AopNamespaceHandlerPointcutErrorTests {
 	@Test
 	public void testMissingPointcutConfig() {
 		try {
-			new XmlBeanFactory(qualifiedResource(getClass(), "pointcutMissing.xml"));
+			DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+			new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
+					qualifiedResource(getClass(), "pointcutMissing.xml"));
 			fail("parsing should have caused a BeanDefinitionStoreException");
 		}
 		catch (BeanDefinitionStoreException ex) {
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java
index 05a0fc327af..7f5a4bc4376 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java
@@ -22,7 +22,8 @@ import static test.util.TestResourceUtils.qualifiedResource;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 import org.junit.Test;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 
 /**
@@ -37,12 +38,13 @@ public final class PrototypeTargetTests {
 	@Test
 	public void testPrototypeProxyWithPrototypeTarget() {
 		TestBeanImpl.constructionCount = 0;
-		XmlBeanFactory xbf = new XmlBeanFactory(CONTEXT);
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(CONTEXT);
 		for (int i = 0; i < 10; i++) {
-			TestBean tb = (TestBean) xbf.getBean("testBeanPrototype");
+			TestBean tb = (TestBean) bf.getBean("testBeanPrototype");
 			tb.doSomething();
 		}
-		TestInterceptor interceptor = (TestInterceptor) xbf.getBean("testInterceptor");
+		TestInterceptor interceptor = (TestInterceptor) bf.getBean("testInterceptor");
 		assertEquals(10, TestBeanImpl.constructionCount);
 		assertEquals(10, interceptor.invocationCount);
 	}
@@ -50,12 +52,13 @@ public final class PrototypeTargetTests {
 	@Test
 	public void testSingletonProxyWithPrototypeTarget() {
 		TestBeanImpl.constructionCount = 0;
-		XmlBeanFactory xbf = new XmlBeanFactory(CONTEXT);
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(CONTEXT);
 		for (int i = 0; i < 10; i++) {
-			TestBean tb = (TestBean) xbf.getBean("testBeanSingleton");
+			TestBean tb = (TestBean) bf.getBean("testBeanSingleton");
 			tb.doSomething();
 		}
-		TestInterceptor interceptor = (TestInterceptor) xbf.getBean("testInterceptor");
+		TestInterceptor interceptor = (TestInterceptor) bf.getBean("testInterceptor");
 		assertEquals(1, TestBeanImpl.constructionCount);
 		assertEquals(10, interceptor.invocationCount);
 	}
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java
index ae224b6385c..632c5bad07d 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java
@@ -16,12 +16,14 @@
 
 package org.springframework.aop.interceptor;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static test.util.TestResourceUtils.qualifiedResource;
 
 import org.aopalliance.intercept.MethodInvocation;
 import org.junit.Test;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 
 import test.beans.ITestBean;
@@ -40,7 +42,8 @@ public final class ExposeInvocationInterceptorTests {
 
 	@Test
 	public void testXmlConfig() {
-		XmlBeanFactory bf = new XmlBeanFactory(CONTEXT);
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(CONTEXT);
 		ITestBean tb = (ITestBean) bf.getBean("proxy");
 		String name= "tony";
 		tb.setName(name);
diff --git a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java
index f44b215755e..ccbe9502bfa 100644
--- a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java
@@ -20,7 +20,8 @@ import static org.junit.Assert.assertSame;
 import static test.util.TestResourceUtils.qualifiedResource;
 
 import org.junit.Test;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 
 /**
@@ -36,7 +37,8 @@ public final class ScopedProxyAutowireTests {
 
 	@Test
 	public void testScopedProxyInheritsAutowireCandidateFalse() {
-		XmlBeanFactory bf = new XmlBeanFactory(SCOPED_AUTOWIRE_FALSE_CONTEXT);
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(SCOPED_AUTOWIRE_FALSE_CONTEXT);
 		TestBean autowired = (TestBean) bf.getBean("autowired");
 		TestBean unscoped = (TestBean) bf.getBean("unscoped");
 		assertSame(unscoped, autowired.getChild());
@@ -44,7 +46,8 @@ public final class ScopedProxyAutowireTests {
 
 	@Test
 	public void testScopedProxyReplacesAutowireCandidateTrue() {
-		XmlBeanFactory bf = new XmlBeanFactory(SCOPED_AUTOWIRE_TRUE_CONTEXT);
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(SCOPED_AUTOWIRE_TRUE_CONTEXT);
 		TestBean autowired = (TestBean) bf.getBean("autowired");
 		TestBean scoped = (TestBean) bf.getBean("scoped");
 		assertSame(scoped, autowired.getChild());
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
index e52d9b14e0e..b55f2bb9f90 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
@@ -21,8 +21,8 @@ import static test.util.TestResourceUtils.qualifiedResource;
 
 import org.junit.Test;
 import org.springframework.aop.framework.Advised;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 
 import test.aop.NopInterceptor;
@@ -43,7 +43,8 @@ public final class RegexpMethodPointcutAdvisorIntegrationTests {
 
 	@Test
 	public void testSinglePattern() throws Throwable {
-		BeanFactory bf = new XmlBeanFactory(CONTEXT);
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(CONTEXT);
 		ITestBean advised = (ITestBean) bf.getBean("settersAdvised");
 		// Interceptor behind regexp advisor
 		NopInterceptor nop = (NopInterceptor) bf.getBean("nopInterceptor");
@@ -61,7 +62,8 @@ public final class RegexpMethodPointcutAdvisorIntegrationTests {
 
 	@Test
 	public void testMultiplePatterns() throws Throwable {
-		BeanFactory bf = new XmlBeanFactory(CONTEXT);
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(CONTEXT);
 		// This is a CGLIB proxy, so we can proxy it to the target class
 		TestBean advised = (TestBean) bf.getBean("settersAndAbsquatulateAdvised");
 		// Interceptor behind regexp advisor
@@ -84,7 +86,8 @@ public final class RegexpMethodPointcutAdvisorIntegrationTests {
 
 	@Test
 	public void testSerialization() throws Throwable {
-		BeanFactory bf = new XmlBeanFactory(CONTEXT);
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(CONTEXT);
 		// This is a CGLIB proxy, so we can proxy it to the target class
 		Person p = (Person) bf.getBean("serializableSettersAdvised");
 		// Interceptor behind regexp advisor
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
index b3d6ceef18e..cb897b602f1 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
@@ -16,7 +16,9 @@
 
 package org.springframework.aop.target;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static test.util.TestResourceUtils.qualifiedResource;
 
 import org.junit.After;
@@ -25,7 +27,8 @@ import org.junit.Test;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 
 import test.aop.SerializableNopInterceptor;
@@ -46,11 +49,12 @@ public final class HotSwappableTargetSourceTests {
 	/** Initial count value set in bean factory XML */
 	private static final int INITIAL_COUNT = 10;
 
-	private XmlBeanFactory beanFactory;
+	private DefaultListableBeanFactory beanFactory;
 
 	@Before
 	public void setUp() throws Exception {
-		this.beanFactory = new XmlBeanFactory(CONTEXT);
+		this.beanFactory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(this.beanFactory).loadBeanDefinitions(CONTEXT);
 	}
 
 	/**
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
index 984261bcc96..57cedd275bc 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
@@ -16,13 +16,16 @@
 
 package org.springframework.aop.target;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static test.util.TestResourceUtils.qualifiedResource;
 
 import java.util.Set;
 
 import org.junit.Test;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 
 import test.beans.ITestBean;
@@ -43,7 +46,8 @@ public final class LazyInitTargetSourceTests {
 
 	@Test
 	public void testLazyInitSingletonTargetSource() {
-		XmlBeanFactory bf = new XmlBeanFactory(SINGLETON_CONTEXT);
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(SINGLETON_CONTEXT);
 		bf.preInstantiateSingletons();
 
 		ITestBean tb = (ITestBean) bf.getBean("proxy");
@@ -54,7 +58,8 @@ public final class LazyInitTargetSourceTests {
 
 	@Test
 	public void testCustomLazyInitSingletonTargetSource() {
-		XmlBeanFactory bf = new XmlBeanFactory(CUSTOM_TARGET_CONTEXT);
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(CUSTOM_TARGET_CONTEXT);
 		bf.preInstantiateSingletons();
 
 		ITestBean tb = (ITestBean) bf.getBean("proxy");
@@ -65,7 +70,8 @@ public final class LazyInitTargetSourceTests {
 
 	@Test
 	public void testLazyInitFactoryBeanTargetSource() {
-		XmlBeanFactory bf = new XmlBeanFactory(FACTORY_BEAN_CONTEXT);
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(FACTORY_BEAN_CONTEXT);
 		bf.preInstantiateSingletons();
 
 		Set set1 = (Set) bf.getBean("proxy1");
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
index 93205fb1b9e..ea2eef2ae13 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
@@ -41,10 +41,12 @@ public final class PrototypeBasedTargetSourceTests {
 	public void testSerializability() throws Exception {
 		MutablePropertyValues tsPvs = new MutablePropertyValues();
 		tsPvs.add("targetBeanName", "person");
-		RootBeanDefinition tsBd = new RootBeanDefinition(TestTargetSource.class, tsPvs);
+		RootBeanDefinition tsBd = new RootBeanDefinition(TestTargetSource.class);
+		tsBd.setPropertyValues(tsPvs);
 
 		MutablePropertyValues pvs = new MutablePropertyValues();
-		RootBeanDefinition bd = new RootBeanDefinition(SerializablePerson.class, pvs);
+		RootBeanDefinition bd = new RootBeanDefinition(SerializablePerson.class);
+		bd.setPropertyValues(pvs);
 		bd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
 
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java
index 204f3d8abdb..700317fc8bd 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests.java
@@ -22,7 +22,9 @@ import static test.util.TestResourceUtils.qualifiedResource;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 
 import test.beans.SideEffectBean;
@@ -43,7 +45,8 @@ public final class PrototypeTargetSourceTests {
 
 	@Before
 	public void setUp() throws Exception {
-		this.beanFactory = new XmlBeanFactory(CONTEXT);
+		this.beanFactory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader((BeanDefinitionRegistry) this.beanFactory).loadBeanDefinitions(CONTEXT);
 	}
 
 	/**
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java
index c896b9e638c..1a6d5be3e30 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java
@@ -16,12 +16,15 @@
 
 package org.springframework.aop.target;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
 import static test.util.TestResourceUtils.qualifiedResource;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 
 import test.beans.ITestBean;
@@ -39,11 +42,12 @@ public class ThreadLocalTargetSourceTests {
 	/** Initial count value set in bean factory XML */
 	private static final int INITIAL_COUNT = 10;
 
-	private XmlBeanFactory beanFactory;
+	private DefaultListableBeanFactory beanFactory;
 
 	@Before
 	public void setUp() throws Exception {
-		this.beanFactory = new XmlBeanFactory(CONTEXT);
+		this.beanFactory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(this.beanFactory).loadBeanDefinitions(CONTEXT);
 	}
 
 	/**
diff --git a/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java b/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java
index 8c1584fc99c..5a531301c9a 100644
--- a/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java
+++ b/spring-aspects/src/test/java/org/springframework/mock/staticmock/AnnotationDrivenStaticEntityMockingControlTest.java
@@ -16,16 +16,18 @@
 
 package org.springframework.mock.staticmock;
 
-import javax.persistence.PersistenceException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.springframework.mock.staticmock.AnnotationDrivenStaticEntityMockingControl.expectReturn;
+import static org.springframework.mock.staticmock.AnnotationDrivenStaticEntityMockingControl.expectThrow;
+import static org.springframework.mock.staticmock.AnnotationDrivenStaticEntityMockingControl.playback;
 
-import junit.framework.Assert;
+import javax.persistence.PersistenceException;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import static org.springframework.mock.staticmock.AnnotationDrivenStaticEntityMockingControl.*;
-
 
 /**
  * Test for static entity mocking framework.
@@ -43,7 +45,7 @@ public class AnnotationDrivenStaticEntityMockingControlTest {
 		Person.countPeople();
 		expectReturn(expectedCount);
 		playback();
-		Assert.assertEquals(expectedCount, Person.countPeople());
+		assertEquals(expectedCount, Person.countPeople());
 	}
 
 	@Test(expected=PersistenceException.class)
@@ -61,7 +63,7 @@ public class AnnotationDrivenStaticEntityMockingControlTest {
 		Person.findPerson(id);
 		expectReturn(found);
 		playback();
-		Assert.assertEquals(found, Person.findPerson(id));
+		assertEquals(found, Person.findPerson(id));
 	}
 
 
@@ -81,10 +83,10 @@ public class AnnotationDrivenStaticEntityMockingControlTest {
 		expectReturn(0);
 		playback();
 
-		Assert.assertEquals(found1, Person.findPerson(id1));
-		Assert.assertEquals(found2, Person.findPerson(id2));
-		Assert.assertEquals(found1, Person.findPerson(id1));
-		Assert.assertEquals(0, Person.countPeople());
+		assertEquals(found1, Person.findPerson(id1));
+		assertEquals(found2, Person.findPerson(id2));
+		assertEquals(found1, Person.findPerson(id1));
+		assertEquals(0, Person.countPeople());
 	}
 
 	// Note delegation is used when tests are invalid and should fail, as otherwise
@@ -94,7 +96,7 @@ public class AnnotationDrivenStaticEntityMockingControlTest {
 	public void testArgMethodNoMatchExpectReturn() {
 		try {
 			new Delegate().testArgMethodNoMatchExpectReturn();
-			Assert.fail();
+			fail();
 		} catch (IllegalArgumentException expected) {
 		}
 	}
@@ -105,7 +107,7 @@ public class AnnotationDrivenStaticEntityMockingControlTest {
 	}
 
 	private void called(Person found, long id) {
-		Assert.assertEquals(found, Person.findPerson(id));
+		assertEquals(found, Person.findPerson(id));
 	}
 
 	@Test
diff --git a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java
index ad9bac54438..d4b3206bc36 100644
--- a/spring-aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java
+++ b/spring-aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java
@@ -16,12 +16,12 @@
 
 package org.springframework.mock.staticmock;
 
+import static org.junit.Assert.assertEquals;
+
 import java.rmi.RemoteException;
 
 import javax.persistence.PersistenceException;
 
-import junit.framework.Assert;
-
 import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.mock.staticmock.AnnotationDrivenStaticEntityMockingControl;
@@ -40,7 +40,7 @@ public class Delegate {
 		Person.findPerson(id);
 		AnnotationDrivenStaticEntityMockingControl.expectReturn(found);
 		AnnotationDrivenStaticEntityMockingControl.playback();
-		Assert.assertEquals(found, Person.findPerson(id + 1));
+		assertEquals(found, Person.findPerson(id + 1));
 	}
 
 	@Test
@@ -50,7 +50,7 @@ public class Delegate {
 		Person.findPerson(id);
 		AnnotationDrivenStaticEntityMockingControl.expectThrow(new PersistenceException());
 		AnnotationDrivenStaticEntityMockingControl.playback();
-		Assert.assertEquals(found, Person.findPerson(id + 1));
+		assertEquals(found, Person.findPerson(id + 1));
 	}
 
 	@Test
@@ -62,7 +62,7 @@ public class Delegate {
 		Person.countPeople();
 		AnnotationDrivenStaticEntityMockingControl.expectReturn(25);
 		AnnotationDrivenStaticEntityMockingControl.playback();
-		Assert.assertEquals(found, Person.findPerson(id));
+		assertEquals(found, Person.findPerson(id));
 	}
 
 	@Test
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java
index f155dedbdf0..03e5716fdd7 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/CustomEditorConfigurer.java
@@ -234,6 +234,8 @@ public class CustomEditorConfigurer implements BeanFactoryPostProcessor, BeanCla
 			this.sharedEditor = sharedEditor;
 		}
 
+		@Override
+		@SuppressWarnings("deprecation")
 		public void registerCustomEditors(PropertyEditorRegistry registry) {
 			if (!(registry instanceof PropertyEditorRegistrySupport)) {
 				throw new IllegalArgumentException("Cannot registered shared editor " +
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
index 359975c1ce7..de4c3e695ed 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
@@ -716,6 +716,7 @@ public class BeanDefinitionParserDelegate {
 		}
 	}
 
+	@SuppressWarnings("deprecation")
 	public int getAutowireMode(String attValue) {
 		String att = attValue;
 		if (DEFAULT_VALUE.equals(att)) {
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java
index 63e5a39f2d1..b7e440d6471 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/xml/ResourceEntityResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -77,7 +77,7 @@ public class ResourceEntityResolver extends DelegatingEntityResolver {
 			try {
 				String decodedSystemId = URLDecoder.decode(systemId);
 				String givenUrl = new URL(decodedSystemId).toString();
-				String systemRootUrl = new File("").toURL().toString();
+				String systemRootUrl = new File("").toURI().toURL().toString();
 				// Try relative to resource base if currently in system root.
 				if (givenUrl.startsWith(systemRootUrl)) {
 					resourcePath = givenUrl.substring(systemRootUrl.length());
diff --git a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java b/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java
index b3e62ba2b82..a7a38f2c480 100644
--- a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java
+++ b/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java
@@ -15,28 +15,30 @@
  */
 package com.foo;
 
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+
 import java.util.List;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;
 
-import static org.junit.Assert.*;
-import static org.hamcrest.CoreMatchers.*;
-
 /**
  * @author Costin Leau
  */
 public class ComponentBeanDefinitionParserTest {
 
-	private static XmlBeanFactory bf;
+	private static DefaultListableBeanFactory bf;
 
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		bf = new XmlBeanFactory(new ClassPathResource(
-				"com/foo/component-config.xml"));
+		bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
+				new ClassPathResource("com/foo/component-config.xml"));
 	}
 
 	@AfterClass
@@ -71,4 +73,4 @@ public class ComponentBeanDefinitionParserTest {
 		assertThat("Karate-1", equalTo(components.get(0).getName()));
 		assertThat("Sport-1", equalTo(components.get(1).getName()));
 	}
-}
\ No newline at end of file
+}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java
index 636fbda545f..d05f7ba577d 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java
@@ -16,16 +16,21 @@
 
 package org.springframework.beans.factory;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static test.util.TestResourceUtils.qualifiedResource;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
-
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.StaticListableBeanFactory;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.cglib.proxy.NoOp;
 import org.springframework.core.io.Resource;
 import org.springframework.util.ObjectUtils;
@@ -35,9 +40,6 @@ import test.beans.ITestBean;
 import test.beans.IndexedTestBean;
 import test.beans.TestBean;
 
-import static org.junit.Assert.*;
-import static test.util.TestResourceUtils.qualifiedResource;
-
 /**
  * @author Rod Johnson
  * @author Juergen Hoeller
@@ -60,10 +62,17 @@ public final class BeanFactoryUtilsTests {
 	public void setUp() {
 		// Interesting hierarchical factory to test counts.
 		// Slow to read so we cache it.
-		XmlBeanFactory grandParent = new XmlBeanFactory(ROOT_CONTEXT);
-		XmlBeanFactory parent = new XmlBeanFactory(MIDDLE_CONTEXT, grandParent);
-		XmlBeanFactory child = new XmlBeanFactory(LEAF_CONTEXT, parent);
-		this.dependentBeansBF = new XmlBeanFactory(DEPENDENT_BEANS_CONTEXT);
+
+
+		DefaultListableBeanFactory grandParent = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(grandParent).loadBeanDefinitions(ROOT_CONTEXT);
+		DefaultListableBeanFactory parent = new DefaultListableBeanFactory(grandParent);
+		new XmlBeanDefinitionReader(parent).loadBeanDefinitions(MIDDLE_CONTEXT);
+		DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
+		new XmlBeanDefinitionReader(child).loadBeanDefinitions(LEAF_CONTEXT);
+
+		this.dependentBeansBF = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader((BeanDefinitionRegistry) this.dependentBeansBF).loadBeanDefinitions(DEPENDENT_BEANS_CONTEXT);
 		dependentBeansBF.preInstantiateSingletons();
 		this.listableBeanFactory = child;
 	}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
index 967cd5d2b80..96eeb3b01f8 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
@@ -16,7 +16,8 @@
 
 package org.springframework.beans.factory;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 import static test.util.TestResourceUtils.qualifiedResource;
 
 import java.text.DateFormat;
@@ -34,7 +35,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.PropertyEditorRegistrar;
 import org.springframework.beans.PropertyEditorRegistry;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.core.io.Resource;
 
@@ -70,7 +72,8 @@ public final class ConcurrentBeanFactoryTests {
 
 	@Before
 	public void setUp() throws Exception {
-		XmlBeanFactory factory = new XmlBeanFactory(CONTEXT);
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(factory).loadBeanDefinitions(CONTEXT);
 		factory.addPropertyEditorRegistrar(new PropertyEditorRegistrar() {
 			@Override
 			public void registerCustomEditors(PropertyEditorRegistry registry) {
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
index 35f3420ca04..d3710f0c188 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
@@ -549,7 +549,9 @@ public class DefaultListableBeanFactoryTests {
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("spouse", new RuntimeBeanReference("self"));
-		lbf.registerBeanDefinition("self", new RootBeanDefinition(TestBean.class, pvs));
+		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
+		bd.setPropertyValues(pvs);
+		lbf.registerBeanDefinition("self", bd);
 		TestBean self = (TestBean) lbf.getBean("self");
 		assertEquals(self, self.getSpouse());
 	}
@@ -560,7 +562,9 @@ public class DefaultListableBeanFactoryTests {
 			DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 			MutablePropertyValues pvs = new MutablePropertyValues();
 			pvs.add("ag", "foobar");
-			lbf.registerBeanDefinition("tb", new RootBeanDefinition(TestBean.class, pvs));
+			RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
+			bd.setPropertyValues(pvs);
+			lbf.registerBeanDefinition("tb", bd);
 			lbf.getBean("tb");
 			fail("Should throw exception on invalid property");
 		}
@@ -846,7 +850,9 @@ public class DefaultListableBeanFactoryTests {
 		});
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("myFloat", "1,1");
-		lbf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class, pvs));
+		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
+		bd.setPropertyValues(pvs);
+		lbf.registerBeanDefinition("testBean", bd);
 		TestBean testBean = (TestBean) lbf.getBean("testBean");
 		assertTrue(testBean.getMyFloat().floatValue() == 1.1f);
 	}
@@ -870,7 +876,9 @@ public class DefaultListableBeanFactoryTests {
 		lbf.setConversionService(conversionService);
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("myFloat", "1,1");
-		lbf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class, pvs));
+		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
+		bd.setPropertyValues(pvs);
+		lbf.registerBeanDefinition("testBean", bd);
 		TestBean testBean = (TestBean) lbf.getBean("testBean");
 		assertTrue(testBean.getMyFloat().floatValue() == 1.1f);
 	}
@@ -887,7 +895,9 @@ public class DefaultListableBeanFactoryTests {
 		});
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("myFloat", new RuntimeBeanReference("myFloat"));
-		lbf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class, pvs));
+		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
+		bd.setPropertyValues(pvs);
+		lbf.registerBeanDefinition("testBean", bd);
 		lbf.registerSingleton("myFloat", "1,1");
 		TestBean testBean = (TestBean) lbf.getBean("testBean");
 		assertTrue(testBean.getMyFloat().floatValue() == 1.1f);
@@ -990,7 +1000,8 @@ public class DefaultListableBeanFactoryTests {
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("name", "Tony");
 		pvs.add("age", "48");
-		RootBeanDefinition bd = new RootBeanDefinition(DependenciesBean.class, pvs);
+		RootBeanDefinition bd = new RootBeanDefinition(DependenciesBean.class);
+		bd.setPropertyValues(pvs);
 		bd.setDependencyCheck(RootBeanDefinition.DEPENDENCY_CHECK_OBJECTS);
 		bd.setAutowireMode(RootBeanDefinition.AUTOWIRE_BY_TYPE);
 		lbf.registerBeanDefinition("test", bd);
@@ -1039,7 +1050,8 @@ public class DefaultListableBeanFactoryTests {
 		bf.registerSingleton("resource1", new UrlResource("http://localhost:8080"));
 		bf.registerSingleton("resource2", new UrlResource("http://localhost:9090"));
 
-		RootBeanDefinition rbd = new RootBeanDefinition(ArrayBean.class, RootBeanDefinition.AUTOWIRE_BY_TYPE);
+		RootBeanDefinition rbd = new RootBeanDefinition(ArrayBean.class);
+		rbd.setAutowireMode(RootBeanDefinition.AUTOWIRE_BY_TYPE);
 		bf.registerBeanDefinition("arrayBean", rbd);
 		ArrayBean ab = (ArrayBean) bf.getBean("arrayBean");
 
@@ -1051,7 +1063,8 @@ public class DefaultListableBeanFactoryTests {
 	public void testArrayPropertyWithOptionalAutowiring() throws MalformedURLException {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 
-		RootBeanDefinition rbd = new RootBeanDefinition(ArrayBean.class, RootBeanDefinition.AUTOWIRE_BY_TYPE);
+		RootBeanDefinition rbd = new RootBeanDefinition(ArrayBean.class);
+		rbd.setAutowireMode(RootBeanDefinition.AUTOWIRE_BY_TYPE);
 		bf.registerBeanDefinition("arrayBean", rbd);
 		ArrayBean ab = (ArrayBean) bf.getBean("arrayBean");
 
@@ -1064,7 +1077,8 @@ public class DefaultListableBeanFactoryTests {
 		bf.registerSingleton("integer1", new Integer(4));
 		bf.registerSingleton("integer2", new Integer(5));
 
-		RootBeanDefinition rbd = new RootBeanDefinition(ArrayBean.class, RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
+		RootBeanDefinition rbd = new RootBeanDefinition(ArrayBean.class);
+		rbd.setAutowireMode(RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
 		bf.registerBeanDefinition("arrayBean", rbd);
 		ArrayBean ab = (ArrayBean) bf.getBean("arrayBean");
 
@@ -1076,7 +1090,8 @@ public class DefaultListableBeanFactoryTests {
 	public void testArrayConstructorWithOptionalAutowiring() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 
-		RootBeanDefinition rbd = new RootBeanDefinition(ArrayBean.class, RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
+		RootBeanDefinition rbd = new RootBeanDefinition(ArrayBean.class);
+		rbd.setAutowireMode(RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
 		bf.registerBeanDefinition("arrayBean", rbd);
 		ArrayBean ab = (ArrayBean) bf.getBean("arrayBean");
 
@@ -1091,7 +1106,8 @@ public class DefaultListableBeanFactoryTests {
 		bf.registerSingleton("resource1", new UrlResource("http://localhost:8080"));
 		bf.registerSingleton("resource2", new UrlResource("http://localhost:9090"));
 
-		RootBeanDefinition rbd = new RootBeanDefinition(ArrayBean.class, RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
+		RootBeanDefinition rbd = new RootBeanDefinition(ArrayBean.class);
+		rbd.setAutowireMode(RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
 		bf.registerBeanDefinition("arrayBean", rbd);
 		ArrayBean ab = (ArrayBean) bf.getBean("arrayBean");
 
@@ -1107,7 +1123,8 @@ public class DefaultListableBeanFactoryTests {
 		bf.registerSingleton("resource1", new UrlResource("http://localhost:8080"));
 		bf.registerSingleton("resource2", new UrlResource("http://localhost:9090"));
 
-		RootBeanDefinition rbd = new RootBeanDefinition(ArrayBean.class, RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
+		RootBeanDefinition rbd = new RootBeanDefinition(ArrayBean.class);
+		rbd.setAutowireMode(RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
 		bf.registerBeanDefinition("arrayBean", rbd);
 		ArrayBean ab = (ArrayBean) bf.getBean("arrayBean");
 
@@ -1121,7 +1138,7 @@ public class DefaultListableBeanFactoryTests {
 		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
 		lbf.registerBeanDefinition("rod", bd);
 		assertEquals(1, lbf.getBeanDefinitionCount());
-		Object registered = lbf.autowire(NoDependencies.class, AutowireCapableBeanFactory.AUTOWIRE_AUTODETECT, false);
+		Object registered = lbf.autowire(NoDependencies.class, AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, false);
 		assertEquals(1, lbf.getBeanDefinitionCount());
 		assertTrue(registered instanceof NoDependencies);
 	}
@@ -1131,11 +1148,12 @@ public class DefaultListableBeanFactoryTests {
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("name", "Rod");
-		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class, pvs);
+		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
+		bd.setPropertyValues(pvs);
 		lbf.registerBeanDefinition("rod", bd);
 		assertEquals(1, lbf.getBeanDefinitionCount());
 		// Depends on age, name and spouse (TestBean)
-		Object registered = lbf.autowire(DependenciesBean.class, AutowireCapableBeanFactory.AUTOWIRE_AUTODETECT, true);
+		Object registered = lbf.autowire(DependenciesBean.class, AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, true);
 		assertEquals(1, lbf.getBeanDefinitionCount());
 		DependenciesBean kerry = (DependenciesBean) registered;
 		TestBean rod = (TestBean) lbf.getBean("rod");
@@ -1147,10 +1165,11 @@ public class DefaultListableBeanFactoryTests {
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("name", "Rod");
-		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class, pvs);
+		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
+		bd.setPropertyValues(pvs);
 		lbf.registerBeanDefinition("rod", bd);
 		assertEquals(1, lbf.getBeanDefinitionCount());
-		Object registered = lbf.autowire(ConstructorDependency.class, AutowireCapableBeanFactory.AUTOWIRE_AUTODETECT, false);
+		Object registered = lbf.autowire(ConstructorDependency.class, AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR, false);
 		assertEquals(1, lbf.getBeanDefinitionCount());
 		ConstructorDependency kerry = (ConstructorDependency) registered;
 		TestBean rod = (TestBean) lbf.getBean("rod");
@@ -1165,7 +1184,7 @@ public class DefaultListableBeanFactoryTests {
 		RootBeanDefinition bd2 = new RootBeanDefinition(TestBean.class);
 		lbf.registerBeanDefinition("rod2", bd2);
 		try {
-			lbf.autowire(ConstructorDependency.class, AutowireCapableBeanFactory.AUTOWIRE_AUTODETECT, false);
+			lbf.autowire(ConstructorDependency.class, AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR, false);
 			fail("Should have thrown UnsatisfiedDependencyException");
 		}
 		catch (UnsatisfiedDependencyException ex) {
@@ -1180,11 +1199,12 @@ public class DefaultListableBeanFactoryTests {
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.addPropertyValue(new PropertyValue("name", "Rod"));
-		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class, pvs);
+		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
+		bd.setPropertyValues(pvs);
 		lbf.registerBeanDefinition("rod", bd);
 		assertEquals(1, lbf.getBeanDefinitionCount());
 		try {
-			lbf.autowire(UnsatisfiedConstructorDependency.class, AutowireCapableBeanFactory.AUTOWIRE_AUTODETECT, true);
+			lbf.autowire(UnsatisfiedConstructorDependency.class, AutowireCapableBeanFactory.AUTOWIRE_CONSTRUCTOR, true);
 			fail("Should have unsatisfied constructor dependency on SideEffectBean");
 		}
 		catch (UnsatisfiedDependencyException ex) {
@@ -1467,7 +1487,9 @@ public class DefaultListableBeanFactoryTests {
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("age", "99");
-		lbf.registerBeanDefinition("test", new RootBeanDefinition(TestBean.class, pvs));
+		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
+		bd.setPropertyValues(pvs);
+		lbf.registerBeanDefinition("test", bd);
 		TestBean tb = new TestBean();
 		assertEquals(0, tb.getAge());
 		lbf.applyBeanPropertyValues(tb, "test");
@@ -1479,7 +1501,9 @@ public class DefaultListableBeanFactoryTests {
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("age", "99");
-		lbf.registerBeanDefinition("test", new RootBeanDefinition(null, pvs));
+		RootBeanDefinition bd = new RootBeanDefinition();
+		bd.setPropertyValues(pvs);
+		lbf.registerBeanDefinition("test", bd);
 		TestBean tb = new TestBean();
 		assertEquals(0, tb.getAge());
 		lbf.applyBeanPropertyValues(tb, "test");
@@ -1493,7 +1517,9 @@ public class DefaultListableBeanFactoryTests {
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("age", "99");
-		lbf.registerBeanDefinition("test", new RootBeanDefinition(TestBean.class, pvs));
+		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
+		bd.setPropertyValues(pvs);
+		lbf.registerBeanDefinition("test", bd);
 		TestBean tb = new TestBean();
 		assertEquals(0, tb.getAge());
 		lbf.configureBean(tb, "test");
@@ -1509,7 +1535,9 @@ public class DefaultListableBeanFactoryTests {
 		lbf.registerBeanDefinition("spouse", bd);
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("age", "99");
-		lbf.registerBeanDefinition("test", new RootBeanDefinition(TestBean.class, RootBeanDefinition.AUTOWIRE_BY_NAME));
+		RootBeanDefinition tbd = new RootBeanDefinition(TestBean.class);
+		tbd.setAutowireMode(RootBeanDefinition.AUTOWIRE_BY_NAME);
+		lbf.registerBeanDefinition("test", tbd);
 		TestBean tb = new TestBean();
 		lbf.configureBean(tb, "test");
 		assertSame(lbf, tb.getBeanFactory());
@@ -1523,7 +1551,8 @@ public class DefaultListableBeanFactoryTests {
 		for (int i = 0; i < 1000; i++) {
 			MutablePropertyValues pvs = new MutablePropertyValues();
 			pvs.addPropertyValue(new PropertyValue("spouse", new RuntimeBeanReference("bean" + (i < 99 ? i + 1 : 0))));
-			RootBeanDefinition bd = new RootBeanDefinition(TestBean.class, pvs);
+			RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
+			bd.setPropertyValues(pvs);
 			lbf.registerBeanDefinition("bean" + i, bd);
 		}
 		lbf.preInstantiateSingletons();
@@ -1537,7 +1566,9 @@ public class DefaultListableBeanFactoryTests {
 	@Test
 	public void testCircularReferenceThroughAutowiring() {
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
-		lbf.registerBeanDefinition("test", new RootBeanDefinition(ConstructorDependencyBean.class, RootBeanDefinition.AUTOWIRE_CONSTRUCTOR));
+		RootBeanDefinition bd = new RootBeanDefinition(ConstructorDependencyBean.class);
+		bd.setAutowireMode(RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
+		lbf.registerBeanDefinition("test", bd);
 		try {
 			lbf.preInstantiateSingletons();
 			fail("Should have thrown UnsatisfiedDependencyException");
@@ -1549,7 +1580,9 @@ public class DefaultListableBeanFactoryTests {
 	@Test
 	public void testCircularReferenceThroughFactoryBeanAutowiring() {
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
-		lbf.registerBeanDefinition("test", new RootBeanDefinition(ConstructorDependencyFactoryBean.class, RootBeanDefinition.AUTOWIRE_CONSTRUCTOR));
+		RootBeanDefinition bd = new RootBeanDefinition(ConstructorDependencyFactoryBean.class);
+		bd.setAutowireMode(RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
+		lbf.registerBeanDefinition("test", bd);
 		try {
 			lbf.preInstantiateSingletons();
 			fail("Should have thrown UnsatisfiedDependencyException");
@@ -1561,7 +1594,9 @@ public class DefaultListableBeanFactoryTests {
 	@Test
 	public void testCircularReferenceThroughFactoryBeanTypeCheck() {
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
-		lbf.registerBeanDefinition("test", new RootBeanDefinition(ConstructorDependencyFactoryBean.class, RootBeanDefinition.AUTOWIRE_CONSTRUCTOR));
+		RootBeanDefinition bd = new RootBeanDefinition(ConstructorDependencyFactoryBean.class);
+		bd.setAutowireMode(RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
+		lbf.registerBeanDefinition("test", bd);
 		try {
 			lbf.getBeansOfType(String.class);
 			fail("Should have thrown UnsatisfiedDependencyException");
@@ -1573,9 +1608,12 @@ public class DefaultListableBeanFactoryTests {
 	@Test
 	public void testAvoidCircularReferenceThroughAutowiring() {
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
-		lbf.registerBeanDefinition("test", new RootBeanDefinition(ConstructorDependencyFactoryBean.class, RootBeanDefinition.AUTOWIRE_CONSTRUCTOR));
-		lbf.registerBeanDefinition("string",
-				new RootBeanDefinition(String.class, RootBeanDefinition.AUTOWIRE_CONSTRUCTOR));
+		RootBeanDefinition bd = new RootBeanDefinition(ConstructorDependencyFactoryBean.class);
+		bd.setAutowireMode(RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
+		lbf.registerBeanDefinition("test", bd);
+		RootBeanDefinition bd2 = new RootBeanDefinition(String.class);
+		bd2.setAutowireMode(RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
+		lbf.registerBeanDefinition("string", bd2);
 		lbf.preInstantiateSingletons();
 	}
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java
index 3f7e69e4f48..6f2704b1f72 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanLookupTests.java
@@ -22,9 +22,10 @@ import static org.junit.Assert.assertThat;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;
 
 /**
@@ -37,7 +38,8 @@ public class FactoryBeanLookupTests {
 
 	@Before
 	public void setUp() {
-		beanFactory = new XmlBeanFactory(
+		beanFactory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader((BeanDefinitionRegistry) beanFactory).loadBeanDefinitions(
 				new ClassPathResource("FactoryBeanLookupTests-context.xml", this.getClass()));
 	}
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java
index 0a50c2e617f..bccb33a9781 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java
@@ -16,12 +16,15 @@
 
 package org.springframework.beans.factory;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 import static test.util.TestResourceUtils.qualifiedResource;
 
 import org.junit.Test;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 import org.springframework.util.Assert;
 
@@ -38,14 +41,16 @@ public final class FactoryBeanTests {
 
 	@Test
 	public void testFactoryBeanReturnsNull() throws Exception {
-		XmlBeanFactory factory = new XmlBeanFactory(RETURNS_NULL_CONTEXT);
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(factory).loadBeanDefinitions(RETURNS_NULL_CONTEXT);
 		Object result = factory.getBean("factoryBean");
 		assertNull(result);
 	}
 
 	@Test
 	public void testFactoryBeansWithAutowiring() throws Exception {
-		XmlBeanFactory factory = new XmlBeanFactory(WITH_AUTOWIRING_CONTEXT);
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(factory).loadBeanDefinitions(WITH_AUTOWIRING_CONTEXT);
 
 		BeanFactoryPostProcessor ppc = (BeanFactoryPostProcessor) factory.getBean("propertyPlaceholderConfigurer");
 		ppc.postProcessBeanFactory(factory);
@@ -62,7 +67,8 @@ public final class FactoryBeanTests {
 
 	@Test
 	public void testFactoryBeansWithIntermediateFactoryBeanAutowiringFailure() throws Exception {
-		XmlBeanFactory factory = new XmlBeanFactory(WITH_AUTOWIRING_CONTEXT);
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(factory).loadBeanDefinitions(WITH_AUTOWIRING_CONTEXT);
 
 		BeanFactoryPostProcessor ppc = (BeanFactoryPostProcessor) factory.getBean("propertyPlaceholderConfigurer");
 		ppc.postProcessBeanFactory(factory);
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
index 9df0cbc3090..5acfcca8b6f 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
@@ -16,6 +16,14 @@
 
 package org.springframework.beans.factory.annotation;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.io.Serializable;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -25,15 +33,11 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
-import test.beans.ITestBean;
-import test.beans.IndexedTestBean;
-import test.beans.NestedTestBean;
-import test.beans.TestBean;
-
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.AutowireCandidateQualifier;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -41,7 +45,10 @@ import org.springframework.beans.factory.support.GenericBeanDefinition;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.util.SerializationTestUtils;
 
-import static org.junit.Assert.*;
+import test.beans.ITestBean;
+import test.beans.IndexedTestBean;
+import test.beans.NestedTestBean;
+import test.beans.TestBean;
 
 /**
  * Unit tests for {@link AutowiredAnnotationBeanPostProcessor}.
@@ -608,7 +615,9 @@ public final class AutowiredAnnotationBeanPostProcessorTests {
 		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
 		bpp.setBeanFactory(bf);
 		bf.addBeanPostProcessor(bpp);
-		bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ObjectFactoryInjectionBean.class, false));
+		RootBeanDefinition annotatedBeanDefinition = new RootBeanDefinition(ObjectFactoryInjectionBean.class);
+		annotatedBeanDefinition.setScope(BeanDefinition.SCOPE_PROTOTYPE);
+		bf.registerBeanDefinition("annotatedBean", annotatedBeanDefinition);
 		bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class));
 
 		ObjectFactoryInjectionBean bean = (ObjectFactoryInjectionBean) bf.getBean("annotatedBean");
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
index 9760821441d..4cfba96615d 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
@@ -32,6 +32,7 @@ import test.beans.TestBean;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.AutowireCandidateQualifier;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -406,7 +407,9 @@ public class InjectAnnotationBeanPostProcessorTests {
 		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
 		bpp.setBeanFactory(bf);
 		bf.addBeanPostProcessor(bpp);
-		bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ObjectFactoryQualifierFieldInjectionBean.class, false));
+		RootBeanDefinition annotatedBeanDefinition = new RootBeanDefinition(ObjectFactoryQualifierFieldInjectionBean.class);
+		annotatedBeanDefinition.setScope(BeanDefinition.SCOPE_PROTOTYPE);
+		bf.registerBeanDefinition("annotatedBean", annotatedBeanDefinition);
 		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
 		bd.addQualifier(new AutowireCandidateQualifier(Qualifier.class, "testBean"));
 		bf.registerBeanDefinition("testBean", bd);
@@ -426,7 +429,9 @@ public class InjectAnnotationBeanPostProcessorTests {
 		AutowiredAnnotationBeanPostProcessor bpp = new AutowiredAnnotationBeanPostProcessor();
 		bpp.setBeanFactory(bf);
 		bf.addBeanPostProcessor(bpp);
-		bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ObjectFactoryQualifierMethodInjectionBean.class, false));
+		RootBeanDefinition annotatedBeanDefinition = new RootBeanDefinition(ObjectFactoryQualifierMethodInjectionBean.class);
+		annotatedBeanDefinition.setScope(BeanDefinition.SCOPE_PROTOTYPE);
+		bf.registerBeanDefinition("annotatedBean", annotatedBeanDefinition);
 		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
 		bd.addQualifier(new AutowireCandidateQualifier(Qualifier.class, "testBean"));
 		bf.registerBeanDefinition("testBean", bd);
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/CommonsLogFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/CommonsLogFactoryBeanTests.java
index e92f28b8169..c01585a153a 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/CommonsLogFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/CommonsLogFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@ import org.junit.Test;
  * @author Rick Evans
  * @author Chris Beams
  */
+@SuppressWarnings("deprecation")
 public final class CommonsLogFactoryBeanTests {
 
 	@Test
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
index 6691e2401fa..c5c49d9b3bd 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
@@ -62,10 +62,14 @@ public final class CustomEditorConfigurerTests {
 
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("date", "2.12.1975");
-		bf.registerBeanDefinition("tb1", new RootBeanDefinition(TestBean.class, pvs));
+		RootBeanDefinition bd1 = new RootBeanDefinition(TestBean.class);
+		bd1.setPropertyValues(pvs);
+		bf.registerBeanDefinition("tb1", bd1);
 		pvs = new MutablePropertyValues();
 		pvs.add("someMap[myKey]", new TypedStringValue("2.12.1975", Date.class));
-		bf.registerBeanDefinition("tb2", new RootBeanDefinition(TestBean.class, pvs));
+		RootBeanDefinition bd2 = new RootBeanDefinition(TestBean.class);
+		bd2.setPropertyValues(pvs);
+		bf.registerBeanDefinition("tb2", bd2);
 
 		TestBean tb1 = (TestBean) bf.getBean("tb1");
 		assertEquals(df.parse("2.12.1975"), tb1.getDate());
@@ -85,10 +89,14 @@ public final class CustomEditorConfigurerTests {
 
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("date", "2.12.1975");
-		bf.registerBeanDefinition("tb1", new RootBeanDefinition(TestBean.class, pvs));
+		RootBeanDefinition bd1 = new RootBeanDefinition(TestBean.class);
+		bd1.setPropertyValues(pvs);
+		bf.registerBeanDefinition("tb1", bd1);
 		pvs = new MutablePropertyValues();
 		pvs.add("someMap[myKey]", new TypedStringValue("2.12.1975", Date.class));
-		bf.registerBeanDefinition("tb2", new RootBeanDefinition(TestBean.class, pvs));
+		RootBeanDefinition bd2 = new RootBeanDefinition(TestBean.class);
+		bd2.setPropertyValues(pvs);
+		bf.registerBeanDefinition("tb2", bd2);
 
 		TestBean tb1 = (TestBean) bf.getBean("tb1");
 		assertEquals(df.parse("2.12.1975"), tb1.getDate());
@@ -107,7 +115,9 @@ public final class CustomEditorConfigurerTests {
 
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("date", "2.12.1975");
-		bf.registerBeanDefinition("tb", new RootBeanDefinition(TestBean.class, pvs));
+		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
+		bd.setPropertyValues(pvs);
+		bf.registerBeanDefinition("tb", bd);
 
 		TestBean tb = (TestBean) bf.getBean("tb");
 		DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, Locale.GERMAN);
@@ -125,7 +135,9 @@ public final class CustomEditorConfigurerTests {
 
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("date", "2.12.1975");
-		bf.registerBeanDefinition("tb", new RootBeanDefinition(TestBean.class, pvs));
+		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
+		bd.setPropertyValues(pvs);
+		bf.registerBeanDefinition("tb", bd);
 
 		TestBean tb = (TestBean) bf.getBean("tb");
 		DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, Locale.GERMAN);
@@ -143,7 +155,9 @@ public final class CustomEditorConfigurerTests {
 
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("stringArray", "xxx");
-		bf.registerBeanDefinition("tb", new RootBeanDefinition(TestBean.class, pvs));
+		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
+		bd.setPropertyValues(pvs);
+		bf.registerBeanDefinition("tb", bd);
 
 		TestBean tb = (TestBean) bf.getBean("tb");
 		assertTrue(tb.getStringArray() != null && tb.getStringArray().length == 1);
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/DeprecatedBeanWarnerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/DeprecatedBeanWarnerTests.java
index 6ae7cf74005..4ed025b09b6 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/DeprecatedBeanWarnerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/DeprecatedBeanWarnerTests.java
@@ -38,6 +38,7 @@ public class DeprecatedBeanWarnerTests {
 
 
 	@Test
+	@SuppressWarnings("deprecation")
 	public void postProcess() {
 		beanFactory = new DefaultListableBeanFactory();
 		BeanDefinition def = new RootBeanDefinition(MyDeprecatedBean.class);
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
index 8b1a7079c7f..a7faf0cc085 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
@@ -16,21 +16,25 @@
 
 package org.springframework.beans.factory.config;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static test.util.TestResourceUtils.qualifiedResource;
+
 import java.util.Date;
+
 import javax.inject.Provider;
 
 import org.junit.After;
-import static org.junit.Assert.*;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-
 import org.junit.Before;
 import org.junit.Test;
-import static test.util.TestResourceUtils.*;
-
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 import org.springframework.util.SerializationTestUtils;
 
@@ -45,11 +49,12 @@ public class ObjectFactoryCreatingFactoryBeanTests {
 	private static final Resource CONTEXT =
 		qualifiedResource(ObjectFactoryCreatingFactoryBeanTests.class, "context.xml");
 
-	private XmlBeanFactory beanFactory;
+	private DefaultListableBeanFactory beanFactory;
 
 	@Before
 	public void setUp() {
-		this.beanFactory = new XmlBeanFactory(CONTEXT);
+		this.beanFactory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(this.beanFactory).loadBeanDefinitions(CONTEXT);
 		this.beanFactory.setSerializationId("test");
 	}
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
index 73daf724a35..6ec0c706e64 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
@@ -16,11 +16,15 @@
 
 package org.springframework.beans.factory.config;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 import static test.util.TestResourceUtils.qualifiedResource;
 
 import org.junit.Test;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
 
 import test.beans.ITestBean;
@@ -39,7 +43,8 @@ public class PropertyPathFactoryBeanTests {
 
 	@Test
 	public void testPropertyPathFactoryBeanWithSingletonResult() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONTEXT);
 		assertEquals(new Integer(12), xbf.getBean("propertyPath1"));
 		assertEquals(new Integer(11), xbf.getBean("propertyPath2"));
 		assertEquals(new Integer(10), xbf.getBean("tb.age"));
@@ -53,7 +58,8 @@ public class PropertyPathFactoryBeanTests {
 
 	@Test
 	public void testPropertyPathFactoryBeanWithPrototypeResult() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONTEXT);
 		assertNull(xbf.getType("tb.spouse"));
 		assertEquals(TestBean.class, xbf.getType("propertyPath3"));
 		Object result1 = xbf.getBean("tb.spouse");
@@ -72,14 +78,16 @@ public class PropertyPathFactoryBeanTests {
 
 	@Test
 	public void testPropertyPathFactoryBeanWithNullResult() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONTEXT);
 		assertNull(xbf.getType("tb.spouse.spouse"));
 		assertNull(xbf.getBean("tb.spouse.spouse"));
 	}
 
 	@Test
 	public void testPropertyPathFactoryBeanAsInnerBean() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONTEXT);
 		TestBean spouse = (TestBean) xbf.getBean("otb.spouse");
 		TestBean tbWithInner = (TestBean) xbf.getBean("tbWithInner");
 		assertSame(spouse, tbWithInner.getSpouse());
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
index 931dd10e8e4..ab67af35a3a 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
@@ -371,7 +371,8 @@ public final class PropertyResourceConfigurerTests {
 			pvs2.add("name", "name${var}${var}${");
 			pvs2.add("spouse", new RuntimeBeanReference("${ref}"));
 			pvs2.add("someMap", singletonMap);
-			RootBeanDefinition parent = new RootBeanDefinition(TestBean.class, pvs1);
+			RootBeanDefinition parent = new RootBeanDefinition(TestBean.class);
+			parent.setPropertyValues(pvs1);
 			ChildBeanDefinition bd = new ChildBeanDefinition("${parent}", pvs2);
 			factory.registerBeanDefinition("parent1", parent);
 			factory.registerBeanDefinition("tb1", bd);
@@ -382,7 +383,8 @@ public final class PropertyResourceConfigurerTests {
 			pvs.add("name", "name${var}${var}${");
 			pvs.add("spouse", new RuntimeBeanReference("${ref}"));
 			pvs.add("someMap", singletonMap);
-			RootBeanDefinition bd = new RootBeanDefinition(TestBean.class, pvs);
+			RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
+			bd.setPropertyValues(pvs);
 			factory.registerBeanDefinition("tb1", bd);
 		}
 
@@ -412,7 +414,9 @@ public final class PropertyResourceConfigurerTests {
 		someMap.put("key2", "${age}name");
 		MutablePropertyValues innerPvs = new MutablePropertyValues();
 		innerPvs.add("touchy", "${os.name}");
-		someMap.put("key3", new RootBeanDefinition(TestBean.class, innerPvs));
+		RootBeanDefinition innerBd = new RootBeanDefinition(TestBean.class);
+		innerBd.setPropertyValues(innerPvs);
+		someMap.put("key3", innerBd);
 		MutablePropertyValues innerPvs2 = new MutablePropertyValues(innerPvs);
 		someMap.put("${key4}", new BeanDefinitionHolder(new ChildBeanDefinition("tb1", innerPvs2), "child"));
 		pvs.add("someMap", someMap);
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java
index 6eecc322e84..365ae6b9581 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,8 @@ import java.util.Arrays;
 
 import junit.framework.TestCase;
 
+import org.springframework.beans.factory.config.BeanDefinition;
+
 import test.beans.TestBean;
 
 /**
@@ -31,7 +33,8 @@ public class BeanDefinitionBuilderTests extends TestCase {
 	public void testBeanClassWithSimpleProperty() {
 		String[] dependsOn = new String[] { "A", "B", "C" };
 		BeanDefinitionBuilder bdb = BeanDefinitionBuilder.rootBeanDefinition(TestBean.class);
-		bdb.setSingleton(false).addPropertyReference("age", "15");
+		bdb.setScope(BeanDefinition.SCOPE_PROTOTYPE);
+		bdb.addPropertyReference("age", "15");
 		for (int i = 0; i < dependsOn.length; i++) {
 			bdb.addDependsOn(dependsOn[i]);
 		}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java
index cb365b39fda..c761254fdae 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.springframework.beans.factory.support;
 
 import junit.framework.TestCase;
 
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 
 import test.beans.TestBean;
@@ -120,10 +121,11 @@ public class BeanDefinitionTests extends TestCase {
 		bd.getPropertyValues().add("name", "myName");
 		bd.getPropertyValues().add("age", "99");
 
-		ChildBeanDefinition childBd = new ChildBeanDefinition("bd");
+		GenericBeanDefinition childBd = new GenericBeanDefinition();
+		childBd.setParentName("bd");
 
 		RootBeanDefinition mergedBd = new RootBeanDefinition(bd);
-		mergedBd.overrideFrom(childBd);
+		mergedBd.overrideFrom((BeanDefinition) childBd);
 		assertEquals(2, mergedBd.getConstructorArgumentValues().getArgumentCount());
 		assertEquals(2, mergedBd.getPropertyValues().size());
 		assertEquals(bd, mergedBd);
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
index 2849614541f..b3516282d43 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
@@ -16,6 +16,13 @@
 
 package org.springframework.beans.factory.support;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
@@ -28,24 +35,21 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
 import org.mockito.Mockito;
-
-import test.beans.GenericBean;
-import test.beans.GenericIntegerBean;
-import test.beans.GenericSetOfIntegerBean;
-import test.beans.TestBean;
-
 import org.springframework.beans.PropertyEditorRegistrar;
 import org.springframework.beans.PropertyEditorRegistry;
 import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.beans.propertyeditors.CustomNumberEditor;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.UrlResource;
 
+import test.beans.GenericBean;
+import test.beans.GenericIntegerBean;
+import test.beans.GenericSetOfIntegerBean;
+import test.beans.TestBean;
+
 /**
  * @author Juergen Hoeller
  * @author Chris Beams
@@ -94,7 +98,8 @@ public class BeanFactoryGenericsTests {
 		bf.registerSingleton("resource1", new UrlResource("http://localhost:8080"));
 		bf.registerSingleton("resource2", new UrlResource("http://localhost:9090"));
 
-		RootBeanDefinition rbd = new RootBeanDefinition(GenericIntegerBean.class, RootBeanDefinition.AUTOWIRE_BY_TYPE);
+		RootBeanDefinition rbd = new RootBeanDefinition(GenericIntegerBean.class);
+		rbd.setAutowireMode(RootBeanDefinition.AUTOWIRE_BY_TYPE);
 		bf.registerBeanDefinition("genericBean", rbd);
 		GenericIntegerBean gb = (GenericIntegerBean) bf.getBean("genericBean");
 
@@ -126,7 +131,8 @@ public class BeanFactoryGenericsTests {
 	public void testGenericListPropertyWithOptionalAutowiring() throws MalformedURLException {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 
-		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class, RootBeanDefinition.AUTOWIRE_BY_TYPE);
+		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
+		rbd.setAutowireMode(RootBeanDefinition.AUTOWIRE_BY_TYPE);
 		bf.registerBeanDefinition("genericBean", rbd);
 		GenericBean gb = (GenericBean) bf.getBean("genericBean");
 
@@ -152,7 +158,9 @@ public class BeanFactoryGenericsTests {
 
 	@Test
 	public void testGenericListOfArraysProperty() throws MalformedURLException {
-		XmlBeanFactory bf = new XmlBeanFactory(new ClassPathResource("genericBeanTests.xml", getClass()));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
+				new ClassPathResource("genericBeanTests.xml", getClass()));
 		GenericBean gb = (GenericBean) bf.getBean("listOfArrays");
 
 		assertEquals(1, gb.getListOfArrays().size());
@@ -186,7 +194,8 @@ public class BeanFactoryGenericsTests {
 		bf.registerSingleton("integer1", new Integer(4));
 		bf.registerSingleton("integer2", new Integer(5));
 
-		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class, RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
+		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
+		rbd.setAutowireMode(RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
 		bf.registerBeanDefinition("genericBean", rbd);
 		GenericBean gb = (GenericBean) bf.getBean("genericBean");
 
@@ -198,7 +207,8 @@ public class BeanFactoryGenericsTests {
 	public void testGenericSetConstructorWithOptionalAutowiring() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 
-		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class, RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
+		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
+		rbd.setAutowireMode(RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
 		bf.registerBeanDefinition("genericBean", rbd);
 		GenericBean gb = (GenericBean) bf.getBean("genericBean");
 
@@ -236,7 +246,8 @@ public class BeanFactoryGenericsTests {
 		bf.registerSingleton("resource1", new UrlResource("http://localhost:8080"));
 		bf.registerSingleton("resource2", new UrlResource("http://localhost:9090"));
 
-		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class, RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
+		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
+		rbd.setAutowireMode(RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
 		bf.registerBeanDefinition("genericBean", rbd);
 		GenericBean gb = (GenericBean) bf.getBean("genericBean");
 
@@ -252,7 +263,8 @@ public class BeanFactoryGenericsTests {
 		bf.registerSingleton("resource1", new UrlResource("http://localhost:8080"));
 		bf.registerSingleton("resource2", new UrlResource("http://localhost:9090"));
 
-		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class, RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
+		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
+		rbd.setAutowireMode(RootBeanDefinition.AUTOWIRE_CONSTRUCTOR);
 		bf.registerBeanDefinition("genericBean", rbd);
 		GenericBean gb = (GenericBean) bf.getBean("genericBean");
 
@@ -576,7 +588,9 @@ public class BeanFactoryGenericsTests {
 
 	@Test
 	public void testGenericListBean() throws Exception {
-		XmlBeanFactory bf = new XmlBeanFactory(new ClassPathResource("genericBeanTests.xml", getClass()));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
+				new ClassPathResource("genericBeanTests.xml", getClass()));
 		List list = (List) bf.getBean("list");
 		assertEquals(1, list.size());
 		assertEquals(new URL("http://localhost:8080"), list.get(0));
@@ -584,7 +598,9 @@ public class BeanFactoryGenericsTests {
 
 	@Test
 	public void testGenericSetBean() throws Exception {
-		XmlBeanFactory bf = new XmlBeanFactory(new ClassPathResource("genericBeanTests.xml", getClass()));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
+				new ClassPathResource("genericBeanTests.xml", getClass()));
 		Set set = (Set) bf.getBean("set");
 		assertEquals(1, set.size());
 		assertEquals(new URL("http://localhost:8080"), set.iterator().next());
@@ -592,7 +608,9 @@ public class BeanFactoryGenericsTests {
 
 	@Test
 	public void testGenericMapBean() throws Exception {
-		XmlBeanFactory bf = new XmlBeanFactory(new ClassPathResource("genericBeanTests.xml", getClass()));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
+				new ClassPathResource("genericBeanTests.xml", getClass()));
 		Map map = (Map) bf.getBean("map");
 		assertEquals(1, map.size());
 		assertEquals(new Integer(10), map.keySet().iterator().next());
@@ -601,7 +619,9 @@ public class BeanFactoryGenericsTests {
 
 	@Test
 	public void testGenericallyTypedIntegerBean() throws Exception {
-		XmlBeanFactory bf = new XmlBeanFactory(new ClassPathResource("genericBeanTests.xml", getClass()));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
+				new ClassPathResource("genericBeanTests.xml", getClass()));
 		GenericIntegerBean gb = (GenericIntegerBean) bf.getBean("integerBean");
 		assertEquals(new Integer(10), gb.getGenericProperty());
 		assertEquals(new Integer(20), gb.getGenericListProperty().get(0));
@@ -610,7 +630,9 @@ public class BeanFactoryGenericsTests {
 
 	@Test
 	public void testGenericallyTypedSetOfIntegerBean() throws Exception {
-		XmlBeanFactory bf = new XmlBeanFactory(new ClassPathResource("genericBeanTests.xml", getClass()));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
+				new ClassPathResource("genericBeanTests.xml", getClass()));
 		GenericSetOfIntegerBean gb = (GenericSetOfIntegerBean) bf.getBean("setOfIntegerBean");
 		assertEquals(new Integer(10), gb.getGenericProperty().iterator().next());
 		assertEquals(new Integer(20), gb.getGenericListProperty().get(0).iterator().next());
@@ -619,7 +641,9 @@ public class BeanFactoryGenericsTests {
 
 	@Test
 	public void testSetBean() throws Exception {
-		XmlBeanFactory bf = new XmlBeanFactory(new ClassPathResource("genericBeanTests.xml", getClass()));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
+				new ClassPathResource("genericBeanTests.xml", getClass()));
 		UrlSet us = (UrlSet) bf.getBean("setBean");
 		assertEquals(1, us.size());
 		assertEquals(new URL("http://www.springframework.org"), us.iterator().next());
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
index d4c80b410de..65e380d3e2e 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
@@ -16,11 +16,11 @@
 
 package org.springframework.beans.factory.support.security;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.lang.reflect.Method;
 import java.net.URL;
@@ -56,7 +56,7 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.SecurityContextProvider;
 import org.springframework.beans.factory.support.security.support.ConstructorBean;
 import org.springframework.beans.factory.support.security.support.CustomCallbackBean;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.Resource;
 
@@ -72,7 +72,7 @@ import org.springframework.core.io.Resource;
  */
 public class CallbacksSecurityTests {
 
-	private XmlBeanFactory beanFactory;
+	private DefaultListableBeanFactory beanFactory;
 	private SecurityContextProvider provider;
 
 	private static class NonPrivilegedBean {
@@ -312,7 +312,8 @@ public class CallbacksSecurityTests {
 		DefaultResourceLoader drl = new DefaultResourceLoader();
 		Resource config = drl
 				.getResource("/org/springframework/beans/factory/support/security/callbacks.xml");
-		beanFactory = new XmlBeanFactory(config);
+		beanFactory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(beanFactory).loadBeanDefinitions(config);
 		beanFactory.setSecurityContextProvider(provider);
 	}
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java
index e2a0071022a..490d0a7e1bf 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java
@@ -20,7 +20,6 @@ import java.beans.PropertyEditorSupport;
 import java.util.StringTokenizer;
 
 import junit.framework.TestCase;
-import junit.framework.Assert;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.PropertyBatchUpdateException;
@@ -88,7 +87,7 @@ public abstract class AbstractBeanFactoryTests extends TestCase {
 	 */
 	public void testLifecycleCallbacks() {
 		LifecycleBean lb = (LifecycleBean) getBeanFactory().getBean("lifecycle");
-		Assert.assertEquals("lifecycle", lb.getBeanName());
+		assertEquals("lifecycle", lb.getBeanName());
 		// The dummy business method will throw an exception if the
 		// necessary callbacks weren't invoked in the right order.
 		lb.businessMethod();
@@ -365,4 +364,4 @@ class MustBeInitialized implements InitializingBean {
 			throw new RuntimeException("Factory didn't call afterPropertiesSet() on MustBeInitialized object");
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractListableBeanFactoryTests.java
index 403b4735bbc..6a04c540743 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractListableBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractListableBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@ import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.ListableBeanFactory;
 
-import junit.framework.Assert;
-
 import test.beans.TestBean;
 
 /**
@@ -48,24 +46,24 @@ public abstract class AbstractListableBeanFactoryTests extends AbstractBeanFacto
 
 	protected final void assertCount(int count) {
 		String[] defnames = getListableBeanFactory().getBeanDefinitionNames();
-		Assert.assertTrue("We should have " + count + " beans, not " + defnames.length, defnames.length == count);
+		assertTrue("We should have " + count + " beans, not " + defnames.length, defnames.length == count);
 	}
 
 	public void assertTestBeanCount(int count) {
 		String[] defNames = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, false);
-		Assert.assertTrue("We should have " + count + " beans for class org.springframework.beans.TestBean, not " +
+		assertTrue("We should have " + count + " beans for class org.springframework.beans.TestBean, not " +
 				defNames.length, defNames.length == count);
 
 		int countIncludingFactoryBeans = count + 2;
 		String[] names = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, true);
-		Assert.assertTrue("We should have " + countIncludingFactoryBeans +
+		assertTrue("We should have " + countIncludingFactoryBeans +
 				" beans for class org.springframework.beans.TestBean, not " + names.length,
 				names.length == countIncludingFactoryBeans);
 	}
 
 	public void testGetDefinitionsForNoSuchClass() {
 		String[] defnames = getListableBeanFactory().getBeanNamesForType(String.class);
-		Assert.assertTrue("No string definitions", defnames.length == 0);
+		assertTrue("No string definitions", defnames.length == 0);
 	}
 
 	/**
@@ -73,18 +71,18 @@ public abstract class AbstractListableBeanFactoryTests extends AbstractBeanFacto
 	 * what type factories may return, and it may even change over time.)
 	 */
 	public void testGetCountForFactoryClass() {
-		Assert.assertTrue("Should have 2 factories, not " +
+		assertTrue("Should have 2 factories, not " +
 				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length,
 				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length == 2);
 
-		Assert.assertTrue("Should have 2 factories, not " +
+		assertTrue("Should have 2 factories, not " +
 				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length,
 				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length == 2);
 	}
 
 	public void testContainsBeanDefinition() {
-		Assert.assertTrue(getListableBeanFactory().containsBeanDefinition("rod"));
-		Assert.assertTrue(getListableBeanFactory().containsBeanDefinition("roderick"));
+		assertTrue(getListableBeanFactory().containsBeanDefinition("rod"));
+		assertTrue(getListableBeanFactory().containsBeanDefinition("roderick"));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java
index 7c979316666..9cc414ee651 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,7 @@
 
 package org.springframework.beans.factory.xml;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
-import test.beans.TestBean;
 
 import org.springframework.beans.factory.config.PropertiesFactoryBean;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
@@ -26,6 +24,8 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.core.io.ClassPathResource;
 
+import test.beans.TestBean;
+
 /**
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -34,43 +34,45 @@ public class AutowireWithExclusionTests extends TestCase {
 
 	public void testByTypeAutowireWithAutoSelfExclusion() throws Exception {
 		CountingFactory.reset();
-		XmlBeanFactory beanFactory = getBeanFactory("autowire-with-exclusion.xml");
+		DefaultListableBeanFactory beanFactory = getBeanFactory("autowire-with-exclusion.xml");
 		beanFactory.preInstantiateSingletons();
 		TestBean rob = (TestBean) beanFactory.getBean("rob");
 		TestBean sally = (TestBean) beanFactory.getBean("sally");
 		assertEquals(sally, rob.getSpouse());
-		Assert.assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
+		assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
 	}
 
 	public void testByTypeAutowireWithExclusion() throws Exception {
 		CountingFactory.reset();
-		XmlBeanFactory beanFactory = getBeanFactory("autowire-with-exclusion.xml");
+		DefaultListableBeanFactory beanFactory = getBeanFactory("autowire-with-exclusion.xml");
 		beanFactory.preInstantiateSingletons();
 		TestBean rob = (TestBean) beanFactory.getBean("rob");
 		assertEquals("props1", rob.getSomeProperties().getProperty("name"));
-		Assert.assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
+		assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
 	}
 
 	public void testByTypeAutowireWithExclusionInParentFactory() throws Exception {
 		CountingFactory.reset();
-		XmlBeanFactory parent = getBeanFactory("autowire-with-exclusion.xml");
+		DefaultListableBeanFactory parent = getBeanFactory("autowire-with-exclusion.xml");
 		parent.preInstantiateSingletons();
 		DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
-		RootBeanDefinition robDef = new RootBeanDefinition(TestBean.class, RootBeanDefinition.AUTOWIRE_BY_TYPE);
+		RootBeanDefinition robDef = new RootBeanDefinition(TestBean.class);
+		robDef.setAutowireMode(RootBeanDefinition.AUTOWIRE_BY_TYPE);
 		robDef.getPropertyValues().add("spouse", new RuntimeBeanReference("sally"));
 		child.registerBeanDefinition("rob2", robDef);
 		TestBean rob = (TestBean) child.getBean("rob2");
 		assertEquals("props1", rob.getSomeProperties().getProperty("name"));
-		Assert.assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
+		assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
 	}
 
 	public void testByTypeAutowireWithPrimaryInParentFactory() throws Exception {
 		CountingFactory.reset();
-		XmlBeanFactory parent = getBeanFactory("autowire-with-exclusion.xml");
+		DefaultListableBeanFactory parent = getBeanFactory("autowire-with-exclusion.xml");
 		parent.getBeanDefinition("props1").setPrimary(true);
 		parent.preInstantiateSingletons();
 		DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
-		RootBeanDefinition robDef = new RootBeanDefinition(TestBean.class, RootBeanDefinition.AUTOWIRE_BY_TYPE);
+		RootBeanDefinition robDef = new RootBeanDefinition(TestBean.class);
+		robDef.setAutowireMode(RootBeanDefinition.AUTOWIRE_BY_TYPE);
 		robDef.getPropertyValues().add("spouse", new RuntimeBeanReference("sally"));
 		child.registerBeanDefinition("rob2", robDef);
 		RootBeanDefinition propsDef = new RootBeanDefinition(PropertiesFactoryBean.class);
@@ -78,15 +80,16 @@ public class AutowireWithExclusionTests extends TestCase {
 		child.registerBeanDefinition("props3", propsDef);
 		TestBean rob = (TestBean) child.getBean("rob2");
 		assertEquals("props1", rob.getSomeProperties().getProperty("name"));
-		Assert.assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
+		assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
 	}
 
 	public void testByTypeAutowireWithPrimaryOverridingParentFactory() throws Exception {
 		CountingFactory.reset();
-		XmlBeanFactory parent = getBeanFactory("autowire-with-exclusion.xml");
+		DefaultListableBeanFactory parent = getBeanFactory("autowire-with-exclusion.xml");
 		parent.preInstantiateSingletons();
 		DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
-		RootBeanDefinition robDef = new RootBeanDefinition(TestBean.class, RootBeanDefinition.AUTOWIRE_BY_TYPE);
+		RootBeanDefinition robDef = new RootBeanDefinition(TestBean.class);
+		robDef.setAutowireMode(RootBeanDefinition.AUTOWIRE_BY_TYPE);
 		robDef.getPropertyValues().add("spouse", new RuntimeBeanReference("sally"));
 		child.registerBeanDefinition("rob2", robDef);
 		RootBeanDefinition propsDef = new RootBeanDefinition(PropertiesFactoryBean.class);
@@ -95,16 +98,17 @@ public class AutowireWithExclusionTests extends TestCase {
 		child.registerBeanDefinition("props3", propsDef);
 		TestBean rob = (TestBean) child.getBean("rob2");
 		assertEquals("props3", rob.getSomeProperties().getProperty("name"));
-		Assert.assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
+		assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
 	}
 
 	public void testByTypeAutowireWithPrimaryInParentAndChild() throws Exception {
 		CountingFactory.reset();
-		XmlBeanFactory parent = getBeanFactory("autowire-with-exclusion.xml");
+		DefaultListableBeanFactory parent = getBeanFactory("autowire-with-exclusion.xml");
 		parent.getBeanDefinition("props1").setPrimary(true);
 		parent.preInstantiateSingletons();
 		DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
-		RootBeanDefinition robDef = new RootBeanDefinition(TestBean.class, RootBeanDefinition.AUTOWIRE_BY_TYPE);
+		RootBeanDefinition robDef = new RootBeanDefinition(TestBean.class);
+		robDef.setAutowireMode(RootBeanDefinition.AUTOWIRE_BY_TYPE);
 		robDef.getPropertyValues().add("spouse", new RuntimeBeanReference("sally"));
 		child.registerBeanDefinition("rob2", robDef);
 		RootBeanDefinition propsDef = new RootBeanDefinition(PropertiesFactoryBean.class);
@@ -113,29 +117,29 @@ public class AutowireWithExclusionTests extends TestCase {
 		child.registerBeanDefinition("props3", propsDef);
 		TestBean rob = (TestBean) child.getBean("rob2");
 		assertEquals("props3", rob.getSomeProperties().getProperty("name"));
-		Assert.assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
+		assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
 	}
 
 	public void testByTypeAutowireWithInclusion() throws Exception {
 		CountingFactory.reset();
-		XmlBeanFactory beanFactory = getBeanFactory("autowire-with-inclusion.xml");
+		DefaultListableBeanFactory beanFactory = getBeanFactory("autowire-with-inclusion.xml");
 		beanFactory.preInstantiateSingletons();
 		TestBean rob = (TestBean) beanFactory.getBean("rob");
 		assertEquals("props1", rob.getSomeProperties().getProperty("name"));
-		Assert.assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
+		assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
 	}
 
 	public void testByTypeAutowireWithSelectiveInclusion() throws Exception {
 		CountingFactory.reset();
-		XmlBeanFactory beanFactory = getBeanFactory("autowire-with-selective-inclusion.xml");
+		DefaultListableBeanFactory beanFactory = getBeanFactory("autowire-with-selective-inclusion.xml");
 		beanFactory.preInstantiateSingletons();
 		TestBean rob = (TestBean) beanFactory.getBean("rob");
 		assertEquals("props1", rob.getSomeProperties().getProperty("name"));
-		Assert.assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
+		assertEquals(1, CountingFactory.getFactoryBeanInstanceCount());
 	}
 
 	public void testConstructorAutowireWithAutoSelfExclusion() throws Exception {
-		XmlBeanFactory beanFactory = getBeanFactory("autowire-constructor-with-exclusion.xml");
+		DefaultListableBeanFactory beanFactory = getBeanFactory("autowire-constructor-with-exclusion.xml");
 		TestBean rob = (TestBean) beanFactory.getBean("rob");
 		TestBean sally = (TestBean) beanFactory.getBean("sally");
 		assertEquals(sally, rob.getSpouse());
@@ -147,13 +151,16 @@ public class AutowireWithExclusionTests extends TestCase {
 	}
 
 	public void testConstructorAutowireWithExclusion() throws Exception {
-		XmlBeanFactory beanFactory = getBeanFactory("autowire-constructor-with-exclusion.xml");
+		DefaultListableBeanFactory beanFactory = getBeanFactory("autowire-constructor-with-exclusion.xml");
 		TestBean rob = (TestBean) beanFactory.getBean("rob");
 		assertEquals("props1", rob.getSomeProperties().getProperty("name"));
 	}
 
-	private XmlBeanFactory getBeanFactory(String configPath) {
-		return new XmlBeanFactory(new ClassPathResource(configPath, getClass()));
+	private DefaultListableBeanFactory getBeanFactory(String configPath) {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
+				new ClassPathResource(configPath, getClass()));
+		return bf;
 	}
 
 }
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java
index 021f9bb81d4..1924dac82e6 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java
@@ -19,6 +19,7 @@ package org.springframework.beans.factory.xml;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -38,9 +39,9 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 
 	private final List defaults = new LinkedList();
 
-	private final Map componentDefinitions = CollectionFactory.createLinkedMapIfPossible(8);
+	private final Map componentDefinitions = new LinkedHashMap<>(8);
 
-	private final Map aliasMap = CollectionFactory.createLinkedMapIfPossible(8);
+	private final Map aliasMap = new LinkedHashMap<>(8);
 
 	private final List imports = new LinkedList();
 
@@ -92,4 +93,4 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 		return Collections.unmodifiableList(this.imports);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java
index 0f3be3b0067..f57b78d2591 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,25 +16,30 @@
 
 package org.springframework.beans.factory.xml;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
-import test.beans.TestBean;
-
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.io.ClassPathResource;
 
+import test.beans.TestBean;
+
 /**
  * @author Rob Harrop
  * @author Juergen Hoeller
  */
 public class CollectionsWithDefaultTypesTests {
 
-	private final XmlBeanFactory beanFactory;
+	private final DefaultListableBeanFactory beanFactory;
 
 	public CollectionsWithDefaultTypesTests() {
-		this.beanFactory = new XmlBeanFactory(new ClassPathResource("collectionsWithDefaultTypes.xml", getClass()));
+		this.beanFactory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(this.beanFactory).loadBeanDefinitions(
+				new ClassPathResource("collectionsWithDefaultTypes.xml", getClass()));
 	}
 
 	@Test
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java
index 558e58681aa..d79ff06cbb7 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java
@@ -18,6 +18,7 @@ package org.springframework.beans.factory.xml;
 
 import junit.framework.TestCase;
 
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.io.ClassPathResource;
 
 /**
@@ -25,11 +26,13 @@ import org.springframework.core.io.ClassPathResource;
  */
 public class DefaultLifecycleMethodsTests extends TestCase {
 
-	private XmlBeanFactory beanFactory;
+	private DefaultListableBeanFactory beanFactory;
 
 	@Override
 	protected void setUp() throws Exception {
-		this.beanFactory = new XmlBeanFactory(new ClassPathResource("defaultLifecycleMethods.xml", getClass()));
+		this.beanFactory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(this.beanFactory).loadBeanDefinitions(new ClassPathResource(
+				"defaultLifecycleMethods.xml", getClass()));
 	}
 
 	public void testLifecycleMethodsInvoked() {
@@ -49,7 +52,9 @@ public class DefaultLifecycleMethodsTests extends TestCase {
 
 	public void testIgnoreDefaultLifecycleMethods() throws Exception {
 		try {
-			XmlBeanFactory bf = new XmlBeanFactory(new ClassPathResource("ignoreDefaultLifecycleMethods.xml", getClass()));
+			DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+			new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
+					new ClassPathResource("ignoreDefaultLifecycleMethods.xml", getClass()));
 			bf.preInstantiateSingletons();
 			bf.destroySingletons();
 		}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java
index 8cb697a7551..9a98ab4c150 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/MetadataAttachmentTests.java
@@ -20,6 +20,7 @@ import junit.framework.TestCase;
 
 import org.springframework.beans.PropertyValue;
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.io.ClassPathResource;
 
 /**
@@ -27,11 +28,13 @@ import org.springframework.core.io.ClassPathResource;
  */
 public class MetadataAttachmentTests extends TestCase {
 
-	private XmlBeanFactory beanFactory;
+	private DefaultListableBeanFactory beanFactory;
 
 	@Override
 	protected void setUp() throws Exception {
-		this.beanFactory = new XmlBeanFactory(new ClassPathResource("withMeta.xml", getClass()));
+		this.beanFactory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(this.beanFactory).loadBeanDefinitions(
+				new ClassPathResource("withMeta.xml", getClass()));
 	}
 
 	public void testMetadataAttachment() throws Exception {
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java
index 33788f98dbc..62c5962f86f 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java
@@ -21,8 +21,8 @@ import static org.junit.Assert.assertThat;
 
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
 import org.junit.Test;
-import org.junit.internal.matchers.TypeSafeMatcher;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.env.ConfigurableEnvironment;
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java
index c031ae52e96..f9416028884 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.io.ClassPathResource;
 
 import test.beans.DummyBean;
@@ -32,7 +33,7 @@ public class SimpleConstructorNamespaceHandlerTests {
 
 	@Test
 	public void simpleValue() throws Exception {
-		XmlBeanFactory beanFactory = createFactory("simpleConstructorNamespaceHandlerTests.xml");
+		DefaultListableBeanFactory beanFactory = createFactory("simpleConstructorNamespaceHandlerTests.xml");
 		String name = "simple";
 		//		beanFactory.getBean("simple1", DummyBean.class);
 		DummyBean nameValue = beanFactory.getBean(name, DummyBean.class);
@@ -41,7 +42,7 @@ public class SimpleConstructorNamespaceHandlerTests {
 
 	@Test
 	public void simpleRef() throws Exception {
-		XmlBeanFactory beanFactory = createFactory("simpleConstructorNamespaceHandlerTests.xml");
+		DefaultListableBeanFactory beanFactory = createFactory("simpleConstructorNamespaceHandlerTests.xml");
 		String name = "simple-ref";
 		//		beanFactory.getBean("name-value1", TestBean.class);
 		DummyBean nameValue = beanFactory.getBean(name, DummyBean.class);
@@ -50,7 +51,7 @@ public class SimpleConstructorNamespaceHandlerTests {
 
 	@Test
 	public void nameValue() throws Exception {
-		XmlBeanFactory beanFactory = createFactory("simpleConstructorNamespaceHandlerTests.xml");
+		DefaultListableBeanFactory beanFactory = createFactory("simpleConstructorNamespaceHandlerTests.xml");
 		String name = "name-value";
 		//		beanFactory.getBean("name-value1", TestBean.class);
 		TestBean nameValue = beanFactory.getBean(name, TestBean.class);
@@ -60,7 +61,7 @@ public class SimpleConstructorNamespaceHandlerTests {
 
 	@Test
 	public void nameRef() throws Exception {
-		XmlBeanFactory beanFactory = createFactory("simpleConstructorNamespaceHandlerTests.xml");
+		DefaultListableBeanFactory beanFactory = createFactory("simpleConstructorNamespaceHandlerTests.xml");
 		TestBean nameValue = beanFactory.getBean("name-value", TestBean.class);
 		DummyBean nameRef = beanFactory.getBean("name-ref", DummyBean.class);
 
@@ -70,7 +71,7 @@ public class SimpleConstructorNamespaceHandlerTests {
 
 	@Test
 	public void typeIndexedValue() throws Exception {
-		XmlBeanFactory beanFactory = createFactory("simpleConstructorNamespaceHandlerTests.xml");
+		DefaultListableBeanFactory beanFactory = createFactory("simpleConstructorNamespaceHandlerTests.xml");
 		DummyBean typeRef = beanFactory.getBean("indexed-value", DummyBean.class);
 
 		assertEquals("at", typeRef.getName());
@@ -80,7 +81,7 @@ public class SimpleConstructorNamespaceHandlerTests {
 
 	@Test
 	public void typeIndexedRef() throws Exception {
-		XmlBeanFactory beanFactory = createFactory("simpleConstructorNamespaceHandlerTests.xml");
+		DefaultListableBeanFactory beanFactory = createFactory("simpleConstructorNamespaceHandlerTests.xml");
 		DummyBean typeRef = beanFactory.getBean("indexed-ref", DummyBean.class);
 
 		assertEquals("some-name", typeRef.getName());
@@ -89,20 +90,23 @@ public class SimpleConstructorNamespaceHandlerTests {
 
 	@Test(expected = BeanDefinitionStoreException.class)
 	public void ambiguousConstructor() throws Exception {
-		new XmlBeanFactory(new ClassPathResource("simpleConstructorNamespaceHandlerTestsWithErrors.xml", getClass()));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
+				new ClassPathResource("simpleConstructorNamespaceHandlerTestsWithErrors.xml", getClass()));
 	}
 
 	@Test
 	public void constructorWithNameEndingInRef() throws Exception {
-		XmlBeanFactory beanFactory = createFactory("simpleConstructorNamespaceHandlerTests.xml");
+		DefaultListableBeanFactory beanFactory = createFactory("simpleConstructorNamespaceHandlerTests.xml");
 		DummyBean derivedBean = beanFactory.getBean("beanWithRefConstructorArg", DummyBean.class);
 		assertEquals(10, derivedBean.getAge());
 		assertEquals("silly name", derivedBean.getName());
 	}
 
-	private XmlBeanFactory createFactory(String resourceName) {
-		XmlBeanFactory fact = new XmlBeanFactory(new ClassPathResource(resourceName, getClass()));
-		//fact.setParameterNameDiscoverer(new LocalVariableTableParameterNameDiscoverer());
-		return fact;
+	private DefaultListableBeanFactory createFactory(String resourceName) {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
+				new ClassPathResource(resourceName, getClass()));
+		return bf;
 	}
-}
\ No newline at end of file
+}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerTests.java
index a7e543780d1..badce0656bd 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +17,15 @@
 package org.springframework.beans.factory.xml;
 
 import static org.junit.Assert.assertEquals;
-import org.junit.Test;
-import test.beans.ITestBean;
-import test.beans.TestBean;
 
+import org.junit.Test;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.io.ClassPathResource;
 
+import test.beans.ITestBean;
+import test.beans.TestBean;
+
 /**
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -33,8 +35,9 @@ public class SimplePropertyNamespaceHandlerTests {
 
 	@Test
 	public void simpleBeanConfigured() throws Exception {
-		XmlBeanFactory beanFactory =
-				new XmlBeanFactory(new ClassPathResource("simplePropertyNamespaceHandlerTests.xml", getClass()));
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(beanFactory).loadBeanDefinitions(
+				new ClassPathResource("simplePropertyNamespaceHandlerTests.xml", getClass()));
 		ITestBean rob = (TestBean) beanFactory.getBean("rob");
 		ITestBean sally = (TestBean) beanFactory.getBean("sally");
 		assertEquals("Rob Harrop", rob.getName());
@@ -44,8 +47,9 @@ public class SimplePropertyNamespaceHandlerTests {
 
 	@Test
 	public void innerBeanConfigured() throws Exception {
-		XmlBeanFactory beanFactory =
-				new XmlBeanFactory(new ClassPathResource("simplePropertyNamespaceHandlerTests.xml", getClass()));
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(beanFactory).loadBeanDefinitions(
+				new ClassPathResource("simplePropertyNamespaceHandlerTests.xml", getClass()));
 		TestBean sally = (TestBean) beanFactory.getBean("sally2");
 		ITestBean rob = sally.getSpouse();
 		assertEquals("Rob Harrop", rob.getName());
@@ -55,13 +59,16 @@ public class SimplePropertyNamespaceHandlerTests {
 
 	@Test(expected = BeanDefinitionStoreException.class)
 	public void withPropertyDefinedTwice() throws Exception {
-		new XmlBeanFactory(new ClassPathResource("simplePropertyNamespaceHandlerTestsWithErrors.xml", getClass()));
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(beanFactory).loadBeanDefinitions(
+				new ClassPathResource("simplePropertyNamespaceHandlerTestsWithErrors.xml", getClass()));
 	}
 
 	@Test
 	public void propertyWithNameEndingInRef() throws Exception {
-		XmlBeanFactory beanFactory =
-				new XmlBeanFactory(new ClassPathResource("simplePropertyNamespaceHandlerTests.xml", getClass()));
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(beanFactory).loadBeanDefinitions(
+				new ClassPathResource("simplePropertyNamespaceHandlerTests.xml", getClass()));
 		ITestBean sally = (TestBean) beanFactory.getBean("derivedSally");
 		assertEquals("r", sally.getSpouse().getName());
 	}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java
index eacf97579e6..18f616eb14d 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java
@@ -16,7 +16,14 @@
 
 package org.springframework.beans.factory.xml;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -27,21 +34,19 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
-import java.util.IdentityHashMap;
-import java.util.HashSet;
 import java.util.concurrent.CopyOnWriteArraySet;
 
 import org.junit.Test;
-import static org.junit.Assert.*;
-import test.beans.TestBean;
-
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.config.ListFactoryBean;
 import org.springframework.beans.factory.config.MapFactoryBean;
 import org.springframework.beans.factory.config.SetFactoryBean;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.io.ClassPathResource;
 
+import test.beans.TestBean;
+
 /**
  * Tests for collections in XML bean definitions.
  *
@@ -51,10 +56,12 @@ import org.springframework.core.io.ClassPathResource;
  */
 public class XmlBeanCollectionTests {
 
-	private final XmlBeanFactory beanFactory;
+	private final DefaultListableBeanFactory beanFactory;
 
 	public XmlBeanCollectionTests() {
-		this.beanFactory = new XmlBeanFactory(new ClassPathResource("collections.xml", getClass()));
+		this.beanFactory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(this.beanFactory).loadBeanDefinitions(
+				new ClassPathResource("collections.xml", getClass()));
 	}
 
 	@Test
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
index 1025fffe40b..5b6e88a1555 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
@@ -21,8 +21,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Assert;
-
 import org.springframework.beans.BeansException;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.factory.BeanFactory;
@@ -44,21 +42,25 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest
 
 	private DefaultListableBeanFactory parent;
 
-	private XmlBeanFactory factory;
+	private DefaultListableBeanFactory factory;
 
 	@Override
 	protected void setUp() {
 		parent = new DefaultListableBeanFactory();
 		Map m = new HashMap();
 		m.put("name", "Albert");
-		parent.registerBeanDefinition("father",
-			new RootBeanDefinition(TestBean.class, new MutablePropertyValues(m)));
+		RootBeanDefinition bd1 = new RootBeanDefinition(TestBean.class);
+		bd1.setPropertyValues(new MutablePropertyValues(m));
+		parent.registerBeanDefinition("father", bd1);
 		m = new HashMap();
 		m.put("name", "Roderick");
-		parent.registerBeanDefinition("rod",
-			new RootBeanDefinition(TestBean.class, new MutablePropertyValues(m)));
+		RootBeanDefinition bd2 = new RootBeanDefinition(TestBean.class);
+		bd2.setPropertyValues(new MutablePropertyValues(m));
+		parent.registerBeanDefinition("rod", bd2);
 
-		this.factory = new XmlBeanFactory(new ClassPathResource("test.xml", getClass()), parent);
+		this.factory = new DefaultListableBeanFactory(parent);
+		new XmlBeanDefinitionReader(this.factory).loadBeanDefinitions(
+				new ClassPathResource("test.xml", getClass()));
 		this.factory.addBeanPostProcessor(new BeanPostProcessor() {
 			@Override
 			public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
@@ -106,7 +108,7 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest
 
 	public void testDescriptionButNoProperties() throws Exception {
 		TestBean validEmpty = (TestBean) getBeanFactory().getBean("validEmptyWithDescription");
-		Assert.assertEquals(0, validEmpty.getAge());
+		assertEquals(0, validEmpty.getAge());
 	}
 
 	/**
@@ -117,94 +119,94 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest
 
 		TestBean tb1 = (TestBean) getBeanFactory().getBean("aliased");
 		TestBean alias1 = (TestBean) getBeanFactory().getBean("myalias");
-		Assert.assertTrue(tb1 == alias1);
+		assertTrue(tb1 == alias1);
 		List tb1Aliases = Arrays.asList(getBeanFactory().getAliases("aliased"));
-		Assert.assertEquals(2, tb1Aliases.size());
-		Assert.assertTrue(tb1Aliases.contains("myalias"));
-		Assert.assertTrue(tb1Aliases.contains("youralias"));
-		Assert.assertTrue(beanNames.contains("aliased"));
-		Assert.assertFalse(beanNames.contains("myalias"));
-		Assert.assertFalse(beanNames.contains("youralias"));
+		assertEquals(2, tb1Aliases.size());
+		assertTrue(tb1Aliases.contains("myalias"));
+		assertTrue(tb1Aliases.contains("youralias"));
+		assertTrue(beanNames.contains("aliased"));
+		assertFalse(beanNames.contains("myalias"));
+		assertFalse(beanNames.contains("youralias"));
 
 		TestBean tb2 = (TestBean) getBeanFactory().getBean("multiAliased");
 		TestBean alias2 = (TestBean) getBeanFactory().getBean("alias1");
 		TestBean alias3 = (TestBean) getBeanFactory().getBean("alias2");
 		TestBean alias3a = (TestBean) getBeanFactory().getBean("alias3");
 		TestBean alias3b = (TestBean) getBeanFactory().getBean("alias4");
-		Assert.assertTrue(tb2 == alias2);
-		Assert.assertTrue(tb2 == alias3);
-		Assert.assertTrue(tb2 == alias3a);
-		Assert.assertTrue(tb2 == alias3b);
+		assertTrue(tb2 == alias2);
+		assertTrue(tb2 == alias3);
+		assertTrue(tb2 == alias3a);
+		assertTrue(tb2 == alias3b);
 
 		List tb2Aliases = Arrays.asList(getBeanFactory().getAliases("multiAliased"));
-		Assert.assertEquals(4, tb2Aliases.size());
-		Assert.assertTrue(tb2Aliases.contains("alias1"));
-		Assert.assertTrue(tb2Aliases.contains("alias2"));
-		Assert.assertTrue(tb2Aliases.contains("alias3"));
-		Assert.assertTrue(tb2Aliases.contains("alias4"));
-		Assert.assertTrue(beanNames.contains("multiAliased"));
-		Assert.assertFalse(beanNames.contains("alias1"));
-		Assert.assertFalse(beanNames.contains("alias2"));
-		Assert.assertFalse(beanNames.contains("alias3"));
-		Assert.assertFalse(beanNames.contains("alias4"));
+		assertEquals(4, tb2Aliases.size());
+		assertTrue(tb2Aliases.contains("alias1"));
+		assertTrue(tb2Aliases.contains("alias2"));
+		assertTrue(tb2Aliases.contains("alias3"));
+		assertTrue(tb2Aliases.contains("alias4"));
+		assertTrue(beanNames.contains("multiAliased"));
+		assertFalse(beanNames.contains("alias1"));
+		assertFalse(beanNames.contains("alias2"));
+		assertFalse(beanNames.contains("alias3"));
+		assertFalse(beanNames.contains("alias4"));
 
 		TestBean tb3 = (TestBean) getBeanFactory().getBean("aliasWithoutId1");
 		TestBean alias4 = (TestBean) getBeanFactory().getBean("aliasWithoutId2");
 		TestBean alias5 = (TestBean) getBeanFactory().getBean("aliasWithoutId3");
-		Assert.assertTrue(tb3 == alias4);
-		Assert.assertTrue(tb3 == alias5);
+		assertTrue(tb3 == alias4);
+		assertTrue(tb3 == alias5);
 		List tb3Aliases = Arrays.asList(getBeanFactory().getAliases("aliasWithoutId1"));
-		Assert.assertEquals(2, tb3Aliases.size());
-		Assert.assertTrue(tb3Aliases.contains("aliasWithoutId2"));
-		Assert.assertTrue(tb3Aliases.contains("aliasWithoutId3"));
-		Assert.assertTrue(beanNames.contains("aliasWithoutId1"));
-		Assert.assertFalse(beanNames.contains("aliasWithoutId2"));
-		Assert.assertFalse(beanNames.contains("aliasWithoutId3"));
+		assertEquals(2, tb3Aliases.size());
+		assertTrue(tb3Aliases.contains("aliasWithoutId2"));
+		assertTrue(tb3Aliases.contains("aliasWithoutId3"));
+		assertTrue(beanNames.contains("aliasWithoutId1"));
+		assertFalse(beanNames.contains("aliasWithoutId2"));
+		assertFalse(beanNames.contains("aliasWithoutId3"));
 
 		TestBean tb4 = (TestBean) getBeanFactory().getBean(TestBean.class.getName() + "#0");
-		Assert.assertEquals(null, tb4.getName());
+		assertEquals(null, tb4.getName());
 
 		Map drs = getListableBeanFactory().getBeansOfType(DummyReferencer.class, false, false);
-		Assert.assertEquals(5, drs.size());
-		Assert.assertTrue(drs.containsKey(DummyReferencer.class.getName() + "#0"));
-		Assert.assertTrue(drs.containsKey(DummyReferencer.class.getName() + "#1"));
-		Assert.assertTrue(drs.containsKey(DummyReferencer.class.getName() + "#2"));
+		assertEquals(5, drs.size());
+		assertTrue(drs.containsKey(DummyReferencer.class.getName() + "#0"));
+		assertTrue(drs.containsKey(DummyReferencer.class.getName() + "#1"));
+		assertTrue(drs.containsKey(DummyReferencer.class.getName() + "#2"));
 	}
 
 	public void testFactoryNesting() {
 		ITestBean father = (ITestBean) getBeanFactory().getBean("father");
-		Assert.assertTrue("Bean from root context", father != null);
+		assertTrue("Bean from root context", father != null);
 
 		TestBean rod = (TestBean) getBeanFactory().getBean("rod");
-		Assert.assertTrue("Bean from child context", "Rod".equals(rod.getName()));
-		Assert.assertTrue("Bean has external reference", rod.getSpouse() == father);
+		assertTrue("Bean from child context", "Rod".equals(rod.getName()));
+		assertTrue("Bean has external reference", rod.getSpouse() == father);
 
 		rod = (TestBean) parent.getBean("rod");
-		Assert.assertTrue("Bean from root context", "Roderick".equals(rod.getName()));
+		assertTrue("Bean from root context", "Roderick".equals(rod.getName()));
 	}
 
 	public void testFactoryReferences() {
 		DummyFactory factory = (DummyFactory) getBeanFactory().getBean("&singletonFactory");
 
 		DummyReferencer ref = (DummyReferencer) getBeanFactory().getBean("factoryReferencer");
-		Assert.assertTrue(ref.getTestBean1() == ref.getTestBean2());
-		Assert.assertTrue(ref.getDummyFactory() == factory);
+		assertTrue(ref.getTestBean1() == ref.getTestBean2());
+		assertTrue(ref.getDummyFactory() == factory);
 
 		DummyReferencer ref2 = (DummyReferencer) getBeanFactory().getBean("factoryReferencerWithConstructor");
-		Assert.assertTrue(ref2.getTestBean1() == ref2.getTestBean2());
-		Assert.assertTrue(ref2.getDummyFactory() == factory);
+		assertTrue(ref2.getTestBean1() == ref2.getTestBean2());
+		assertTrue(ref2.getDummyFactory() == factory);
 	}
 
 	public void testPrototypeReferences() {
 		// check that not broken by circular reference resolution mechanism
 		DummyReferencer ref1 = (DummyReferencer) getBeanFactory().getBean("prototypeReferencer");
-		Assert.assertTrue("Not referencing same bean twice", ref1.getTestBean1() != ref1.getTestBean2());
+		assertTrue("Not referencing same bean twice", ref1.getTestBean1() != ref1.getTestBean2());
 		DummyReferencer ref2 = (DummyReferencer) getBeanFactory().getBean("prototypeReferencer");
-		Assert.assertTrue("Not the same referencer", ref1 != ref2);
-		Assert.assertTrue("Not referencing same bean twice", ref2.getTestBean1() != ref2.getTestBean2());
-		Assert.assertTrue("Not referencing same bean twice", ref1.getTestBean1() != ref2.getTestBean1());
-		Assert.assertTrue("Not referencing same bean twice", ref1.getTestBean2() != ref2.getTestBean2());
-		Assert.assertTrue("Not referencing same bean twice", ref1.getTestBean1() != ref2.getTestBean2());
+		assertTrue("Not the same referencer", ref1 != ref2);
+		assertTrue("Not referencing same bean twice", ref2.getTestBean1() != ref2.getTestBean2());
+		assertTrue("Not referencing same bean twice", ref1.getTestBean1() != ref2.getTestBean1());
+		assertTrue("Not referencing same bean twice", ref1.getTestBean2() != ref2.getTestBean2());
+		assertTrue("Not referencing same bean twice", ref1.getTestBean1() != ref2.getTestBean2());
 	}
 
 	public void testBeanPostProcessor() throws Exception {
@@ -212,22 +214,22 @@ public class XmlListableBeanFactoryTests extends AbstractListableBeanFactoryTest
 		TestBean kathy = (TestBean) getBeanFactory().getBean("kathy");
 		DummyFactory factory = (DummyFactory) getBeanFactory().getBean("&singletonFactory");
 		TestBean factoryCreated = (TestBean) getBeanFactory().getBean("singletonFactory");
-		Assert.assertTrue(kerry.isPostProcessed());
-		Assert.assertTrue(kathy.isPostProcessed());
-		Assert.assertTrue(factory.isPostProcessed());
-		Assert.assertTrue(factoryCreated.isPostProcessed());
+		assertTrue(kerry.isPostProcessed());
+		assertTrue(kathy.isPostProcessed());
+		assertTrue(factory.isPostProcessed());
+		assertTrue(factoryCreated.isPostProcessed());
 	}
 
 	public void testEmptyValues() {
 		TestBean rod = (TestBean) getBeanFactory().getBean("rod");
 		TestBean kerry = (TestBean) getBeanFactory().getBean("kerry");
-		Assert.assertTrue("Touchy is empty", "".equals(rod.getTouchy()));
-		Assert.assertTrue("Touchy is empty", "".equals(kerry.getTouchy()));
+		assertTrue("Touchy is empty", "".equals(rod.getTouchy()));
+		assertTrue("Touchy is empty", "".equals(kerry.getTouchy()));
 	}
 
 	public void testCommentsAndCdataInValue() {
 		TestBean bean = (TestBean) getBeanFactory().getBean("commentsInValue");
-		Assert.assertEquals("Failed to handle comments and CDATA properly", "this is a ", bean.getName());
+		assertEquals("Failed to handle comments and CDATA properly", "this is a ", bean.getName());
 	}
 
 }
diff --git a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java
index 51eab98cd6a..97eb3e78633 100644
--- a/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java
+++ b/spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.java
@@ -20,8 +20,10 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.Properties;
+
 import javax.activation.FileTypeMap;
 import javax.mail.Address;
 import javax.mail.Message;
@@ -59,7 +61,7 @@ public class JavaMailSenderTests extends TestCase {
 		simpleMessage.setTo("you@mail.org");
 		simpleMessage.setCc(new String[] {"he@mail.org", "she@mail.org"});
 		simpleMessage.setBcc(new String[] {"us@mail.org", "them@mail.org"});
-		Date sentDate = new Date(2004, 1, 1);
+		Date sentDate = new GregorianCalendar(2004, 1, 1).getTime();
 		simpleMessage.setSentDate(sentDate);
 		simpleMessage.setSubject("my subject");
 		simpleMessage.setText("my text");
@@ -334,7 +336,7 @@ public class JavaMailSenderTests extends TestCase {
 		MimeMessage mimeMessage = sender.createMimeMessage();
 		mimeMessage.setSubject("custom");
 		mimeMessage.setRecipient(Message.RecipientType.TO, new InternetAddress("you@mail.org"));
-		mimeMessage.setSentDate(new Date(2005, 3, 1));
+		mimeMessage.setSentDate(new GregorianCalendar(2005, 3, 1).getTime());
 		sender.send(mimeMessage);
 
 		assertEquals("host", sender.transport.getConnectedHost());
@@ -559,7 +561,7 @@ public class JavaMailSenderTests extends TestCase {
 				throw new MessagingException("No sentDate specified");
 			}
 			if (message.getSubject() != null && message.getSubject().contains("custom")) {
-				assertEquals(new Date(2005, 3, 1), message.getSentDate());
+				assertEquals(new GregorianCalendar(2005, 3, 1).getTime(), message.getSentDate());
 			}
 			this.sentMessages.add(message);
 		}
diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
index 32c67a0b80e..4d2a5690cb3 100644
--- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
+++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
@@ -51,7 +51,6 @@ import org.quartz.Trigger;
 import org.quartz.TriggerListener;
 import org.quartz.impl.SchedulerRepository;
 import org.quartz.spi.JobFactory;
-
 import org.springframework.beans.TestBean;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -63,7 +62,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.core.io.FileSystemResourceLoader;
 import org.springframework.core.task.TaskExecutor;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.scheduling.TestMethodInvokingTask;
 
 /**
@@ -973,7 +972,7 @@ public class QuartzSupportTests {
 
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(
 				"/org/springframework/scheduling/quartz/databasePersistence.xml");
-		SimpleJdbcTemplate jdbcTemplate = new SimpleJdbcTemplate(ctx.getBean(DataSource.class));
+		JdbcTemplate jdbcTemplate = new JdbcTemplate(ctx.getBean(DataSource.class));
 		assertTrue("No triggers were persisted", jdbcTemplate.queryForList("SELECT * FROM qrtz_triggers").size()>0);
 		Thread.sleep(3000);
 		try {
diff --git a/spring-context-support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java b/spring-context-support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java
index 4f8cc86fca8..7b9ebb44aac 100644
--- a/spring-context-support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java
+++ b/spring-context-support/src/test/java/org/springframework/ui/jasperreports/JasperReportsUtilsTests.java
@@ -198,7 +198,7 @@ public class JasperReportsUtilsTests extends TestCase {
 		HSSFRow row = sheet.getRow(3);
 		HSSFCell cell = row.getCell((short) 1);
 		assertNotNull("Cell should not be null", cell);
-		assertEquals("Cell content should be Dear Lord!", "Dear Lord!", cell.getStringCellValue());
+		assertEquals("Cell content should be Dear Lord!", "Dear Lord!", cell.getRichStringCellValue().getString());
 	}
 
 	private JasperReport getReport() throws Exception {
diff --git a/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java b/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
index b93c8b2df58..495f3c70259 100644
--- a/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
+++ b/spring-context/src/main/java/org/springframework/context/weaving/DefaultContextLoadTimeWeaver.java
@@ -56,6 +56,7 @@ import org.springframework.instrument.classloading.websphere.WebSphereLoadTimeWe
  * @since 2.5
  * @see org.springframework.context.ConfigurableApplicationContext#LOAD_TIME_WEAVER_BEAN_NAME
  */
+@SuppressWarnings("deprecation")
 public class DefaultContextLoadTimeWeaver implements LoadTimeWeaver, BeanClassLoaderAware, DisposableBean {
 
 	protected final Log logger = LogFactory.getLog(getClass());
diff --git a/spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java b/spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java
index eb741dd3fe6..23cfe64423f 100644
--- a/spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java
+++ b/spring-context/src/main/java/org/springframework/scripting/config/ScriptBeanDefinitionParser.java
@@ -99,6 +99,7 @@ class ScriptBeanDefinitionParser extends AbstractBeanDefinitionParser {
 	 * Registers a {@link ScriptFactoryPostProcessor} if needed.
 	 */
 	@Override
+	@SuppressWarnings("deprecation")
 	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
 		// Resolve the script source.
 		String value = resolveScriptSource(element, parserContext.getReaderContext());
diff --git a/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java b/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java
index 2271d1b53db..97b9a3bc43d 100644
--- a/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java
+++ b/spring-context/src/main/java/org/springframework/scripting/jruby/JRubyScriptUtils.java
@@ -75,6 +75,7 @@ public abstract class JRubyScriptUtils {
 	 * @return the scripted Java object
 	 * @throws JumpException in case of JRuby parsing failure
 	 */
+	@SuppressWarnings("deprecation")
 	public static Object createJRubyObject(String scriptSource, Class[] interfaces, ClassLoader classLoader) {
 		Ruby ruby = initializeRuntime();
 
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
index d5f1e89c62a..b6e0f6853e8 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
@@ -16,8 +16,16 @@
 
 package org.springframework.aop.framework;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -45,10 +53,10 @@ import org.springframework.beans.TestBean;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.ListableBeanFactory;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.TestListener;
 import org.springframework.core.io.ClassPathResource;
@@ -56,14 +64,13 @@ import org.springframework.util.SerializationTestUtils;
 
 import test.advice.CountingBeforeAdvice;
 import test.advice.MyThrowsHandler;
+import test.beans.SideEffectBean;
 import test.interceptor.NopInterceptor;
 import test.interceptor.TimestampIntroductionInterceptor;
 import test.mixin.Lockable;
 import test.mixin.LockedException;
 import test.util.TimeStamped;
 
-import test.beans.SideEffectBean;
-
 /**
  * @since 13.03.2003
  * @author Rod Johnson
@@ -93,7 +100,9 @@ public final class ProxyFactoryBeanTests {
 	public void setUp() throws Exception {
 		DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
 		parent.registerBeanDefinition("target2", new RootBeanDefinition(TestListener.class));
-		this.factory = new XmlBeanFactory(new ClassPathResource(CONTEXT, getClass()), parent);
+		this.factory = new DefaultListableBeanFactory(parent);
+		new XmlBeanDefinitionReader((BeanDefinitionRegistry) this.factory).loadBeanDefinitions(
+				new ClassPathResource(CONTEXT, getClass()));
 	}
 
 	@Test
@@ -133,7 +142,8 @@ public final class ProxyFactoryBeanTests {
 
 	private void testDoubleTargetSourceIsRejected(String name) {
 		try {
-			BeanFactory bf = new XmlBeanFactory(new ClassPathResource(DBL_TARGETSOURCE_CONTEXT, CLASS));
+			DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+			new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(DBL_TARGETSOURCE_CONTEXT, CLASS));
 			bf.getBean(name);
 			fail("Should not allow TargetSource to be specified in interceptorNames as well as targetSource property");
 		}
@@ -147,7 +157,8 @@ public final class ProxyFactoryBeanTests {
 	@Test
 	public void testTargetSourceNotAtEndOfInterceptorNamesIsRejected() {
 		try {
-			BeanFactory bf = new XmlBeanFactory(new ClassPathResource(NOTLAST_TARGETSOURCE_CONTEXT, CLASS));
+			DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+			new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(NOTLAST_TARGETSOURCE_CONTEXT, CLASS));
 			bf.getBean("targetSourceNotLast");
 			fail("TargetSource or non-advised object must be last in interceptorNames");
 		}
@@ -160,7 +171,8 @@ public final class ProxyFactoryBeanTests {
 
 	@Test
 	public void testGetObjectTypeWithDirectTarget() {
-		BeanFactory bf = new XmlBeanFactory(new ClassPathResource(TARGETSOURCE_CONTEXT, CLASS));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(TARGETSOURCE_CONTEXT, CLASS));
 
 		// We have a counting before advice here
 		CountingBeforeAdvice cba = (CountingBeforeAdvice) bf.getBean("countingBeforeAdvice");
@@ -176,7 +188,8 @@ public final class ProxyFactoryBeanTests {
 
 	@Test
 	public void testGetObjectTypeWithTargetViaTargetSource() {
-		BeanFactory bf = new XmlBeanFactory(new ClassPathResource(TARGETSOURCE_CONTEXT, CLASS));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(TARGETSOURCE_CONTEXT, CLASS));
 		ITestBean tb = (ITestBean) bf.getBean("viaTargetSource");
 		assertTrue(tb.getName().equals("Adam"));
 		ProxyFactoryBean pfb = (ProxyFactoryBean) bf.getBean("&viaTargetSource");
@@ -185,7 +198,8 @@ public final class ProxyFactoryBeanTests {
 
 	@Test
 	public void testGetObjectTypeWithNoTargetOrTargetSource() {
-		BeanFactory bf = new XmlBeanFactory(new ClassPathResource(TARGETSOURCE_CONTEXT, CLASS));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(TARGETSOURCE_CONTEXT, CLASS));
 
 		ITestBean tb = (ITestBean) bf.getBean("noTarget");
 		try {
@@ -246,7 +260,8 @@ public final class ProxyFactoryBeanTests {
 		// Initial count value set in bean factory XML
 		int INITIAL_COUNT = 10;
 
-		BeanFactory bf = new XmlBeanFactory(new ClassPathResource(PROTOTYPE_CONTEXT, CLASS));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(PROTOTYPE_CONTEXT, CLASS));
 
 		// Check it works without AOP
 		SideEffectBean raw = (SideEffectBean) bf.getBean("prototypeTarget");
@@ -338,7 +353,8 @@ public final class ProxyFactoryBeanTests {
 	 */
 	@Test
 	public void testTargetAsInnerBean() {
-		ListableBeanFactory bf = new XmlBeanFactory(new ClassPathResource(INNER_BEAN_TARGET_CONTEXT, CLASS));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(INNER_BEAN_TARGET_CONTEXT, CLASS));
 		ITestBean itb = (ITestBean) bf.getBean("testBean");
 		assertEquals("innerBeanTarget", itb.getName());
 		assertEquals("Only have proxy and interceptor: no target", 3, bf.getBeanDefinitionCount());
@@ -441,7 +457,8 @@ public final class ProxyFactoryBeanTests {
 
 	@Test
 	public void testCanAddThrowsAdviceWithoutAdvisor() throws Throwable {
-		BeanFactory f = new XmlBeanFactory(new ClassPathResource(THROWS_ADVICE_CONTEXT, CLASS));
+		DefaultListableBeanFactory f = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(f).loadBeanDefinitions(new ClassPathResource(THROWS_ADVICE_CONTEXT, CLASS));
 		MyThrowsHandler th = (MyThrowsHandler) f.getBean("throwsAdvice");
 		CountingBeforeAdvice cba = (CountingBeforeAdvice) f.getBean("countingBeforeAdvice");
 		assertEquals(0, cba.getCalls());
@@ -498,9 +515,10 @@ public final class ProxyFactoryBeanTests {
 
 	@Test
 	public void testEmptyInterceptorNames() {
-		XmlBeanFactory factory = new XmlBeanFactory(new ClassPathResource(INVALID_CONTEXT, CLASS));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(INVALID_CONTEXT, CLASS));
 		try {
-			factory.getBean("emptyInterceptorNames");
+			bf.getBean("emptyInterceptorNames");
 			fail("Interceptor names cannot be empty");
 		}
 		catch (BeanCreationException ex) {
@@ -513,9 +531,10 @@ public final class ProxyFactoryBeanTests {
 	 */
 	@Test
 	public void testGlobalsWithoutTarget() {
-		XmlBeanFactory factory = new XmlBeanFactory(new ClassPathResource(INVALID_CONTEXT, CLASS));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(INVALID_CONTEXT, CLASS));
 		try {
-			factory.getBean("globalsWithoutTarget");
+			bf.getBean("globalsWithoutTarget");
 			fail("Should require target name");
 		}
 		catch (BeanCreationException ex) {
@@ -554,7 +573,8 @@ public final class ProxyFactoryBeanTests {
 
 	@Test
 	public void testSerializableSingletonProxy() throws Exception {
-		BeanFactory bf = new XmlBeanFactory(new ClassPathResource(SERIALIZATION_CONTEXT, CLASS));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(SERIALIZATION_CONTEXT, CLASS));
 		Person p = (Person) bf.getBean("serializableSingleton");
 		assertSame("Should be a Singleton", p, bf.getBean("serializableSingleton"));
 		Person p2 = (Person) SerializationTestUtils.serializeAndDeserialize(p);
@@ -576,7 +596,8 @@ public final class ProxyFactoryBeanTests {
 
 	@Test
 	public void testSerializablePrototypeProxy() throws Exception {
-		BeanFactory bf = new XmlBeanFactory(new ClassPathResource(SERIALIZATION_CONTEXT, CLASS));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(SERIALIZATION_CONTEXT, CLASS));
 		Person p = (Person) bf.getBean("serializablePrototype");
 		assertNotSame("Should not be a Singleton", p, bf.getBean("serializablePrototype"));
 		Person p2 = (Person) SerializationTestUtils.serializeAndDeserialize(p);
@@ -587,7 +608,8 @@ public final class ProxyFactoryBeanTests {
 
 	@Test
 	public void testSerializableSingletonProxyFactoryBean() throws Exception {
-		BeanFactory bf = new XmlBeanFactory(new ClassPathResource(SERIALIZATION_CONTEXT, CLASS));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(SERIALIZATION_CONTEXT, CLASS));
 		Person p = (Person) bf.getBean("serializableSingleton");
 		ProxyFactoryBean pfb = (ProxyFactoryBean) bf.getBean("&serializableSingleton");
 		ProxyFactoryBean pfb2 = (ProxyFactoryBean) SerializationTestUtils.serializeAndDeserialize(pfb);
@@ -599,14 +621,16 @@ public final class ProxyFactoryBeanTests {
 
 	@Test
 	public void testProxyNotSerializableBecauseOfAdvice() throws Exception {
-		BeanFactory bf = new XmlBeanFactory(new ClassPathResource(SERIALIZATION_CONTEXT, CLASS));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(SERIALIZATION_CONTEXT, CLASS));
 		Person p = (Person) bf.getBean("interceptorNotSerializableSingleton");
 		assertFalse("Not serializable because an interceptor isn't serializable", SerializationTestUtils.isSerializable(p));
 	}
 
 	@Test
 	public void testPrototypeAdvisor() {
-		BeanFactory bf = new XmlBeanFactory(new ClassPathResource(CONTEXT, CLASS));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(CONTEXT, CLASS));
 
 		ITestBean bean1 = (ITestBean) bf.getBean("prototypeTestBeanProxy");
 		ITestBean bean2 = (ITestBean) bf.getBean("prototypeTestBeanProxy");
@@ -637,7 +661,8 @@ public final class ProxyFactoryBeanTests {
 
 	@Test
 	public void testPrototypeInterceptorSingletonTarget() {
-		BeanFactory bf = new XmlBeanFactory(new ClassPathResource(CONTEXT, CLASS));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(CONTEXT, CLASS));
 
 		ITestBean bean1 = (ITestBean) bf.getBean("prototypeTestBeanProxySingletonTarget");
 		ITestBean bean2 = (ITestBean) bf.getBean("prototypeTestBeanProxySingletonTarget");
@@ -671,13 +696,15 @@ public final class ProxyFactoryBeanTests {
 	 */
 	@Test
 	public void testInnerBeanTargetUsingAutowiring() {
-		BeanFactory bf = new XmlBeanFactory(new ClassPathResource(AUTOWIRING_CONTEXT, CLASS));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(AUTOWIRING_CONTEXT, CLASS));
 		bf.getBean("testBean");
 	}
 
 	@Test
 	public void testFrozenFactoryBean() {
-		BeanFactory bf = new XmlBeanFactory(new ClassPathResource(FROZEN_CONTEXT, CLASS));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource(FROZEN_CONTEXT, CLASS));
 
 		Advised advised = (Advised)bf.getBean("frozen");
 		assertTrue("The proxy should be frozen", advised.isFrozen());
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java
index d9237d23b9b..4019d568d0c 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java
@@ -55,7 +55,8 @@ public final class AutoProxyCreatorTests {
 		proxyCreator.getPropertyValues().add("beanNames", "singletonToBeProxied,innerBean,singletonFactoryToBeProxied");
 		sac.getDefaultListableBeanFactory().registerBeanDefinition("beanNameAutoProxyCreator", proxyCreator);
 
-		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class, RootBeanDefinition.AUTOWIRE_BY_TYPE);
+		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
+		bd.setAutowireMode(RootBeanDefinition.AUTOWIRE_BY_TYPE);
 		RootBeanDefinition innerBean = new RootBeanDefinition(TestBean.class);
 		bd.getPropertyValues().add("spouse", new BeanDefinitionHolder(innerBean, "innerBean"));
 		sac.getDefaultListableBeanFactory().registerBeanDefinition("singletonToBeProxied", bd);
diff --git a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java
index e47669eaf83..68f7342e4cb 100644
--- a/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/scope/ScopedProxyTests.java
@@ -16,19 +16,21 @@
 
 package org.springframework.aop.scope;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
-
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.ITestBean;
 import org.springframework.beans.TestBean;
 import org.springframework.beans.factory.config.SimpleMapScope;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.SerializationTestUtils;
@@ -51,14 +53,16 @@ public class ScopedProxyTests {
 	/* SPR-2108 */
 	@Test
 	public void testProxyAssignable() throws Exception {
-		XmlBeanFactory bf = new XmlBeanFactory(MAP_CONTEXT);
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(MAP_CONTEXT);
 		Object baseMap = bf.getBean("singletonMap");
 		assertTrue(baseMap instanceof Map);
 	}
 
 	@Test
 	public void testSimpleProxy() throws Exception {
-		XmlBeanFactory bf = new XmlBeanFactory(MAP_CONTEXT);
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(MAP_CONTEXT);
 		Object simpleMap = bf.getBean("simpleMap");
 		assertTrue(simpleMap instanceof Map);
 		assertTrue(simpleMap instanceof HashMap);
@@ -82,7 +86,8 @@ public class ScopedProxyTests {
 
 	@Test
 	public void testJdkScopedProxy() throws Exception {
-		XmlBeanFactory bf = new XmlBeanFactory(TESTBEAN_CONTEXT);
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(TESTBEAN_CONTEXT);
 		bf.setSerializationId("X");
 		SimpleMapScope scope = new SimpleMapScope();
 		bf.registerScope("request", scope);
@@ -111,7 +116,8 @@ public class ScopedProxyTests {
 
 	@Test
 	public void testCglibScopedProxy() throws Exception {
-		XmlBeanFactory bf = new XmlBeanFactory(LIST_CONTEXT);
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(LIST_CONTEXT);
 		bf.setSerializationId("Y");
 		SimpleMapScope scope = new SimpleMapScope();
 		bf.registerScope("request", scope);
diff --git a/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java b/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java
index 5de96fc526f..c0a695c452c 100644
--- a/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java
@@ -16,7 +16,10 @@
 
 package org.springframework.aop.target;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.util.NoSuchElementException;
 
@@ -27,7 +30,8 @@ import org.junit.Test;
 import org.springframework.aop.framework.Advised;
 import org.springframework.beans.Person;
 import org.springframework.beans.SerializablePerson;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.SerializationTestUtils;
@@ -50,11 +54,13 @@ public class CommonsPoolTargetSourceTests {
 	 */
 	private static final int INITIAL_COUNT = 10;
 
-	private XmlBeanFactory beanFactory;
+	private DefaultListableBeanFactory beanFactory;
 
 	@Before
 	public void setUp() throws Exception {
-		this.beanFactory = new XmlBeanFactory(new ClassPathResource(getClass().getSimpleName() + "-context.xml", getClass()));
+		this.beanFactory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(this.beanFactory).loadBeanDefinitions(
+				new ClassPathResource(getClass().getSimpleName() + "-context.xml", getClass()));
 	}
 
 	/**
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
index b588561321f..d6911ee72f5 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
@@ -20,7 +20,6 @@ import java.beans.PropertyEditorSupport;
 import java.util.StringTokenizer;
 
 import junit.framework.TestCase;
-import junit.framework.Assert;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.PropertyBatchUpdateException;
@@ -79,7 +78,7 @@ public abstract class AbstractBeanFactoryTests extends TestCase {
 	 */
 	public void testLifecycleCallbacks() {
 		LifecycleBean lb = (LifecycleBean) getBeanFactory().getBean("lifecycle");
-		Assert.assertEquals("lifecycle", lb.getBeanName());
+		assertEquals("lifecycle", lb.getBeanName());
 		// The dummy business method will throw an exception if the
 		// necessary callbacks weren't invoked in the right order.
 		lb.businessMethod();
@@ -327,4 +326,4 @@ public abstract class AbstractBeanFactoryTests extends TestCase {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java
index d683491a1f6..855f23af396 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 package org.springframework.beans.factory;
 
-import junit.framework.Assert;
-
 import org.springframework.beans.TestBean;
 
 /**
@@ -44,24 +42,24 @@ public abstract class AbstractListableBeanFactoryTests extends AbstractBeanFacto
 
 	protected final void assertCount(int count) {
 		String[] defnames = getListableBeanFactory().getBeanDefinitionNames();
-		Assert.assertTrue("We should have " + count + " beans, not " + defnames.length, defnames.length == count);
+		assertTrue("We should have " + count + " beans, not " + defnames.length, defnames.length == count);
 	}
 
 	public void assertTestBeanCount(int count) {
 		String[] defNames = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, false);
-		Assert.assertTrue("We should have " + count + " beans for class org.springframework.beans.TestBean, not " +
+		assertTrue("We should have " + count + " beans for class org.springframework.beans.TestBean, not " +
 				defNames.length, defNames.length == count);
 
 		int countIncludingFactoryBeans = count + 2;
 		String[] names = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, true);
-		Assert.assertTrue("We should have " + countIncludingFactoryBeans +
+		assertTrue("We should have " + countIncludingFactoryBeans +
 				" beans for class org.springframework.beans.TestBean, not " + names.length,
 				names.length == countIncludingFactoryBeans);
 	}
 
 	public void testGetDefinitionsForNoSuchClass() {
 		String[] defnames = getListableBeanFactory().getBeanNamesForType(String.class);
-		Assert.assertTrue("No string definitions", defnames.length == 0);
+		assertTrue("No string definitions", defnames.length == 0);
 	}
 
 	/**
@@ -69,18 +67,18 @@ public abstract class AbstractListableBeanFactoryTests extends AbstractBeanFacto
 	 * what type factories may return, and it may even change over time.)
 	 */
 	public void testGetCountForFactoryClass() {
-		Assert.assertTrue("Should have 2 factories, not " +
+		assertTrue("Should have 2 factories, not " +
 				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length,
 				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length == 2);
 
-		Assert.assertTrue("Should have 2 factories, not " +
+		assertTrue("Should have 2 factories, not " +
 				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length,
 				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length == 2);
 	}
 
 	public void testContainsBeanDefinition() {
-		Assert.assertTrue(getListableBeanFactory().containsBeanDefinition("rod"));
-		Assert.assertTrue(getListableBeanFactory().containsBeanDefinition("roderick"));
+		assertTrue(getListableBeanFactory().containsBeanDefinition("rod"));
+		assertTrue(getListableBeanFactory().containsBeanDefinition("roderick"));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java b/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
index 496cc1d63b1..d42adc1daf3 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
@@ -19,12 +19,11 @@ package org.springframework.beans.factory.parsing;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.core.CollectionFactory;
-
 /**
  * @author Rob Harrop
  * @author Juergen Hoeller
@@ -33,9 +32,9 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 
 	private final List defaults = new LinkedList();
 
-	private final Map componentDefinitions = CollectionFactory.createLinkedMapIfPossible(8);
+	private final Map componentDefinitions = new LinkedHashMap<>(8);
 
-	private final Map> aliasMap = CollectionFactory.createLinkedMapIfPossible(8);
+	private final Map> aliasMap = new LinkedHashMap<>(8);
 
 	private final List imports = new LinkedList();
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
index 997523aaf6c..3eed0d7cfc1 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
@@ -116,7 +116,6 @@ public final class XmlBeanFactoryTests {
 	private static final ClassPathResource NO_SUCH_FACTORY_METHOD_CONTEXT = classPathResource("-noSuchFactoryMethod.xml");
 	private static final ClassPathResource RECURSIVE_IMPORT_CONTEXT = classPathResource("-recursiveImport.xml");
 	private static final ClassPathResource RESOURCE_CONTEXT = classPathResource("-resource.xml");
-	private static final ClassPathResource RESOURCE_IMPORT_CONTEXT = classPathResource("-resourceImport.xml");
 	private static final ClassPathResource SATISFIED_ALL_DEP_CONTEXT = classPathResource("-satisfiedAllDepCheck.xml");
 	private static final ClassPathResource SATISFIED_OBJECT_DEP_CONTEXT = classPathResource("-satisfiedObjectDepCheck.xml");
 	private static final ClassPathResource SATISFIED_SIMPLE_DEP_CONTEXT = classPathResource("-satisfiedSimpleDepCheck.xml");
@@ -135,7 +134,8 @@ public final class XmlBeanFactoryTests {
 
 	/* SPR-2368 */
 	public @Test void testCollectionsReferredToAsRefLocals() throws Exception {
-		XmlBeanFactory factory = new XmlBeanFactory(COLLECTIONS_XSD_CONTEXT);
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(factory).loadBeanDefinitions(COLLECTIONS_XSD_CONTEXT);
 		factory.preInstantiateSingletons();
 	}
 
@@ -296,8 +296,10 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testInheritanceFromParentFactoryPrototype() throws Exception {
-		XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT);
-		XmlBeanFactory child = new XmlBeanFactory(CHILD_CONTEXT, parent);
+		DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT);
+		DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
+		new XmlBeanDefinitionReader(child).loadBeanDefinitions(CHILD_CONTEXT);
 		assertEquals(TestBean.class, child.getType("inheritsFromParentFactory"));
 		TestBean inherits = (TestBean) child.getBean("inheritsFromParentFactory");
 		// Name property value is overridden
@@ -309,8 +311,10 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testInheritanceWithDifferentClass() throws Exception {
-		XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT);
-		XmlBeanFactory child = new XmlBeanFactory(CHILD_CONTEXT, parent);
+		DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT);
+		DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
+		new XmlBeanDefinitionReader(child).loadBeanDefinitions(CHILD_CONTEXT);
 		assertEquals(DerivedTestBean.class, child.getType("inheritsWithClass"));
 		DerivedTestBean inherits = (DerivedTestBean) child.getBean("inheritsWithDifferentClass");
 		// Name property value is overridden
@@ -321,8 +325,10 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testInheritanceWithClass() throws Exception {
-		XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT);
-		XmlBeanFactory child = new XmlBeanFactory(CHILD_CONTEXT, parent);
+		DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT);
+		DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
+		new XmlBeanDefinitionReader(child).loadBeanDefinitions(CHILD_CONTEXT);
 		assertEquals(DerivedTestBean.class, child.getType("inheritsWithClass"));
 		DerivedTestBean inherits = (DerivedTestBean) child.getBean("inheritsWithClass");
 		// Name property value is overridden
@@ -333,8 +339,10 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testPrototypeInheritanceFromParentFactoryPrototype() throws Exception {
-		XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT);
-		XmlBeanFactory child = new XmlBeanFactory(CHILD_CONTEXT, parent);
+		DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT);
+		DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
+		new XmlBeanDefinitionReader(child).loadBeanDefinitions(CHILD_CONTEXT);
 		assertEquals(TestBean.class, child.getType("prototypeInheritsFromParentFactoryPrototype"));
 		TestBean inherits = (TestBean) child.getBean("prototypeInheritsFromParentFactoryPrototype");
 		// Name property value is overridden
@@ -350,8 +358,10 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testPrototypeInheritanceFromParentFactorySingleton() throws Exception {
-		XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT);
-		XmlBeanFactory child = new XmlBeanFactory(CHILD_CONTEXT, parent);
+		DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT);
+		DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
+		new XmlBeanDefinitionReader(child).loadBeanDefinitions(CHILD_CONTEXT);
 		TestBean inherits = (TestBean) child.getBean("protoypeInheritsFromParentFactorySingleton");
 		// Name property value is overridden
 		assertTrue(inherits.getName().equals("prototypeOverridesInheritedSingleton"));
@@ -380,7 +390,8 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testAbstractParentBeans() {
-		XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT);
+		DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT);
 		parent.preInstantiateSingletons();
 		assertTrue(parent.isSingleton("inheritedTestBeanWithoutClass"));
 
@@ -404,7 +415,8 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testDependenciesMaterializeThis() throws Exception {
-		XmlBeanFactory xbf = new XmlBeanFactory(DEP_MATERIALIZE_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(DEP_MATERIALIZE_CONTEXT);
 
 		assertEquals(2, xbf.getBeansOfType(DummyBo.class, true, false).size());
 		assertEquals(3, xbf.getBeansOfType(DummyBo.class, true, true).size());
@@ -421,8 +433,10 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testChildOverridesParentBean() throws Exception {
-		XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT);
-		XmlBeanFactory child = new XmlBeanFactory(CHILD_CONTEXT, parent);
+		DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT);
+		DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
+		new XmlBeanDefinitionReader(child).loadBeanDefinitions(CHILD_CONTEXT);
 		TestBean inherits = (TestBean) child.getBean("inheritedTestBean");
 		// Name property value is overridden
 		assertTrue(inherits.getName().equals("overrideParentBean"));
@@ -437,8 +451,10 @@ public final class XmlBeanFactoryTests {
 	 * If a singleton does this the factory will fail to load.
 	 */
 	public @Test void testBogusParentageFromParentFactory() throws Exception {
-		XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT);
-		XmlBeanFactory child = new XmlBeanFactory(CHILD_CONTEXT, parent);
+		DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT);
+		DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
+		new XmlBeanDefinitionReader(child).loadBeanDefinitions(CHILD_CONTEXT);
 		try {
 			child.getBean("bogusParent", TestBean.class);
 			fail();
@@ -456,8 +472,10 @@ public final class XmlBeanFactoryTests {
 	 * instances even if derived from a prototype
 	 */
 	public @Test void testSingletonInheritsFromParentFactoryPrototype() throws Exception {
-		XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT);
-		XmlBeanFactory child = new XmlBeanFactory(CHILD_CONTEXT, parent);
+		DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT);
+		DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
+		new XmlBeanDefinitionReader(child).loadBeanDefinitions(CHILD_CONTEXT);
 		TestBean inherits = (TestBean) child.getBean("singletonInheritsFromParentFactoryPrototype");
 		// Name property value is overriden
 		assertTrue(inherits.getName().equals("prototype-override"));
@@ -468,16 +486,20 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testSingletonFromParent() {
-		XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT);
+		DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT);
 		TestBean beanFromParent = (TestBean) parent.getBean("inheritedTestBeanSingleton");
-		XmlBeanFactory child = new XmlBeanFactory(CHILD_CONTEXT, parent);
+		DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
+		new XmlBeanDefinitionReader(child).loadBeanDefinitions(CHILD_CONTEXT);
 		TestBean beanFromChild = (TestBean) child.getBean("inheritedTestBeanSingleton");
 		assertTrue("singleton from parent and child is the same", beanFromParent == beanFromChild);
 	}
 
 	public @Test void testNestedPropertyValue() {
-		XmlBeanFactory parent = new XmlBeanFactory(PARENT_CONTEXT);
-		XmlBeanFactory child = new XmlBeanFactory(CHILD_CONTEXT, parent);
+		DefaultListableBeanFactory parent = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(parent).loadBeanDefinitions(PARENT_CONTEXT);
+		DefaultListableBeanFactory child = new DefaultListableBeanFactory(parent);
+		new XmlBeanDefinitionReader(child).loadBeanDefinitions(CHILD_CONTEXT);
 		IndexedTestBean bean = (IndexedTestBean) child.getBean("indexedTestBean");
 		assertEquals("name applied correctly", "myname", bean.getArray()[0].getName());
 	}
@@ -571,19 +593,22 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testFactoryReferenceCircle() {
-		XmlBeanFactory xbf = new XmlBeanFactory(FACTORY_CIRCLE_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(FACTORY_CIRCLE_CONTEXT);
 		TestBean tb = (TestBean) xbf.getBean("singletonFactory");
 		DummyFactory db = (DummyFactory) xbf.getBean("&singletonFactory");
 		assertTrue(tb == db.getOtherTestBean());
 	}
 
 	public @Test void testFactoryReferenceWithDoublePrefix() {
-		XmlBeanFactory xbf = new XmlBeanFactory(FACTORY_CIRCLE_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(FACTORY_CIRCLE_CONTEXT);
 		assertThat(xbf.getBean("&&singletonFactory"), instanceOf(DummyFactory.class));
 	}
 
 	public @Test void testComplexFactoryReferenceCircle() {
-		XmlBeanFactory xbf = new XmlBeanFactory(COMPLEX_FACTORY_CIRCLE_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(COMPLEX_FACTORY_CIRCLE_CONTEXT);
 		xbf.getBean("proxy1");
 		// check that unused instances from autowiring got removed
 		assertEquals(4, xbf.getSingletonCount());
@@ -594,7 +619,8 @@ public final class XmlBeanFactoryTests {
 
 	public @Test void testNoSuchFactoryBeanMethod() {
 		try {
-			XmlBeanFactory xbf = new XmlBeanFactory(NO_SUCH_FACTORY_METHOD_CONTEXT);
+			DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+			new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(NO_SUCH_FACTORY_METHOD_CONTEXT);
 			assertNotNull(xbf.getBean("defaultTestBean"));
 			fail("Should not get invalid bean");
 		}
@@ -604,7 +630,8 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testInitMethodIsInvoked() throws Exception {
-		XmlBeanFactory xbf = new XmlBeanFactory(INITIALIZERS_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INITIALIZERS_CONTEXT);
 		DoubleInitializer in = (DoubleInitializer) xbf.getBean("init-method1");
 		// Initializer should have doubled value
 		assertEquals(14, in.getNum());
@@ -614,7 +641,8 @@ public final class XmlBeanFactoryTests {
 	 * Test that if a custom initializer throws an exception, it's handled correctly
 	 */
 	public @Test void testInitMethodThrowsException() {
-		XmlBeanFactory xbf = new XmlBeanFactory(INITIALIZERS_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INITIALIZERS_CONTEXT);
 		try {
 			xbf.getBean("init-method2");
 			fail();
@@ -627,7 +655,8 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testNoSuchInitMethod() throws Exception {
-		XmlBeanFactory xbf = new XmlBeanFactory(INITIALIZERS_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INITIALIZERS_CONTEXT);
 		try {
 			xbf.getBean("init-method3");
 			fail();
@@ -645,7 +674,8 @@ public final class XmlBeanFactoryTests {
 	 */
 	public @Test void testInitializingBeanAndInitMethod() throws Exception {
 		InitAndIB.constructed = false;
-		XmlBeanFactory xbf = new XmlBeanFactory(INITIALIZERS_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INITIALIZERS_CONTEXT);
 		assertFalse(InitAndIB.constructed);
 		xbf.preInstantiateSingletons();
 		assertFalse(InitAndIB.constructed);
@@ -664,7 +694,8 @@ public final class XmlBeanFactoryTests {
 	 */
 	public @Test void testInitializingBeanAndSameInitMethod() throws Exception {
 		InitAndIB.constructed = false;
-		XmlBeanFactory xbf = new XmlBeanFactory(INITIALIZERS_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INITIALIZERS_CONTEXT);
 		assertFalse(InitAndIB.constructed);
 		xbf.preInstantiateSingletons();
 		assertFalse(InitAndIB.constructed);
@@ -680,7 +711,8 @@ public final class XmlBeanFactoryTests {
 
 	public @Test void testDefaultLazyInit() throws Exception {
 		InitAndIB.constructed = false;
-		XmlBeanFactory xbf = new XmlBeanFactory(DEFAULT_LAZY_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(DEFAULT_LAZY_CONTEXT);
 		assertFalse(InitAndIB.constructed);
 		xbf.preInstantiateSingletons();
 		assertTrue(InitAndIB.constructed);
@@ -693,8 +725,9 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testNoSuchXmlFile() throws Exception {
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
 		try {
-			new XmlBeanFactory(MISSING_CONTEXT);
+			new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(MISSING_CONTEXT);
 			fail("Must not create factory from missing XML");
 		}
 		catch (BeanDefinitionStoreException expected) {
@@ -702,8 +735,9 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testInvalidXmlFile() throws Exception {
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
 		try {
-			new XmlBeanFactory(INVALID_CONTEXT);
+			new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(INVALID_CONTEXT);
 			fail("Must not create factory from invalid XML");
 		}
 		catch (BeanDefinitionStoreException expected) {
@@ -711,8 +745,9 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testUnsatisfiedObjectDependencyCheck() throws Exception {
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
 		try {
-			XmlBeanFactory xbf = new XmlBeanFactory(UNSATISFIED_OBJECT_DEP_CONTEXT);
+			new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(UNSATISFIED_OBJECT_DEP_CONTEXT);
 			xbf.getBean("a", DependenciesBean.class);
 			fail("Must have thrown an UnsatisfiedDependencyException");
 		}
@@ -721,8 +756,9 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testUnsatisfiedSimpleDependencyCheck() throws Exception {
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
 		try {
-			XmlBeanFactory xbf = new XmlBeanFactory(UNSATISFIED_SIMPLE_DEP_CONTEXT);
+			new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(UNSATISFIED_SIMPLE_DEP_CONTEXT);
 			xbf.getBean("a", DependenciesBean.class);
 			fail("Must have thrown an UnsatisfiedDependencyException");
 		}
@@ -731,21 +767,24 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testSatisfiedObjectDependencyCheck() throws Exception {
-		XmlBeanFactory xbf = new XmlBeanFactory(SATISFIED_OBJECT_DEP_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(SATISFIED_OBJECT_DEP_CONTEXT);
 		DependenciesBean a = (DependenciesBean) xbf.getBean("a");
 		assertNotNull(a.getSpouse());
 		assertEquals(xbf, a.getBeanFactory());
 	}
 
 	public @Test void testSatisfiedSimpleDependencyCheck() throws Exception {
-		XmlBeanFactory xbf = new XmlBeanFactory(SATISFIED_SIMPLE_DEP_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(SATISFIED_SIMPLE_DEP_CONTEXT);
 		DependenciesBean a = (DependenciesBean) xbf.getBean("a");
 		assertEquals(a.getAge(), 33);
 	}
 
 	public @Test void testUnsatisfiedAllDependencyCheck() throws Exception {
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
 		try {
-			XmlBeanFactory xbf = new XmlBeanFactory(UNSATISFIED_ALL_DEP_CONTEXT);
+			new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(UNSATISFIED_ALL_DEP_CONTEXT);
 			xbf.getBean("a", DependenciesBean.class);
 			fail("Must have thrown an UnsatisfiedDependencyException");
 		}
@@ -754,7 +793,8 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testSatisfiedAllDependencyCheck() throws Exception {
-		XmlBeanFactory xbf = new XmlBeanFactory(SATISFIED_ALL_DEP_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(SATISFIED_ALL_DEP_CONTEXT);
 		DependenciesBean a = (DependenciesBean) xbf.getBean("a");
 		assertEquals(a.getAge(), 33);
 		assertNotNull(a.getName());
@@ -762,23 +802,27 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testAutowire() throws Exception {
-		XmlBeanFactory xbf = new XmlBeanFactory(AUTOWIRE_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(AUTOWIRE_CONTEXT);
 		TestBean spouse = new TestBean("kerry", 0);
 		xbf.registerSingleton("spouse", spouse);
 		doTestAutowire(xbf);
 	}
 
 	public @Test void testAutowireWithParent() throws Exception {
-		XmlBeanFactory xbf = new XmlBeanFactory(AUTOWIRE_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(AUTOWIRE_CONTEXT);
 		DefaultListableBeanFactory lbf = new DefaultListableBeanFactory();
 		MutablePropertyValues pvs = new MutablePropertyValues();
 		pvs.add("name", "kerry");
-		lbf.registerBeanDefinition("spouse", new RootBeanDefinition(TestBean.class, pvs));
+		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
+		bd.setPropertyValues(pvs);
+		lbf.registerBeanDefinition("spouse", bd);
 		xbf.setParentBeanFactory(lbf);
 		doTestAutowire(xbf);
 	}
 
-	private void doTestAutowire(XmlBeanFactory xbf) throws Exception {
+	private void doTestAutowire(DefaultListableBeanFactory xbf) throws Exception {
 		DependenciesBean rod1 = (DependenciesBean) xbf.getBean("rod1");
 		TestBean kerry = (TestBean) xbf.getBean("spouse");
 		// should have been autowired
@@ -827,7 +871,8 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testAutowireWithDefault() throws Exception {
-		XmlBeanFactory xbf = new XmlBeanFactory(DEFAULT_AUTOWIRE_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(DEFAULT_AUTOWIRE_CONTEXT);
 
 		DependenciesBean rod1 = (DependenciesBean) xbf.getBean("rod1");
 		// should have been autowired
@@ -848,7 +893,8 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testAutowireByConstructor() throws Exception {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 		ConstructorDependenciesBean rod1 = (ConstructorDependenciesBean) xbf.getBean("rod1");
 		TestBean kerry = (TestBean) xbf.getBean("kerry2");
 		// should have been autowired
@@ -884,7 +930,8 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testAutowireByConstructorWithSimpleValues() throws Exception {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 
 		ConstructorDependenciesBean rod5 = (ConstructorDependenciesBean) xbf.getBean("rod5");
 		TestBean kerry1 = (TestBean) xbf.getBean("kerry1");
@@ -912,7 +959,8 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testRelatedCausesFromConstructorResolution() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 
 		try {
 			xbf.getBean("rod2Accessor");
@@ -925,7 +973,8 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testConstructorArgResolution() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 		TestBean kerry1 = (TestBean) xbf.getBean("kerry1");
 		TestBean kerry2 = (TestBean) xbf.getBean("kerry2");
 
@@ -972,7 +1021,8 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testPrototypeWithExplicitArguments() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 		SimpleConstructorArgBean cd1 = (SimpleConstructorArgBean) xbf.getBean("rod18");
 		assertEquals(0, cd1.getAge());
 		SimpleConstructorArgBean cd2 = (SimpleConstructorArgBean) xbf.getBean("rod18", 98);
@@ -986,13 +1036,15 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testConstructorArgWithSingleMatch() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 		File file = (File) xbf.getBean("file");
 		assertEquals(File.separator + "test", file.getPath());
 	}
 
 	public @Test void testThrowsExceptionOnTooManyArguments() throws Exception {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 		try {
 			xbf.getBean("rod7", ConstructorDependenciesBean.class);
 			fail("Should have thrown BeanCreationException");
@@ -1002,7 +1054,8 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testThrowsExceptionOnAmbiguousResolution() throws Exception {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 		try {
 			xbf.getBean("rod8", ConstructorDependenciesBean.class);
 			fail("Must have thrown UnsatisfiedDependencyException");
@@ -1058,7 +1111,8 @@ public final class XmlBeanFactoryTests {
 		PreparingBean2.destroyed = false;
 		DependingBean.destroyCount = 0;
 		HoldingBean.destroyCount = 0;
-		XmlBeanFactory xbf = new XmlBeanFactory(resource);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(resource);
 		xbf.preInstantiateSingletons();
 		xbf.destroySingletons();
 		assertTrue(PreparingBean1.prepared);
@@ -1078,7 +1132,8 @@ public final class XmlBeanFactoryTests {
 	 * must rather only be picked up when the bean is instantiated.
 	 */
 	public @Test void testClassNotFoundWithDefaultBeanClassLoader() {
-		BeanFactory factory = new XmlBeanFactory(CLASS_NOT_FOUND_CONTEXT);
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(factory).loadBeanDefinitions(CLASS_NOT_FOUND_CONTEXT);
 		// cool, no errors, so the rubbish class name in the bean def was not resolved
 		try {
 			// let's resolve the bean definition; must blow up
@@ -1100,7 +1155,8 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testResourceAndInputStream() throws IOException {
-		XmlBeanFactory xbf = new XmlBeanFactory(RESOURCE_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(RESOURCE_CONTEXT);
 		// comes from "resourceImport.xml"
 		ResourceTestBean resource1 = (ResourceTestBean) xbf.getBean("resource1");
 		// comes from "resource.xml"
@@ -1122,7 +1178,8 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testClassPathResourceWithImport() {
-		XmlBeanFactory xbf = new XmlBeanFactory(RESOURCE_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(RESOURCE_CONTEXT);
 		// comes from "resourceImport.xml"
 		xbf.getBean("resource1", ResourceTestBean.class);
 		// comes from "resource.xml"
@@ -1131,7 +1188,8 @@ public final class XmlBeanFactoryTests {
 
 	public @Test void testUrlResourceWithImport() {
 		URL url = getClass().getResource(RESOURCE_CONTEXT.getPath());
-		XmlBeanFactory xbf = new XmlBeanFactory(new UrlResource(url));
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(new UrlResource(url));
 		// comes from "resourceImport.xml"
 		xbf.getBean("resource1", ResourceTestBean.class);
 		// comes from "resource.xml"
@@ -1140,7 +1198,8 @@ public final class XmlBeanFactoryTests {
 
 	public @Test void testFileSystemResourceWithImport() throws URISyntaxException {
 		String file = getClass().getResource(RESOURCE_CONTEXT.getPath()).toURI().getPath();
-		XmlBeanFactory xbf = new XmlBeanFactory(new FileSystemResource(file));
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(new FileSystemResource(file));
 		// comes from "resourceImport.xml"
 		xbf.getBean("resource1", ResourceTestBean.class);
 		// comes from "resource.xml"
@@ -1148,8 +1207,9 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testRecursiveImport() {
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
 		try {
-			new XmlBeanFactory(RECURSIVE_IMPORT_CONTEXT);
+			new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(RECURSIVE_IMPORT_CONTEXT);
 			fail("Should have thrown BeanDefinitionStoreException");
 		}
 		catch (BeanDefinitionStoreException ex) {
@@ -1344,7 +1404,8 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testConstructorArgWithSingleSimpleTypeMatch() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 
 		SingleSimpleTypeConstructorBean bean = (SingleSimpleTypeConstructorBean) xbf.getBean("beanWithBoolean");
 		assertTrue(bean.isSingleBoolean());
@@ -1354,7 +1415,8 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testConstructorArgWithDoubleSimpleTypeMatch() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 
 		SingleSimpleTypeConstructorBean bean = (SingleSimpleTypeConstructorBean) xbf.getBean("beanWithBooleanAndString");
 		assertTrue(bean.isSecondBoolean());
@@ -1366,33 +1428,38 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testDoubleBooleanAutowire() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 		DoubleBooleanConstructorBean bean = (DoubleBooleanConstructorBean) xbf.getBean("beanWithDoubleBoolean");
 		assertEquals(Boolean.TRUE, bean.boolean1);
 		assertEquals(Boolean.FALSE, bean.boolean2);
 	}
 
 	public @Test void testDoubleBooleanAutowireWithIndex() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 		DoubleBooleanConstructorBean bean = (DoubleBooleanConstructorBean) xbf.getBean("beanWithDoubleBooleanAndIndex");
 		assertEquals(Boolean.FALSE, bean.boolean1);
 		assertEquals(Boolean.TRUE, bean.boolean2);
 	}
 
 	public @Test void testLenientDependencyMatching() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 		LenientDependencyTestBean bean = (LenientDependencyTestBean) xbf.getBean("lenientDependencyTestBean");
 		assertTrue(bean.tb instanceof DerivedTestBean);
 	}
 
 	public @Test void testLenientDependencyMatchingFactoryMethod() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 		LenientDependencyTestBean bean = (LenientDependencyTestBean) xbf.getBean("lenientDependencyTestBeanFactoryMethod");
 		assertTrue(bean.tb instanceof DerivedTestBean);
 	}
 
 	public @Test void testNonLenientDependencyMatching() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 		AbstractBeanDefinition bd = (AbstractBeanDefinition) xbf.getBeanDefinition("lenientDependencyTestBean");
 		bd.setLenientConstructorResolution(false);
 		try {
@@ -1407,7 +1474,8 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testNonLenientDependencyMatchingFactoryMethod() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 		AbstractBeanDefinition bd = (AbstractBeanDefinition) xbf.getBeanDefinition("lenientDependencyTestBeanFactoryMethod");
 		bd.setLenientConstructorResolution(false);
 		try {
@@ -1422,7 +1490,8 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testJavaLangStringConstructor() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 		AbstractBeanDefinition bd = (AbstractBeanDefinition) xbf.getBeanDefinition("string");
 		bd.setLenientConstructorResolution(false);
 		String str = (String) xbf.getBean("string");
@@ -1430,7 +1499,8 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testCustomStringConstructor() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 		AbstractBeanDefinition bd = (AbstractBeanDefinition) xbf.getBeanDefinition("stringConstructor");
 		bd.setLenientConstructorResolution(false);
 		StringConstructorTestBean tb = (StringConstructorTestBean) xbf.getBean("stringConstructor");
@@ -1438,7 +1508,8 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testPrimitiveConstructorArray() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 		ConstructorArrayTestBean bean = (ConstructorArrayTestBean) xbf.getBean("constructorArray");
 		assertTrue(bean.array instanceof int[]);
 		assertEquals(1, ((int[]) bean.array).length);
@@ -1446,7 +1517,8 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testIndexedPrimitiveConstructorArray() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 		ConstructorArrayTestBean bean = (ConstructorArrayTestBean) xbf.getBean("indexedConstructorArray");
 		assertTrue(bean.array instanceof int[]);
 		assertEquals(1, ((int[]) bean.array).length);
@@ -1454,14 +1526,16 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testStringConstructorArrayNoType() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 		ConstructorArrayTestBean bean = (ConstructorArrayTestBean) xbf.getBean("constructorArrayNoType");
 		assertTrue(bean.array instanceof String[]);
 		assertEquals(0, ((String[]) bean.array).length);
 	}
 
 	public @Test void testStringConstructorArrayNoTypeNonLenient() {
-		XmlBeanFactory xbf = new XmlBeanFactory(CONSTRUCTOR_ARG_CONTEXT);
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(CONSTRUCTOR_ARG_CONTEXT);
 		AbstractBeanDefinition bd = (AbstractBeanDefinition) xbf.getBeanDefinition("constructorArrayNoType");
 		bd.setLenientConstructorResolution(false);
 		ConstructorArrayTestBean bean = (ConstructorArrayTestBean) xbf.getBean("constructorArrayNoType");
@@ -1470,8 +1544,9 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testWithDuplicateName() throws Exception {
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
 		try {
-			new XmlBeanFactory(TEST_WITH_DUP_NAMES_CONTEXT);
+			new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(TEST_WITH_DUP_NAMES_CONTEXT);
 			fail("Duplicate name not detected");
 		}
 		catch (BeansException ex) {
@@ -1480,8 +1555,9 @@ public final class XmlBeanFactoryTests {
 	}
 
 	public @Test void testWithDuplicateNameInAlias() throws Exception {
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
 		try {
-			new XmlBeanFactory(TEST_WITH_DUP_NAME_IN_ALIAS_CONTEXT);
+			new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(TEST_WITH_DUP_NAME_IN_ALIAS_CONTEXT);
 			fail("Duplicate name not detected");
 		}
 		catch (BeansException e) {
diff --git a/spring-context/src/test/java/org/springframework/cache/config/AnnotationNamespaceDrivenTests.java b/spring-context/src/test/java/org/springframework/cache/config/AnnotationNamespaceDrivenTests.java
index 44b931dfe6b..b6785792a58 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/AnnotationNamespaceDrivenTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/AnnotationNamespaceDrivenTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.cache.config;
 
-import junit.framework.Assert;
+import static org.junit.Assert.assertSame;
 
 import org.junit.Test;
 import org.springframework.cache.interceptor.CacheInterceptor;
@@ -39,6 +39,6 @@ public class AnnotationNamespaceDrivenTests extends AbstractAnnotationTests {
 	public void testKeyStrategy() throws Exception {
 		CacheInterceptor ci = ctx.getBean("org.springframework.cache.interceptor.CacheInterceptor#0",
 				CacheInterceptor.class);
-		Assert.assertSame(ctx.getBean("keyGenerator"), ci.getKeyGenerator());
+		assertSame(ctx.getBean("keyGenerator"), ci.getKeyGenerator());
 	}
 }
diff --git a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
index 04f232cc845..0a611c0bbfe 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java
@@ -16,12 +16,11 @@
 
 package org.springframework.cache.config;
 
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
 
-import junit.framework.Assert;
-
 import org.junit.Test;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.cache.CacheManager;
@@ -53,7 +52,7 @@ public class EnableCachingTests extends AbstractAnnotationTests {
 	@Test
 	public void testKeyStrategy() throws Exception {
 		CacheInterceptor ci = ctx.getBean(CacheInterceptor.class);
-		Assert.assertSame(ctx.getBean(KeyGenerator.class), ci.getKeyGenerator());
+		assertSame(ctx.getBean(KeyGenerator.class), ci.getKeyGenerator());
 	}
 
 	// --- local tests -------
diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java b/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java
index 6c63077602a..59137c75169 100644
--- a/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests.java
@@ -16,14 +16,16 @@
 
 package org.springframework.context.access;
 
-import static org.junit.Assert.*;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
+import org.junit.Test;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.access.BeanFactoryLocator;
 import org.springframework.beans.factory.access.BeanFactoryReference;
 import org.springframework.beans.factory.access.SingletonBeanFactoryLocatorTests;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.ClassUtils;
@@ -43,8 +45,10 @@ public class ContextSingletonBeanFactoryLocatorTests extends SingletonBeanFactor
 	public void testBaseBeanFactoryDefs() {
 		// Just test the base BeanFactory/AppContext defs we are going to work
 		// with in other tests.
-		new XmlBeanFactory(new ClassPathResource("/org/springframework/beans/factory/access/beans1.xml"));
-		new XmlBeanFactory(new ClassPathResource("/org/springframework/beans/factory/access/beans2.xml"));
+		new XmlBeanDefinitionReader(new DefaultListableBeanFactory()).loadBeanDefinitions(new ClassPathResource(
+				"/org/springframework/beans/factory/access/beans1.xml"));
+		new XmlBeanDefinitionReader(new DefaultListableBeanFactory()).loadBeanDefinitions(new ClassPathResource(
+				"/org/springframework/beans/factory/access/beans2.xml"));
 	}
 
 	@Override
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
index 5029e1c7e6d..62aa1411a3a 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
@@ -34,6 +34,7 @@ import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.annotation.InitDestroyAnnotationBeanPostProcessor;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor;
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -171,9 +172,15 @@ public class CommonAnnotationBeanPostProcessorTests {
 		CommonAnnotationBeanPostProcessor bpp = new CommonAnnotationBeanPostProcessor();
 		bpp.setResourceFactory(bf);
 		bf.addBeanPostProcessor(bpp);
-		bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ResourceInjectionBean.class, false));
-		bf.registerBeanDefinition("testBean", new RootBeanDefinition(TestBean.class, false));
-		bf.registerBeanDefinition("testBean2", new RootBeanDefinition(TestBean.class, false));
+		RootBeanDefinition abd = new RootBeanDefinition(ResourceInjectionBean.class);
+		abd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
+		bf.registerBeanDefinition("annotatedBean", abd);
+		RootBeanDefinition tbd1 = new RootBeanDefinition(TestBean.class);
+		tbd1.setScope(BeanDefinition.SCOPE_PROTOTYPE);
+		bf.registerBeanDefinition("testBean", tbd1);
+		RootBeanDefinition tbd2 = new RootBeanDefinition(TestBean.class);
+		tbd2.setScope(BeanDefinition.SCOPE_PROTOTYPE);
+		bf.registerBeanDefinition("testBean2", tbd2);
 
 		ResourceInjectionBean bean = (ResourceInjectionBean) bf.getBean("annotatedBean");
 		assertTrue(bean.initCalled);
@@ -202,8 +209,12 @@ public class CommonAnnotationBeanPostProcessorTests {
 		CommonAnnotationBeanPostProcessor bpp = new CommonAnnotationBeanPostProcessor();
 		bpp.setBeanFactory(bf);
 		bf.addBeanPostProcessor(bpp);
-		bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(ExtendedResourceInjectionBean.class, false));
-		bf.registerBeanDefinition("testBean4", new RootBeanDefinition(TestBean.class, false));
+		RootBeanDefinition abd = new RootBeanDefinition(ExtendedResourceInjectionBean.class);
+		abd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
+		bf.registerBeanDefinition("annotatedBean", abd);
+		RootBeanDefinition tbd = new RootBeanDefinition(TestBean.class);
+		tbd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
+		bf.registerBeanDefinition("testBean4", tbd);
 
 		bf.registerResolvableDependency(BeanFactory.class, bf);
 		bf.registerResolvableDependency(INestedTestBean.class, new ObjectFactory() {
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
index 2051c97fe0e..896e9b2a4f1 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
@@ -25,8 +25,9 @@ import test.beans.TestBean;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
@@ -79,7 +80,9 @@ public class AutowiredConfigurationTests {
 	 */
 	@Test(expected=BeanCreationException.class)
 	public void testAutowiredConfigurationConstructorsAreNotSupported() {
-		XmlBeanFactory factory = new XmlBeanFactory(new ClassPathResource("annotation-config.xml", AutowiredConstructorConfig.class));
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(factory).loadBeanDefinitions(
+				new ClassPathResource("annotation-config.xml", AutowiredConstructorConfig.class));
 		GenericApplicationContext ctx = new GenericApplicationContext(factory);
 		ctx.registerBeanDefinition("config1", new RootBeanDefinition(AutowiredConstructorConfig.class));
 		ctx.registerBeanDefinition("config2", new RootBeanDefinition(ColorConfig.class));
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java
index 9c94716494a..47b3d2abb56 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassAspectIntegrationTests.java
@@ -16,14 +16,15 @@
 
 package org.springframework.context.annotation.configuration;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
 
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.junit.Test;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ConfigurationClassPostProcessor;
@@ -47,8 +48,10 @@ import test.beans.TestBean;
  */
 public class ConfigurationClassAspectIntegrationTests {
 	private void assertAdviceWasApplied(Class configClass) {
-		GenericApplicationContext ctx = new GenericApplicationContext(
-					new XmlBeanFactory(new ClassPathResource("aspectj-autoproxy-config.xml", ConfigurationClassAspectIntegrationTests.class)));
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(factory).loadBeanDefinitions(
+				new ClassPathResource("aspectj-autoproxy-config.xml", ConfigurationClassAspectIntegrationTests.class));
+		GenericApplicationContext ctx = new GenericApplicationContext(factory);
 		ctx.addBeanFactoryPostProcessor(new ConfigurationClassPostProcessor());
 		ctx.registerBeanDefinition("config", new RootBeanDefinition(configClass));
 		ctx.refresh();
diff --git a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
index 4a9a4db08d2..592337551c2 100644
--- a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
@@ -86,7 +86,7 @@ public class EventPublicationInterceptorTests {
 		class TestContext extends StaticApplicationContext {
 			@Override
 			protected void onRefresh() throws BeansException {
-				addListener(listener);
+				addApplicationListener(listener);
 			}
 		}
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
index 9c7ea0ca659..39651c9370f 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
@@ -54,7 +54,7 @@ public class StaticApplicationContextMulticasterTests extends AbstractApplicatio
 		parent.registerSingleton(StaticApplicationContext.APPLICATION_EVENT_MULTICASTER_BEAN_NAME,
 				TestApplicationEventMulticaster.class, null);
 		parent.refresh();
-		parent.addListener(parentListener) ;
+		parent.addApplicationListener(parentListener) ;
 
 		parent.getStaticMessageSource().addMessage("code1", Locale.getDefault(), "message1");
 
@@ -66,7 +66,7 @@ public class StaticApplicationContextMulticasterTests extends AbstractApplicatio
 		Resource resource = new ClassPathResource("testBeans.properties", getClass());
 		reader.loadBeanDefinitions(new EncodedResource(resource, "ISO-8859-1"));
 		sac.refresh();
-		sac.addListener(listener);
+		sac.addApplicationListener(listener);
 
 		sac.getStaticMessageSource().addMessage("code2", Locale.getDefault(), "message2");
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
index 1c63274f197..acddae3ff11 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
@@ -48,7 +48,7 @@ public class StaticApplicationContextTests extends AbstractApplicationContextTes
 		m.put("name", "Albert");
 		parent.registerPrototype("father", TestBean.class, new MutablePropertyValues(m));
 		parent.refresh();
-		parent.addListener(parentListener) ;
+		parent.addApplicationListener(parentListener) ;
 
 		parent.getStaticMessageSource().addMessage("code1", Locale.getDefault(), "message1");
 
@@ -59,7 +59,7 @@ public class StaticApplicationContextTests extends AbstractApplicationContextTes
 		PropertiesBeanDefinitionReader reader = new PropertiesBeanDefinitionReader(sac.getDefaultListableBeanFactory());
 		reader.loadBeanDefinitions(new ClassPathResource("testBeans.properties", getClass()));
 		sac.refresh();
-		sac.addListener(listener);
+		sac.addApplicationListener(listener);
 
 		sac.getStaticMessageSource().addMessage("code2", Locale.getDefault(), "message2");
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
index 9fa8ddd436d..8a94e8326e4 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
@@ -208,7 +208,7 @@ public class StaticMessageSourceTests extends AbstractApplicationContextTests {
 		parent.registerPrototype("father", org.springframework.beans.TestBean.class, new MutablePropertyValues(m));
 
 		parent.refresh();
-		parent.addListener(parentListener);
+		parent.addApplicationListener(parentListener);
 
 		this.sac = new StaticApplicationContext(parent);
 
@@ -221,7 +221,7 @@ public class StaticMessageSourceTests extends AbstractApplicationContextTests {
 		PropertiesBeanDefinitionReader reader = new PropertiesBeanDefinitionReader(sac.getDefaultListableBeanFactory());
 		reader.loadBeanDefinitions(new ClassPathResource("testBeans.properties", getClass()));
 		sac.refresh();
-		sac.addListener(listener);
+		sac.addApplicationListener(listener);
 
 		StaticMessageSource messageSource = sac.getStaticMessageSource();
 		Map usMessages = new HashMap(3);
diff --git a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
index 6fcefd9d751..6b0fb87da7e 100644
--- a/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
+++ b/spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
@@ -36,6 +36,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.ConfigurablePropertyAccessor;
 import org.springframework.beans.PropertyAccessorFactory;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -112,7 +113,9 @@ public class FormattingConversionServiceTests {
 	@Test
 	public void testFormatFieldForValueInjectionUsingMetaAnnotations() {
 		AnnotationConfigApplicationContext ac = new AnnotationConfigApplicationContext();
-		ac.registerBeanDefinition("valueBean", new RootBeanDefinition(MetaValueBean.class, false));
+		RootBeanDefinition bd = new RootBeanDefinition(MetaValueBean.class);
+		bd.setScope(BeanDefinition.SCOPE_PROTOTYPE);
+		ac.registerBeanDefinition("valueBean", bd);
 		ac.registerBeanDefinition("conversionService", new RootBeanDefinition(FormattingConversionServiceFactoryBean.class));
 		ac.registerBeanDefinition("ppc", new RootBeanDefinition(PropertyPlaceholderConfigurer.class));
 		ac.refresh();
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
index 83011aec3bb..26b0af991d0 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
@@ -37,7 +37,7 @@ import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.beans.TestBean;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.jmx.AbstractMBeanServerTests;
 import org.springframework.jmx.IJmxTestBean;
@@ -155,7 +155,8 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests {
 	}
 
 	public void testAutodetectMBeans() throws Exception {
-		XmlBeanFactory bf = new XmlBeanFactory(new ClassPathResource("autodetectMBeans.xml", getClass()));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource("autodetectMBeans.xml", getClass()));
 		try {
 			bf.getBean("exporter");
 			MBeanServer server = (MBeanServer) bf.getBean("server");
@@ -171,7 +172,8 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests {
 	}
 
 	public void testAutodetectWithExclude() throws Exception {
-		XmlBeanFactory bf = new XmlBeanFactory(new ClassPathResource("autodetectMBeans.xml", getClass()));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource("autodetectMBeans.xml", getClass()));
 		try {
 			bf.getBean("exporter");
 			MBeanServer server = (MBeanServer) bf.getBean("server");
@@ -189,7 +191,8 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests {
 	}
 
 	public void testAutodetectLazyMBeans() throws Exception {
-		XmlBeanFactory bf = new XmlBeanFactory(new ClassPathResource("autodetectLazyMBeans.xml", getClass()));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource("autodetectLazyMBeans.xml", getClass()));
 		try {
 			bf.getBean("exporter");
 			MBeanServer server = (MBeanServer) bf.getBean("server");
@@ -209,7 +212,8 @@ public final class MBeanExporterTests extends AbstractMBeanServerTests {
 	}
 
 	public void testAutodetectNoMBeans() throws Exception {
-		XmlBeanFactory bf = new XmlBeanFactory(new ClassPathResource("autodetectNoMBeans.xml", getClass()));
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource("autodetectNoMBeans.xml", getClass()));
 		try {
 			bf.getBean("exporter");
 		} finally {
diff --git a/spring-context/src/test/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutorTests.java b/spring-context/src/test/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutorTests.java
index 0d8729dfdf3..eee6c1029a1 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutorTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/backportconcurrent/ConcurrentTaskExecutorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import org.springframework.core.task.NoOpRunnable;
  * @author Rick Evans
  * @author Juergen Hoeller
  */
+@Deprecated
 public class ConcurrentTaskExecutorTests extends TestCase {
 
 	public void testZeroArgCtorResultsInDefaultTaskExecutorBeingUsed() throws Exception {
diff --git a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
index f45f032382a..e0945fab1de 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
@@ -29,6 +29,7 @@ import org.springframework.scheduling.TestMethodInvokingTask;
  * @author Juergen Hoeller
  * @since 20.02.2004
  */
+@Deprecated
 public class TimerSupportTests extends TestCase {
 
 	public void testTimerFactoryBean() throws Exception {
diff --git a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java
index 2469e55823e..c9397abba4b 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerTaskExecutorTests.java
@@ -28,6 +28,7 @@ import org.junit.Test;
  * @author Rick Evans
  * @author Chris Beams
  */
+@Deprecated
 public final class TimerTaskExecutorTests {
 
 	@Test(expected=IllegalArgumentException.class)
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
index 962e72b766a..dd338997f0f 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
@@ -19,7 +19,6 @@ package org.springframework.scripting.jruby;
 import java.util.Map;
 
 import junit.framework.TestCase;
-import junit.framework.Assert;
 
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.target.dynamic.Refreshable;
@@ -55,14 +54,14 @@ public class JRubyScriptFactoryTests extends TestCase {
 		assertFalse("Scripted object should not be instance of Refreshable", calc instanceof Refreshable);
 		assertFalse("Scripted object should not be instance of Refreshable", messenger instanceof Refreshable);
 
-		Assert.assertEquals(calc, calc);
-		Assert.assertEquals(messenger, messenger);
+		assertEquals(calc, calc);
+		assertEquals(messenger, messenger);
 		assertTrue(!messenger.equals(calc));
 		assertNotSame(messenger.hashCode(), calc.hashCode());
 		assertTrue(!messenger.toString().equals(calc.toString()));
 
 		String desiredMessage = "Hello World!";
-		Assert.assertEquals("Message is incorrect", desiredMessage, messenger.getMessage());
+		assertEquals("Message is incorrect", desiredMessage, messenger.getMessage());
 	}
 
 	public void testNonStaticScript() throws Exception {
@@ -73,12 +72,12 @@ public class JRubyScriptFactoryTests extends TestCase {
 		assertTrue("Should be an instance of Refreshable", messenger instanceof Refreshable);
 
 		String desiredMessage = "Hello World!";
-		Assert.assertEquals("Message is incorrect.", desiredMessage, messenger.getMessage());
+		assertEquals("Message is incorrect.", desiredMessage, messenger.getMessage());
 
 		Refreshable refreshable = (Refreshable) messenger;
 		refreshable.refresh();
 
-		Assert.assertEquals("Message is incorrect after refresh.", desiredMessage, messenger.getMessage());
+		assertEquals("Message is incorrect after refresh.", desiredMessage, messenger.getMessage());
 		assertEquals("Incorrect refresh count", 2, refreshable.getRefreshCount());
 	}
 
@@ -142,14 +141,14 @@ public class JRubyScriptFactoryTests extends TestCase {
 		TestBean testBean = (TestBean) ctx.getBean("testBean");
 
 		Messenger messenger = (Messenger) ctx.getBean("messenger");
-		Assert.assertEquals("Hello World!", messenger.getMessage());
+		assertEquals("Hello World!", messenger.getMessage());
 		assertFalse(messenger instanceof Refreshable);
 
 		TestBeanAwareMessenger messengerByType = (TestBeanAwareMessenger) ctx.getBean("messengerByType");
-		Assert.assertEquals(testBean, messengerByType.getTestBean());
+		assertEquals(testBean, messengerByType.getTestBean());
 
 		TestBeanAwareMessenger messengerByName = (TestBeanAwareMessenger) ctx.getBean("messengerByName");
-		Assert.assertEquals(testBean, messengerByName.getTestBean());
+		assertEquals(testBean, messengerByName.getTestBean());
 	}
 
 	public void testPrototypeScriptFromTag() throws Exception {
@@ -159,12 +158,12 @@ public class JRubyScriptFactoryTests extends TestCase {
 
 		assertNotSame(messenger, messenger2);
 		assertSame(messenger.getClass(), messenger2.getClass());
-		Assert.assertEquals("Hello World!", messenger.getMessage());
-		Assert.assertEquals("Hello World!", messenger2.getMessage());
+		assertEquals("Hello World!", messenger.getMessage());
+		assertEquals("Hello World!", messenger2.getMessage());
 		messenger.setMessage("Bye World!");
 		messenger2.setMessage("Byebye World!");
-		Assert.assertEquals("Bye World!", messenger.getMessage());
-		Assert.assertEquals("Byebye World!", messenger2.getMessage());
+		assertEquals("Bye World!", messenger.getMessage());
+		assertEquals("Byebye World!", messenger2.getMessage());
 	}
 
 	public void testInlineScriptFromTag() throws Exception {
@@ -177,18 +176,18 @@ public class JRubyScriptFactoryTests extends TestCase {
 	public void testRefreshableFromTag() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("jruby-with-xsd.xml", getClass());
 		Messenger messenger = (Messenger) ctx.getBean("refreshableMessenger");
-		Assert.assertEquals("Hello World!", messenger.getMessage());
+		assertEquals("Hello World!", messenger.getMessage());
 		assertTrue("Messenger should be Refreshable", messenger instanceof Refreshable);
 	}
 
 	public void testThatMultipleScriptInterfacesAreSupported() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("jruby-with-xsd.xml", getClass());
 		Messenger messenger = (Messenger) ctx.getBean("calculatingMessenger");
-		Assert.assertEquals("Hello World!", messenger.getMessage());
+		assertEquals("Hello World!", messenger.getMessage());
 
 		// cool, now check that the Calculator interface is also exposed
 		Calculator calc = (Calculator) messenger;
-		Assert.assertEquals(0, calc.add(2, -2));
+		assertEquals(0, calc.add(2, -2));
 	}
 
 	public void testWithComplexArg() throws Exception {
@@ -270,7 +269,7 @@ public class JRubyScriptFactoryTests extends TestCase {
 	public void testAOP() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("jruby-aop.xml", getClass());
 		Messenger messenger = (Messenger) ctx.getBean("messenger");
-		Assert.assertEquals(new StringBuffer("Hello World!").reverse().toString(), messenger.getMessage());
+		assertEquals(new StringBuffer("Hello World!").reverse().toString(), messenger.getMessage());
 	}
 
 
diff --git a/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
index 47b65817275..17272b825a6 100644
--- a/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
@@ -205,7 +205,7 @@ public class ScriptFactoryPostProcessorTests extends TestCase {
 		ctx.registerBeanDefinition("messenger", BeanDefinitionBuilder.rootBeanDefinition(StubMessenger.class).getBeanDefinition());
 
 		BeanDefinitionBuilder scriptedBeanBuilder = BeanDefinitionBuilder.rootBeanDefinition(GroovyScriptFactory.class);
-		scriptedBeanBuilder.setSingleton(false);
+		scriptedBeanBuilder.setScope(BeanDefinition.SCOPE_PROTOTYPE);
 		scriptedBeanBuilder.addConstructorArgValue(DELEGATING_SCRIPT);
 		scriptedBeanBuilder.addPropertyReference("messenger", "messenger");
 
diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java
index 543999cc890..e64219c59ca 100644
--- a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java
@@ -20,7 +20,6 @@ import java.beans.PropertyEditorSupport;
 import java.util.Map;
 
 import junit.framework.TestCase;
-import junit.framework.Assert;
 
 import org.springframework.beans.FieldAccessBean;
 import org.springframework.beans.MutablePropertyValues;
@@ -106,7 +105,7 @@ public class DataBinderFieldAccessTests extends TestCase {
 			assertTrue("Correct number of age errors", br.getFieldErrorCount("age") == 1);
 			assertEquals("32x", binder.getBindingResult().getFieldValue("age"));
 			assertEquals("32x", binder.getBindingResult().getFieldError("age").getRejectedValue());
-			Assert.assertEquals(0, tb.getAge());
+			assertEquals(0, tb.getAge());
 		}
 	}
 
@@ -152,7 +151,7 @@ public class DataBinderFieldAccessTests extends TestCase {
 			assertTrue("Correct number of age errors", br.getFieldErrorCount("age") == 1);
 			assertEquals("32x", binder.getBindingResult().getFieldValue("age"));
 			assertEquals("32x", binder.getBindingResult().getFieldError("age").getRejectedValue());
-			Assert.assertEquals(0, tb.getAge());
+			assertEquals(0, tb.getAge());
 
 			assertTrue("Does not have spouse errors", !br.hasFieldErrors("spouse"));
 			assertEquals("Kerry", binder.getBindingResult().getFieldValue("spouse"));
diff --git a/spring-core/src/test/java/org/springframework/core/CollectionFactoryTests.java b/spring-core/src/test/java/org/springframework/core/CollectionFactoryTests.java
index 3e7d144b5cc..45b27e2dc43 100644
--- a/spring-core/src/test/java/org/springframework/core/CollectionFactoryTests.java
+++ b/spring-core/src/test/java/org/springframework/core/CollectionFactoryTests.java
@@ -33,21 +33,25 @@ import org.springframework.util.MultiValueMap;
  */
 public class CollectionFactoryTests extends TestCase {
 
+	@SuppressWarnings("deprecation")
 	public void testLinkedSet() {
 		Set set = CollectionFactory.createLinkedSetIfPossible(16);
 		assertTrue(set instanceof LinkedHashSet);
 	}
 
+	@SuppressWarnings("deprecation")
 	public void testLinkedMap() {
 		Map map = CollectionFactory.createLinkedMapIfPossible(16);
 		assertTrue(map instanceof LinkedHashMap);
 	}
 
+	@SuppressWarnings("deprecation")
 	public void testIdentityMap() {
 		Map map = CollectionFactory.createIdentityMapIfPossible(16);
 		assertTrue(map instanceof IdentityHashMap);
 	}
 
+	@SuppressWarnings("deprecation")
 	public void testConcurrentMap() {
 		Map map = CollectionFactory.createConcurrentMapIfPossible(16);
 		assertTrue(map.getClass().getName().endsWith("ConcurrentHashMap"));
@@ -58,6 +62,7 @@ public class CollectionFactoryTests extends TestCase {
 		assertTrue(map.getClass().getName().endsWith("MultiValueMap"));
 	}
 
+	@SuppressWarnings("deprecation")
 	public void testConcurrentMapWithExplicitInterface() {
 		ConcurrentMap map = CollectionFactory.createConcurrentMap(16);
 		assertTrue(map.getClass().getSuperclass().getName().endsWith("ConcurrentHashMap"));
diff --git a/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java
index c7e2b7e6207..bb70889aaeb 100644
--- a/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java
+++ b/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java
@@ -25,8 +25,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.Assert;
-
 import org.springframework.beans.GenericBean;
 import org.springframework.core.io.Resource;
 
@@ -96,11 +94,11 @@ public class GenericCollectionTypeResolverTests extends AbstractGenericsTests {
 
 	public void testProgrammaticListIntrospection() throws Exception {
 		Method setter = GenericBean.class.getMethod("setResourceList", List.class);
-		Assert.assertEquals(Resource.class,
+		assertEquals(Resource.class,
 				GenericCollectionTypeResolver.getCollectionParameterType(new MethodParameter(setter, 0)));
 
 		Method getter = GenericBean.class.getMethod("getResourceList");
-		Assert.assertEquals(Resource.class,
+		assertEquals(Resource.class,
 				GenericCollectionTypeResolver.getCollectionReturnType(getter));
 	}
 
diff --git a/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java b/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java
index 12046e979dc..dff42909365 100644
--- a/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java
+++ b/spring-core/src/test/java/org/springframework/core/NestedExceptionTests.java
@@ -20,7 +20,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;
 
 import junit.framework.TestCase;
-import junit.framework.Assert;
 
 /**
  * @author Rod Johnson
@@ -52,7 +51,7 @@ public class NestedExceptionTests extends TestCase {
 		Exception rootCause = new Exception(rootCauseMesg);
 		// Making a class abstract doesn't _really_ prevent instantiation :-)
 		NestedRuntimeException nex = new NestedRuntimeException(myMessage, rootCause) {};
-		Assert.assertEquals(nex.getCause(), rootCause);
+		assertEquals(nex.getCause(), rootCause);
 		assertTrue(nex.getMessage().indexOf(myMessage) != -1);
 		assertTrue(nex.getMessage().indexOf(rootCauseMesg) != -1);
 
@@ -90,7 +89,7 @@ public class NestedExceptionTests extends TestCase {
 		Exception rootCause = new Exception(rootCauseMesg);
 		// Making a class abstract doesn't _really_ prevent instantiation :-)
 		NestedCheckedException nex = new NestedCheckedException(myMessage, rootCause) {};
-		Assert.assertEquals(nex.getCause(), rootCause);
+		assertEquals(nex.getCause(), rootCause);
 		assertTrue(nex.getMessage().indexOf(myMessage) != -1);
 		assertTrue(nex.getMessage().indexOf(rootCauseMesg) != -1);
 
diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java
index 2e4f86cb0c7..3dde4907053 100644
--- a/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java
+++ b/spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java
@@ -401,7 +401,7 @@ public class DefaultConversionTests {
 	public void convertArrayToObjectAssignableTargetType() {
 		Long[] array = new Long[] { 3L };
 		Long[] result = (Long[]) conversionService.convert(array, Object.class);
-		assertEquals(array, result);
+		assertArrayEquals(array, result);
 	}
 
 	@Test
diff --git a/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java b/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java
index 04b5ad53a5f..4bd9a3f182d 100644
--- a/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java
+++ b/spring-core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java
@@ -29,6 +29,7 @@ import junit.framework.TestCase;
  * @author Juergen Hoeller
  * @author Sam Brannen
  */
+@Deprecated
 public class LabeledEnumTests extends TestCase {
 
 	private byte[] serializeObject(final Object obj) throws IOException {
diff --git a/spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java b/spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java
index 19163fa17a9..a12d2c09129 100644
--- a/spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java
+++ b/spring-core/src/test/java/org/springframework/core/io/support/ResourceArrayPropertyEditorTests.java
@@ -21,6 +21,7 @@ import java.beans.PropertyEditor;
 import static org.junit.Assert.*;
 import org.junit.Test;
 
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.core.io.Resource;
 
 /**
@@ -67,7 +68,9 @@ public class ResourceArrayPropertyEditorTests {
 
 	@Test(expected=IllegalArgumentException.class)
 	public void testStrictSystemPropertyReplacement() {
-		PropertyEditor editor = new ResourceArrayPropertyEditor(new PathMatchingResourcePatternResolver(), false);
+		PropertyEditor editor = new ResourceArrayPropertyEditor(
+				new PathMatchingResourcePatternResolver(), new StandardEnvironment(),
+				false);
 		System.setProperty("test.prop", "foo");
 		try {
 			editor.setAsText("${test.prop}-${bar}");
diff --git a/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java b/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java
index 49650303b8f..f353d34fb1d 100644
--- a/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java
+++ b/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java
@@ -17,13 +17,14 @@
 package org.springframework.core.style;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import junit.framework.TestCase;
 
-import org.springframework.core.CollectionFactory;
 import org.springframework.util.ObjectUtils;
 
 /**
@@ -65,7 +66,7 @@ public class ToStringCreatorTests extends TestCase {
 	}
 
 	private Map getMap() {
-		Map map = CollectionFactory.createLinkedMapIfPossible(3);
+		Map map = new LinkedHashMap(3);
 		map.put("Keri", "Softball");
 		map.put("Scot", "Fishing");
 		map.put("Keith", "Flag Football");
@@ -96,7 +97,7 @@ public class ToStringCreatorTests extends TestCase {
 	}
 
 	public void testSet() {
-		Set set = CollectionFactory.createLinkedSetIfPossible(3);
+		Set set = new LinkedHashSet<>(3);
 		set.add(s1);
 		set.add(s2);
 		set.add(s3);
diff --git a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
index 6eb67d06617..ff97d15d920 100644
--- a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
+++ b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
@@ -19,7 +19,6 @@ package org.springframework.util;
 import java.util.LinkedList;
 
 import junit.framework.*;
-import junit.framework.Assert;
 
 import org.springframework.beans.TestBean;
 
@@ -72,14 +71,14 @@ public class AutoPopulatingListTests extends TestCase {
 		for(int x = 0; x < list.size(); x++) {
 			Object element = list.get(x);
 			if(element instanceof TestBean) {
-				junit.framework.Assert.assertEquals(x, ((TestBean) element).getAge());
+				assertEquals(x, ((TestBean) element).getAge());
 			}
 		}
 	}
 
 	public void testSerialization() throws Exception {
 		AutoPopulatingList list = new AutoPopulatingList(TestBean.class);
-		Assert.assertEquals(list, SerializationTestUtils.serializeAndDeserialize(list));
+		assertEquals(list, SerializationTestUtils.serializeAndDeserialize(list));
 	}
 
 
diff --git a/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java b/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java
index 4f878984324..8e6dcc566dc 100644
--- a/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java
+++ b/spring-core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java
@@ -27,6 +27,7 @@ import junit.framework.TestCase;
  * @author Keith Donald
  * @author Juergen Hoeller
  */
+@Deprecated
 public class CachingMapDecoratorTests extends TestCase {
 
 	public void testValidCache() {
diff --git a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
index 39761fb5dea..e8ab8474060 100644
--- a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
@@ -41,6 +41,8 @@ import org.springframework.beans.TestBean;
  */
 public class ClassUtilsTests extends TestCase {
 
+	private ClassLoader classLoader = getClass().getClassLoader();
+
 	@Override
 	public void setUp() {
 		InnerClass.noArgCalled = false;
@@ -49,56 +51,56 @@ public class ClassUtilsTests extends TestCase {
 	}
 
 	public void testIsPresent() throws Exception {
-		assertTrue(ClassUtils.isPresent("java.lang.String"));
-		assertFalse(ClassUtils.isPresent("java.lang.MySpecialString"));
+		assertTrue(ClassUtils.isPresent("java.lang.String", classLoader));
+		assertFalse(ClassUtils.isPresent("java.lang.MySpecialString", classLoader));
 	}
 
 	public void testForName() throws ClassNotFoundException {
-		assertEquals(String.class, ClassUtils.forName("java.lang.String"));
-		assertEquals(String[].class, ClassUtils.forName("java.lang.String[]"));
-		assertEquals(String[].class, ClassUtils.forName(String[].class.getName()));
-		assertEquals(String[][].class, ClassUtils.forName(String[][].class.getName()));
-		assertEquals(String[][][].class, ClassUtils.forName(String[][][].class.getName()));
-		assertEquals(TestBean.class, ClassUtils.forName("org.springframework.beans.TestBean"));
-		assertEquals(TestBean[].class, ClassUtils.forName("org.springframework.beans.TestBean[]"));
-		assertEquals(TestBean[].class, ClassUtils.forName(TestBean[].class.getName()));
-		assertEquals(TestBean[][].class, ClassUtils.forName("org.springframework.beans.TestBean[][]"));
-		assertEquals(TestBean[][].class, ClassUtils.forName(TestBean[][].class.getName()));
-		assertEquals(short[][][].class, ClassUtils.forName("[[[S"));
+		assertEquals(String.class, ClassUtils.forName("java.lang.String", classLoader));
+		assertEquals(String[].class, ClassUtils.forName("java.lang.String[]", classLoader));
+		assertEquals(String[].class, ClassUtils.forName(String[].class.getName(), classLoader));
+		assertEquals(String[][].class, ClassUtils.forName(String[][].class.getName(), classLoader));
+		assertEquals(String[][][].class, ClassUtils.forName(String[][][].class.getName(), classLoader));
+		assertEquals(TestBean.class, ClassUtils.forName("org.springframework.beans.TestBean", classLoader));
+		assertEquals(TestBean[].class, ClassUtils.forName("org.springframework.beans.TestBean[]", classLoader));
+		assertEquals(TestBean[].class, ClassUtils.forName(TestBean[].class.getName(), classLoader));
+		assertEquals(TestBean[][].class, ClassUtils.forName("org.springframework.beans.TestBean[][]", classLoader));
+		assertEquals(TestBean[][].class, ClassUtils.forName(TestBean[][].class.getName(), classLoader));
+		assertEquals(short[][][].class, ClassUtils.forName("[[[S", classLoader));
 	}
 
 	public void testForNameWithPrimitiveClasses() throws ClassNotFoundException {
-		assertEquals(boolean.class, ClassUtils.forName("boolean"));
-		assertEquals(byte.class, ClassUtils.forName("byte"));
-		assertEquals(char.class, ClassUtils.forName("char"));
-		assertEquals(short.class, ClassUtils.forName("short"));
-		assertEquals(int.class, ClassUtils.forName("int"));
-		assertEquals(long.class, ClassUtils.forName("long"));
-		assertEquals(float.class, ClassUtils.forName("float"));
-		assertEquals(double.class, ClassUtils.forName("double"));
-		assertEquals(void.class, ClassUtils.forName("void"));
+		assertEquals(boolean.class, ClassUtils.forName("boolean", classLoader));
+		assertEquals(byte.class, ClassUtils.forName("byte", classLoader));
+		assertEquals(char.class, ClassUtils.forName("char", classLoader));
+		assertEquals(short.class, ClassUtils.forName("short", classLoader));
+		assertEquals(int.class, ClassUtils.forName("int", classLoader));
+		assertEquals(long.class, ClassUtils.forName("long", classLoader));
+		assertEquals(float.class, ClassUtils.forName("float", classLoader));
+		assertEquals(double.class, ClassUtils.forName("double", classLoader));
+		assertEquals(void.class, ClassUtils.forName("void", classLoader));
 	}
 
 	public void testForNameWithPrimitiveArrays() throws ClassNotFoundException {
-		assertEquals(boolean[].class, ClassUtils.forName("boolean[]"));
-		assertEquals(byte[].class, ClassUtils.forName("byte[]"));
-		assertEquals(char[].class, ClassUtils.forName("char[]"));
-		assertEquals(short[].class, ClassUtils.forName("short[]"));
-		assertEquals(int[].class, ClassUtils.forName("int[]"));
-		assertEquals(long[].class, ClassUtils.forName("long[]"));
-		assertEquals(float[].class, ClassUtils.forName("float[]"));
-		assertEquals(double[].class, ClassUtils.forName("double[]"));
+		assertEquals(boolean[].class, ClassUtils.forName("boolean[]", classLoader));
+		assertEquals(byte[].class, ClassUtils.forName("byte[]", classLoader));
+		assertEquals(char[].class, ClassUtils.forName("char[]", classLoader));
+		assertEquals(short[].class, ClassUtils.forName("short[]", classLoader));
+		assertEquals(int[].class, ClassUtils.forName("int[]", classLoader));
+		assertEquals(long[].class, ClassUtils.forName("long[]", classLoader));
+		assertEquals(float[].class, ClassUtils.forName("float[]", classLoader));
+		assertEquals(double[].class, ClassUtils.forName("double[]", classLoader));
 	}
 
 	public void testForNameWithPrimitiveArraysInternalName() throws ClassNotFoundException {
-		assertEquals(boolean[].class, ClassUtils.forName(boolean[].class.getName()));
-		assertEquals(byte[].class, ClassUtils.forName(byte[].class.getName()));
-		assertEquals(char[].class, ClassUtils.forName(char[].class.getName()));
-		assertEquals(short[].class, ClassUtils.forName(short[].class.getName()));
-		assertEquals(int[].class, ClassUtils.forName(int[].class.getName()));
-		assertEquals(long[].class, ClassUtils.forName(long[].class.getName()));
-		assertEquals(float[].class, ClassUtils.forName(float[].class.getName()));
-		assertEquals(double[].class, ClassUtils.forName(double[].class.getName()));
+		assertEquals(boolean[].class, ClassUtils.forName(boolean[].class.getName(), classLoader));
+		assertEquals(byte[].class, ClassUtils.forName(byte[].class.getName(), classLoader));
+		assertEquals(char[].class, ClassUtils.forName(char[].class.getName(), classLoader));
+		assertEquals(short[].class, ClassUtils.forName(short[].class.getName(), classLoader));
+		assertEquals(int[].class, ClassUtils.forName(int[].class.getName(), classLoader));
+		assertEquals(long[].class, ClassUtils.forName(long[].class.getName(), classLoader));
+		assertEquals(float[].class, ClassUtils.forName(float[].class.getName(), classLoader));
+		assertEquals(double[].class, ClassUtils.forName(double[].class.getName(), classLoader));
 	}
 
 	public void testGetShortName() {
diff --git a/spring-core/src/test/java/org/springframework/util/xml/StaxSourceTests.java b/spring-core/src/test/java/org/springframework/util/xml/StaxSourceTests.java
index a2b668fa6d3..638b997bc07 100644
--- a/spring-core/src/test/java/org/springframework/util/xml/StaxSourceTests.java
+++ b/spring-core/src/test/java/org/springframework/util/xml/StaxSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,13 @@
 
 package org.springframework.util.xml;
 
+import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
 import java.io.StringReader;
 import java.io.StringWriter;
+
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.stream.XMLEventReader;
@@ -28,7 +33,6 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMResult;
 import javax.xml.transform.stream.StreamResult;
 
-import static org.custommonkey.xmlunit.XMLAssert.*;
 import org.junit.Before;
 import org.junit.Test;
 import org.w3c.dom.Document;
@@ -101,4 +105,4 @@ public class StaxSourceTests {
 		transformer.transform(source, new DOMResult(result));
 		assertXMLEqual("Invalid result", expected, result);
 	}
-}
\ No newline at end of file
+}
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java
index cf189ad6a1e..0bdcb6f7408 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/DefaultComparatorUnitTests.java
@@ -15,7 +15,8 @@
  */
 package org.springframework.expression.spel;
 
-import junit.framework.Assert;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.springframework.expression.EvaluationException;
@@ -33,57 +34,57 @@ public class DefaultComparatorUnitTests {
 	public void testPrimitives() throws EvaluationException {
 		TypeComparator comparator = new StandardTypeComparator();
 		// primitive int
-		Assert.assertTrue(comparator.compare(1, 2) < 0);
-		Assert.assertTrue(comparator.compare(1, 1) == 0);
-		Assert.assertTrue(comparator.compare(2, 1) > 0);
+		assertTrue(comparator.compare(1, 2) < 0);
+		assertTrue(comparator.compare(1, 1) == 0);
+		assertTrue(comparator.compare(2, 1) > 0);
 
-		Assert.assertTrue(comparator.compare(1.0d, 2) < 0);
-		Assert.assertTrue(comparator.compare(1.0d, 1) == 0);
-		Assert.assertTrue(comparator.compare(2.0d, 1) > 0);
+		assertTrue(comparator.compare(1.0d, 2) < 0);
+		assertTrue(comparator.compare(1.0d, 1) == 0);
+		assertTrue(comparator.compare(2.0d, 1) > 0);
 
-		Assert.assertTrue(comparator.compare(1.0f, 2) < 0);
-		Assert.assertTrue(comparator.compare(1.0f, 1) == 0);
-		Assert.assertTrue(comparator.compare(2.0f, 1) > 0);
+		assertTrue(comparator.compare(1.0f, 2) < 0);
+		assertTrue(comparator.compare(1.0f, 1) == 0);
+		assertTrue(comparator.compare(2.0f, 1) > 0);
 
-		Assert.assertTrue(comparator.compare(1L, 2) < 0);
-		Assert.assertTrue(comparator.compare(1L, 1) == 0);
-		Assert.assertTrue(comparator.compare(2L, 1) > 0);
+		assertTrue(comparator.compare(1L, 2) < 0);
+		assertTrue(comparator.compare(1L, 1) == 0);
+		assertTrue(comparator.compare(2L, 1) > 0);
 
-		Assert.assertTrue(comparator.compare(1, 2L) < 0);
-		Assert.assertTrue(comparator.compare(1, 1L) == 0);
-		Assert.assertTrue(comparator.compare(2, 1L) > 0);
+		assertTrue(comparator.compare(1, 2L) < 0);
+		assertTrue(comparator.compare(1, 1L) == 0);
+		assertTrue(comparator.compare(2, 1L) > 0);
 
-		Assert.assertTrue(comparator.compare(1L, 2L) < 0);
-		Assert.assertTrue(comparator.compare(1L, 1L) == 0);
-		Assert.assertTrue(comparator.compare(2L, 1L) > 0);
+		assertTrue(comparator.compare(1L, 2L) < 0);
+		assertTrue(comparator.compare(1L, 1L) == 0);
+		assertTrue(comparator.compare(2L, 1L) > 0);
 	}
 
 	@Test
 	public void testNulls() throws EvaluationException {
 		TypeComparator comparator = new StandardTypeComparator();
-		Assert.assertTrue(comparator.compare(null,"abc")<0);
-		Assert.assertTrue(comparator.compare(null,null)==0);
-		Assert.assertTrue(comparator.compare("abc",null)>0);
+		assertTrue(comparator.compare(null,"abc")<0);
+		assertTrue(comparator.compare(null,null)==0);
+		assertTrue(comparator.compare("abc",null)>0);
 	}
 
 	@Test
 	public void testObjects() throws EvaluationException {
 		TypeComparator comparator = new StandardTypeComparator();
-		Assert.assertTrue(comparator.compare("a","a")==0);
-		Assert.assertTrue(comparator.compare("a","b")<0);
-		Assert.assertTrue(comparator.compare("b","a")>0);
+		assertTrue(comparator.compare("a","a")==0);
+		assertTrue(comparator.compare("a","b")<0);
+		assertTrue(comparator.compare("b","a")>0);
 	}
 
 	@Test
 	public void testCanCompare() throws EvaluationException {
 		TypeComparator comparator = new StandardTypeComparator();
-		Assert.assertTrue(comparator.canCompare(null,1));
-		Assert.assertTrue(comparator.canCompare(1,null));
+		assertTrue(comparator.canCompare(null,1));
+		assertTrue(comparator.canCompare(1,null));
 
-		Assert.assertTrue(comparator.canCompare(2,1));
-		Assert.assertTrue(comparator.canCompare("abc","def"));
-		Assert.assertTrue(comparator.canCompare("abc",3));
-		Assert.assertFalse(comparator.canCompare(String.class,3));
+		assertTrue(comparator.canCompare(2,1));
+		assertTrue(comparator.canCompare("abc","def"));
+		assertTrue(comparator.canCompare("abc",3));
+		assertFalse(comparator.canCompare(String.class,3));
 	}
 
 }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java
index 388d26d0261..1419f1da966 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionLanguageScenarioTests.java
@@ -16,6 +16,9 @@
 
 package org.springframework.expression.spel;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 import java.awt.Color;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -23,8 +26,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Assert;
-
 import org.junit.Test;
 import org.springframework.expression.AccessException;
 import org.springframework.expression.EvaluationContext;
@@ -76,14 +77,14 @@ public class ExpressionLanguageScenarioTests extends ExpressionTestCase {
 			// They are reusable
 			value = expr.getValue();
 
-			Assert.assertEquals("hello world", value);
-			Assert.assertEquals(String.class, value.getClass());
+			assertEquals("hello world", value);
+			assertEquals(String.class, value.getClass());
 		} catch (EvaluationException ee) {
 			ee.printStackTrace();
-			Assert.fail("Unexpected Exception: " + ee.getMessage());
+			fail("Unexpected Exception: " + ee.getMessage());
 		} catch (ParseException pe) {
 			pe.printStackTrace();
-			Assert.fail("Unexpected Exception: " + pe.getMessage());
+			fail("Unexpected Exception: " + pe.getMessage());
 		}
 	}
 
@@ -103,16 +104,16 @@ public class ExpressionLanguageScenarioTests extends ExpressionTestCase {
 
 		Expression expr = parser.parseRaw("#favouriteColour");
 		Object value = expr.getValue(ctx);
-		Assert.assertEquals("blue", value);
+		assertEquals("blue", value);
 
 		expr = parser.parseRaw("#primes.get(1)");
 		value = expr.getValue(ctx);
-		Assert.assertEquals(3, value);
+		assertEquals(3, value);
 
 		// all prime numbers > 10 from the list (using selection ?{...})
 		expr = parser.parseRaw("#primes.?[#this>10]");
 		value = expr.getValue(ctx);
-		Assert.assertEquals("[11, 13, 17]", value.toString());
+		assertEquals("[11, 13, 17]", value.toString());
 	}
 
 
@@ -141,30 +142,30 @@ public class ExpressionLanguageScenarioTests extends ExpressionTestCase {
 		// read it, set it, read it again
 		Expression expr = parser.parseRaw("str");
 		Object value = expr.getValue(ctx);
-		Assert.assertEquals("wibble", value);
+		assertEquals("wibble", value);
 		expr = parser.parseRaw("str");
 		expr.setValue(ctx, "wobble");
 		expr = parser.parseRaw("str");
 		value = expr.getValue(ctx);
-		Assert.assertEquals("wobble", value);
+		assertEquals("wobble", value);
 		// or using assignment within the expression
 		expr = parser.parseRaw("str='wabble'");
 		value = expr.getValue(ctx);
 		expr = parser.parseRaw("str");
 		value = expr.getValue(ctx);
-		Assert.assertEquals("wabble", value);
+		assertEquals("wabble", value);
 
 		// private property will be accessed through getter()
 		expr = parser.parseRaw("property");
 		value = expr.getValue(ctx);
-		Assert.assertEquals(42, value);
+		assertEquals(42, value);
 
 		// ... and set through setter
 		expr = parser.parseRaw("property=4");
 		value = expr.getValue(ctx);
 		expr = parser.parseRaw("property");
 		value = expr.getValue(ctx);
-		Assert.assertEquals(4,value);
+		assertEquals(4,value);
 	}
 
 	public static String repeat(String s) { return s+s; }
@@ -183,14 +184,14 @@ public class ExpressionLanguageScenarioTests extends ExpressionTestCase {
 
 			Expression expr = parser.parseRaw("#repeat('hello')");
 			Object value = expr.getValue(ctx);
-			Assert.assertEquals("hellohello", value);
+			assertEquals("hellohello", value);
 
 		} catch (EvaluationException ee) {
 			ee.printStackTrace();
-			Assert.fail("Unexpected Exception: " + ee.getMessage());
+			fail("Unexpected Exception: " + ee.getMessage());
 		} catch (ParseException pe) {
 			pe.printStackTrace();
-			Assert.fail("Unexpected Exception: " + pe.getMessage());
+			fail("Unexpected Exception: " + pe.getMessage());
 		}
 	}
 
@@ -207,13 +208,13 @@ public class ExpressionLanguageScenarioTests extends ExpressionTestCase {
 		ctx.addPropertyAccessor(new FruitColourAccessor());
 		Expression expr = parser.parseRaw("orange");
 		Object value = expr.getValue(ctx);
-		Assert.assertEquals(Color.orange, value);
+		assertEquals(Color.orange, value);
 
 		try {
 			expr.setValue(ctx, Color.blue);
-			Assert.fail("Should not be allowed to set oranges to be blue !");
+			fail("Should not be allowed to set oranges to be blue !");
 		} catch (SpelEvaluationException ee) {
-			Assert.assertEquals(ee.getMessageCode(), SpelMessage.PROPERTY_OR_FIELD_NOT_WRITABLE_ON_NULL);
+			assertEquals(ee.getMessageCode(), SpelMessage.PROPERTY_OR_FIELD_NOT_WRITABLE_ON_NULL);
 		}
 	}
 
@@ -227,14 +228,14 @@ public class ExpressionLanguageScenarioTests extends ExpressionTestCase {
 		ctx.addPropertyAccessor(new VegetableColourAccessor());
 		Expression expr = parser.parseRaw("pea");
 		Object value = expr.getValue(ctx);
-		Assert.assertEquals(Color.green, value);
+		assertEquals(Color.green, value);
 
 		try {
 			expr.setValue(ctx, Color.blue);
-			Assert.fail("Should not be allowed to set peas to be blue !");
+			fail("Should not be allowed to set peas to be blue !");
 		}
 		catch (SpelEvaluationException ee) {
-			Assert.assertEquals(ee.getMessageCode(), SpelMessage.PROPERTY_OR_FIELD_NOT_WRITABLE_ON_NULL);
+			assertEquals(ee.getMessageCode(), SpelMessage.PROPERTY_OR_FIELD_NOT_WRITABLE_ON_NULL);
 		}
 	}
 
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java
index 32de58c8c5f..583609b23e7 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionStateTests.java
@@ -16,12 +16,15 @@
 
 package org.springframework.expression.spel;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
 import java.util.EmptyStackException;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Assert;
-
 import org.junit.Test;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.expression.EvaluationContext;
@@ -42,7 +45,7 @@ public class ExpressionStateTests extends ExpressionTestCase {
 	public void testConstruction() {
 		EvaluationContext context = TestScenarioCreator.getTestEvaluationContext();
 		ExpressionState state = new ExpressionState(context);
-		Assert.assertEquals(context,state.getEvaluationContext());
+		assertEquals(context,state.getEvaluationContext());
 	}
 
 	// Local variables are in variable scopes which come and go during evaluation.  Normal variables are
@@ -53,129 +56,129 @@ public class ExpressionStateTests extends ExpressionTestCase {
 		ExpressionState state = getState();
 
 		Object value = state.lookupLocalVariable("foo");
-		Assert.assertNull(value);
+		assertNull(value);
 
 		state.setLocalVariable("foo",34);
 		value = state.lookupLocalVariable("foo");
-		Assert.assertEquals(34,value);
+		assertEquals(34,value);
 
 		state.setLocalVariable("foo",null);
 		value = state.lookupLocalVariable("foo");
-		Assert.assertEquals(null,value);
+		assertEquals(null,value);
 	}
 
 	@Test
 	public void testVariables() {
 		ExpressionState state = getState();
 		TypedValue typedValue = state.lookupVariable("foo");
-		Assert.assertEquals(TypedValue.NULL,typedValue);
+		assertEquals(TypedValue.NULL,typedValue);
 
 		state.setVariable("foo",34);
 		typedValue = state.lookupVariable("foo");
-		Assert.assertEquals(34,typedValue.getValue());
-		Assert.assertEquals(Integer.class,typedValue.getTypeDescriptor().getType());
+		assertEquals(34,typedValue.getValue());
+		assertEquals(Integer.class,typedValue.getTypeDescriptor().getType());
 
 		state.setVariable("foo","abc");
 		typedValue = state.lookupVariable("foo");
-		Assert.assertEquals("abc",typedValue.getValue());
-		Assert.assertEquals(String.class,typedValue.getTypeDescriptor().getType());
+		assertEquals("abc",typedValue.getValue());
+		assertEquals(String.class,typedValue.getTypeDescriptor().getType());
 	}
 
 	@Test
 	public void testNoVariableInteference() {
 		ExpressionState state = getState();
 		TypedValue typedValue = state.lookupVariable("foo");
-		Assert.assertEquals(TypedValue.NULL,typedValue);
+		assertEquals(TypedValue.NULL,typedValue);
 
 		state.setLocalVariable("foo",34);
 		typedValue = state.lookupVariable("foo");
-		Assert.assertEquals(TypedValue.NULL,typedValue);
+		assertEquals(TypedValue.NULL,typedValue);
 
 		state.setVariable("goo","hello");
-		Assert.assertNull(state.lookupLocalVariable("goo"));
+		assertNull(state.lookupLocalVariable("goo"));
 	}
 
 	@Test
 	public void testLocalVariableNestedScopes() {
 		ExpressionState state = getState();
-		Assert.assertEquals(null,state.lookupLocalVariable("foo"));
+		assertEquals(null,state.lookupLocalVariable("foo"));
 
 		state.setLocalVariable("foo",12);
-		Assert.assertEquals(12,state.lookupLocalVariable("foo"));
+		assertEquals(12,state.lookupLocalVariable("foo"));
 
 		state.enterScope(null);
-		Assert.assertEquals(12,state.lookupLocalVariable("foo")); // found in upper scope
+		assertEquals(12,state.lookupLocalVariable("foo")); // found in upper scope
 
 		state.setLocalVariable("foo","abc");
-		Assert.assertEquals("abc",state.lookupLocalVariable("foo")); // found in nested scope
+		assertEquals("abc",state.lookupLocalVariable("foo")); // found in nested scope
 
 		state.exitScope();
-		Assert.assertEquals(12,state.lookupLocalVariable("foo")); // found in nested scope
+		assertEquals(12,state.lookupLocalVariable("foo")); // found in nested scope
 	}
 
 	@Test
 	public void testRootContextObject() {
 		ExpressionState state = getState();
-		Assert.assertEquals(Inventor.class,state.getRootContextObject().getValue().getClass());
+		assertEquals(Inventor.class,state.getRootContextObject().getValue().getClass());
 
 		// although the root object is being set on the evaluation context, the value in the 'state' remains what it was when constructed
 		((StandardEvaluationContext) state.getEvaluationContext()).setRootObject(null);
-		Assert.assertEquals(Inventor.class,state.getRootContextObject().getValue().getClass());
-		// Assert.assertEquals(null, state.getRootContextObject().getValue());
+		assertEquals(Inventor.class,state.getRootContextObject().getValue().getClass());
+		// assertEquals(null, state.getRootContextObject().getValue());
 
 		state = new ExpressionState(new StandardEvaluationContext());
-		Assert.assertEquals(TypedValue.NULL,state.getRootContextObject());
+		assertEquals(TypedValue.NULL,state.getRootContextObject());
 
 
 		((StandardEvaluationContext)state.getEvaluationContext()).setRootObject(null);
-		Assert.assertEquals(null,state.getRootContextObject().getValue());
+		assertEquals(null,state.getRootContextObject().getValue());
 	}
 
 	@Test
 	public void testActiveContextObject() {
 		ExpressionState state = getState();
-		Assert.assertEquals(state.getRootContextObject().getValue(),state.getActiveContextObject().getValue());
+		assertEquals(state.getRootContextObject().getValue(),state.getActiveContextObject().getValue());
 
 		try {
 			state.popActiveContextObject();
-			Assert.fail("stack should be empty...");
+			fail("stack should be empty...");
 		} catch (EmptyStackException ese) {
 			// success
 		}
 
 		state.pushActiveContextObject(new TypedValue(34));
-		Assert.assertEquals(34,state.getActiveContextObject().getValue());
+		assertEquals(34,state.getActiveContextObject().getValue());
 
 		state.pushActiveContextObject(new TypedValue("hello"));
-		Assert.assertEquals("hello",state.getActiveContextObject().getValue());
+		assertEquals("hello",state.getActiveContextObject().getValue());
 
 		state.popActiveContextObject();
-		Assert.assertEquals(34,state.getActiveContextObject().getValue());
+		assertEquals(34,state.getActiveContextObject().getValue());
 
 		state.popActiveContextObject();
-		Assert.assertEquals(state.getRootContextObject().getValue(),state.getActiveContextObject().getValue());
+		assertEquals(state.getRootContextObject().getValue(),state.getActiveContextObject().getValue());
 
 		state = new ExpressionState(new StandardEvaluationContext());
-		Assert.assertEquals(TypedValue.NULL,state.getActiveContextObject());
+		assertEquals(TypedValue.NULL,state.getActiveContextObject());
 	}
 
 	@Test
 	public void testPopulatedNestedScopes() {
 		ExpressionState state = getState();
-		Assert.assertNull(state.lookupLocalVariable("foo"));
+		assertNull(state.lookupLocalVariable("foo"));
 
 		state.enterScope("foo",34);
-		Assert.assertEquals(34,state.lookupLocalVariable("foo"));
+		assertEquals(34,state.lookupLocalVariable("foo"));
 
 		state.enterScope(null);
 		state.setLocalVariable("foo",12);
-		Assert.assertEquals(12,state.lookupLocalVariable("foo"));
+		assertEquals(12,state.lookupLocalVariable("foo"));
 
 		state.exitScope();
-		Assert.assertEquals(34,state.lookupLocalVariable("foo"));
+		assertEquals(34,state.lookupLocalVariable("foo"));
 
 		state.exitScope();
-		Assert.assertNull(state.lookupLocalVariable("goo"));
+		assertNull(state.lookupLocalVariable("goo"));
 	}
 
 	@Test
@@ -185,33 +188,33 @@ public class ExpressionStateTests extends ExpressionTestCase {
 		// supplied should override root on context
 		ExpressionState state = new ExpressionState(ctx,new TypedValue("i am a string"));
 		TypedValue stateRoot = state.getRootContextObject();
-		Assert.assertEquals(String.class,stateRoot.getTypeDescriptor().getType());
-		Assert.assertEquals("i am a string",stateRoot.getValue());
+		assertEquals(String.class,stateRoot.getTypeDescriptor().getType());
+		assertEquals("i am a string",stateRoot.getValue());
 	}
 
 	@Test
 	public void testPopulatedNestedScopesMap() {
 		ExpressionState state = getState();
-		Assert.assertNull(state.lookupLocalVariable("foo"));
-		Assert.assertNull(state.lookupLocalVariable("goo"));
+		assertNull(state.lookupLocalVariable("foo"));
+		assertNull(state.lookupLocalVariable("goo"));
 
 		Map m = new HashMap();
 		m.put("foo",34);
 		m.put("goo","abc");
 
 		state.enterScope(m);
-		Assert.assertEquals(34,state.lookupLocalVariable("foo"));
-		Assert.assertEquals("abc",state.lookupLocalVariable("goo"));
+		assertEquals(34,state.lookupLocalVariable("foo"));
+		assertEquals("abc",state.lookupLocalVariable("goo"));
 
 		state.enterScope(null);
 		state.setLocalVariable("foo",12);
-		Assert.assertEquals(12,state.lookupLocalVariable("foo"));
-		Assert.assertEquals("abc",state.lookupLocalVariable("goo"));
+		assertEquals(12,state.lookupLocalVariable("foo"));
+		assertEquals("abc",state.lookupLocalVariable("goo"));
 
 		state.exitScope();
 		state.exitScope();
-		Assert.assertNull(state.lookupLocalVariable("foo"));
-		Assert.assertNull(state.lookupLocalVariable("goo"));
+		assertNull(state.lookupLocalVariable("foo"));
+		assertNull(state.lookupLocalVariable("goo"));
 	}
 
 	@Test
@@ -219,38 +222,38 @@ public class ExpressionStateTests extends ExpressionTestCase {
 		ExpressionState state = getState();
 		try {
 			state.operate(Operation.ADD,1,2);
-			Assert.fail("should have failed");
+			fail("should have failed");
 		} catch (EvaluationException ee) {
 			SpelEvaluationException sEx = (SpelEvaluationException)ee;
-			Assert.assertEquals(SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES,sEx.getMessageCode());
+			assertEquals(SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES,sEx.getMessageCode());
 		}
 
 		try {
 			state.operate(Operation.ADD,null,null);
-			Assert.fail("should have failed");
+			fail("should have failed");
 		} catch (EvaluationException ee) {
 			SpelEvaluationException sEx = (SpelEvaluationException)ee;
-			Assert.assertEquals(SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES,sEx.getMessageCode());
+			assertEquals(SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES,sEx.getMessageCode());
 		}
 	}
 
 	@Test
 	public void testComparator() {
 		ExpressionState state = getState();
-		Assert.assertEquals(state.getEvaluationContext().getTypeComparator(),state.getTypeComparator());
+		assertEquals(state.getEvaluationContext().getTypeComparator(),state.getTypeComparator());
 	}
 
 	@Test
 	public void testTypeLocator() throws EvaluationException {
 		ExpressionState state = getState();
-		Assert.assertNotNull(state.getEvaluationContext().getTypeLocator());
-		Assert.assertEquals(Integer.class,state.findType("java.lang.Integer"));
+		assertNotNull(state.getEvaluationContext().getTypeLocator());
+		assertEquals(Integer.class,state.findType("java.lang.Integer"));
 		try {
 			state.findType("someMadeUpName");
-			Assert.fail("Should have failed to find it");
+			fail("Should have failed to find it");
 		} catch (EvaluationException ee) {
 			SpelEvaluationException sEx = (SpelEvaluationException)ee;
-			Assert.assertEquals(SpelMessage.TYPE_NOT_FOUND,sEx.getMessageCode());
+			assertEquals(SpelMessage.TYPE_NOT_FOUND,sEx.getMessageCode());
 		}
 	}
 
@@ -258,16 +261,16 @@ public class ExpressionStateTests extends ExpressionTestCase {
 	public void testTypeConversion() throws EvaluationException {
 		ExpressionState state = getState();
 		String s = (String)state.convertValue(34, TypeDescriptor.valueOf(String.class));
-		Assert.assertEquals("34",s);
+		assertEquals("34",s);
 
 		s = (String)state.convertValue(new TypedValue(34), TypeDescriptor.valueOf(String.class));
-		Assert.assertEquals("34",s);
+		assertEquals("34",s);
 	}
 
 	@Test
 	public void testPropertyAccessors() {
 		ExpressionState state = getState();
-		Assert.assertEquals(state.getEvaluationContext().getPropertyAccessors(),state.getPropertyAccessors());
+		assertEquals(state.getEvaluationContext().getPropertyAccessors(),state.getPropertyAccessors());
 	}
 
 	/**
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestCase.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestCase.java
index 9433568d9c7..74d5aa8e12e 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestCase.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestCase.java
@@ -16,11 +16,12 @@
 
 package org.springframework.expression.spel;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 import java.util.Arrays;
 import java.util.List;
 
-import junit.framework.Assert;
-
 import org.springframework.expression.EvaluationException;
 import org.springframework.expression.Expression;
 import org.springframework.expression.ExpressionParser;
@@ -54,13 +55,13 @@ public abstract class ExpressionTestCase {
 		try {
 			Expression expr = parser.parseExpression(expression);
 			if (expr == null) {
-				Assert.fail("Parser returned null for expression");
+				fail("Parser returned null for expression");
 			}
 			if (DEBUG) {
 				SpelUtilities.printAbstractSyntaxTree(System.out, expr);
 			}
 			// Class expressionType = expr.getValueType();
-			// Assert.assertEquals("Type of the expression is not as expected. Should be '"+expectedResultType+"' but is
+			// assertEquals("Type of the expression is not as expected. Should be '"+expectedResultType+"' but is
 			// '"+expressionType+"'",
 			// expectedResultType,expressionType);
 
@@ -71,12 +72,12 @@ public abstract class ExpressionTestCase {
 				if (expectedValue == null) {
 					return; // no point doing other checks
 				}
-				Assert.assertEquals("Expression returned null value, but expected '" + expectedValue + "'", expectedValue,
+				assertEquals("Expression returned null value, but expected '" + expectedValue + "'", expectedValue,
 						null);
 			}
 
 			Class resultType = value.getClass();
-			Assert.assertEquals("Type of the actual result was not as expected.  Expected '" + expectedResultType
+			assertEquals("Type of the actual result was not as expected.  Expected '" + expectedResultType
 					+ "' but result was of type '" + resultType + "'", expectedResultType, resultType);
 			// .equals/* isAssignableFrom */(resultType), truers);
 
@@ -84,17 +85,17 @@ public abstract class ExpressionTestCase {
 			// in the above expression...
 
 			if (expectedValue instanceof String) {
-				Assert.assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue,
+				assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue,
 						ExpressionTestCase.stringValueOf(value));
 			} else {
-				Assert.assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue, value);
+				assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue, value);
 			}
 		} catch (EvaluationException ee) {
 			ee.printStackTrace();
-			Assert.fail("Unexpected Exception: " + ee.getMessage());
+			fail("Unexpected Exception: " + ee.getMessage());
 		} catch (ParseException pe) {
 			pe.printStackTrace();
-			Assert.fail("Unexpected Exception: " + pe.getMessage());
+			fail("Unexpected Exception: " + pe.getMessage());
 		}
 	}
 
@@ -102,13 +103,13 @@ public abstract class ExpressionTestCase {
 		try {
 			Expression expr = parser.parseExpression(expression);
 			if (expr == null) {
-				Assert.fail("Parser returned null for expression");
+				fail("Parser returned null for expression");
 			}
 			if (DEBUG) {
 				SpelUtilities.printAbstractSyntaxTree(System.out, expr);
 			}
 			// Class expressionType = expr.getValueType();
-			// Assert.assertEquals("Type of the expression is not as expected. Should be '"+expectedResultType+"' but is
+			// assertEquals("Type of the expression is not as expected. Should be '"+expectedResultType+"' but is
 			// '"+expressionType+"'",
 			// expectedResultType,expressionType);
 
@@ -116,23 +117,23 @@ public abstract class ExpressionTestCase {
 			if (value == null) {
 				if (expectedValue == null)
 					return; // no point doing other checks
-				Assert.assertEquals("Expression returned null value, but expected '" + expectedValue + "'", expectedValue,
+				assertEquals("Expression returned null value, but expected '" + expectedValue + "'", expectedValue,
 						null);
 			}
 
 			Class resultType = value.getClass();
-			Assert.assertEquals("Type of the actual result was not as expected.  Expected '" + expectedResultType
+			assertEquals("Type of the actual result was not as expected.  Expected '" + expectedResultType
 					+ "' but result was of type '" + resultType + "'", expectedResultType, resultType);
 			// .equals/* isAssignableFrom */(resultType), truers);
-			Assert.assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue, value);
+			assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue, value);
 			// isAssignableFrom would allow some room for compatibility
 			// in the above expression...
 		} catch (EvaluationException ee) {
 			SpelEvaluationException ex = (SpelEvaluationException) ee;
 			ex.printStackTrace();
-			Assert.fail("Unexpected EvaluationException: " + ex.getMessage());
+			fail("Unexpected EvaluationException: " + ex.getMessage());
 		} catch (ParseException pe) {
-			Assert.fail("Unexpected ParseException: " + pe.getMessage());
+			fail("Unexpected ParseException: " + pe.getMessage());
 		}
 	}
 
@@ -151,7 +152,7 @@ public abstract class ExpressionTestCase {
 		try {
 			Expression e = parser.parseExpression(expression);
 			if (e == null) {
-				Assert.fail("Parser returned null for expression");
+				fail("Parser returned null for expression");
 			}
 			if (DEBUG) {
 				SpelUtilities.printAbstractSyntaxTree(System.out, e);
@@ -161,19 +162,19 @@ public abstract class ExpressionTestCase {
 				if (expectedValue == null)
 					return; // no point doing other
 				// checks
-				Assert.assertEquals("Expression returned null value, but expected '" + expectedValue + "'", expectedValue,
+				assertEquals("Expression returned null value, but expected '" + expectedValue + "'", expectedValue,
 						null);
 			}
 			Class resultType = value.getClass();
 			if (expectedValue instanceof String) {
-				Assert.assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue,
+				assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue,
 						ExpressionTestCase.stringValueOf(value));
 			} else {
-				Assert.assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue, value);
+				assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue, value);
 			}
-//			Assert.assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue,
+//			assertEquals("Did not get expected value for expression '" + expression + "'.", expectedValue,
 //					ExpressionTestCase.stringValueOf(value));
-			Assert.assertEquals("Type of the result was not as expected.  Expected '" + expectedClassOfResult
+			assertEquals("Type of the result was not as expected.  Expected '" + expectedClassOfResult
 					+ "' but result was of type '" + resultType + "'", expectedClassOfResult
 					.equals/* isAssignableFrom */(resultType), true);
 			// TODO isAssignableFrom would allow some room for compatibility
@@ -182,16 +183,16 @@ public abstract class ExpressionTestCase {
 			boolean isWritable = e.isWritable(eContext);
 			if (isWritable != shouldBeWritable) {
 				if (shouldBeWritable)
-					Assert.fail("Expected the expression to be writable but it is not");
+					fail("Expected the expression to be writable but it is not");
 				else
-					Assert.fail("Expected the expression to be readonly but it is not");
+					fail("Expected the expression to be readonly but it is not");
 			}
 		} catch (EvaluationException ee) {
 			ee.printStackTrace();
-			Assert.fail("Unexpected Exception: " + ee.getMessage());
+			fail("Unexpected Exception: " + ee.getMessage());
 		} catch (ParseException pe) {
 			pe.printStackTrace();
-			Assert.fail("Unexpected Exception: " + pe.getMessage());
+			fail("Unexpected Exception: " + pe.getMessage());
 		}
 	}
 
@@ -222,7 +223,7 @@ public abstract class ExpressionTestCase {
 		try {
 			Expression expr = parser.parseExpression(expression);
 			if (expr == null) {
-				Assert.fail("Parser returned null for expression");
+				fail("Parser returned null for expression");
 			}
 			if (expectedReturnType != null) {
 				@SuppressWarnings("unused")
@@ -231,18 +232,18 @@ public abstract class ExpressionTestCase {
 				@SuppressWarnings("unused")
 				Object value = expr.getValue(eContext);
 			}
-			Assert.fail("Should have failed with message " + expectedMessage);
+			fail("Should have failed with message " + expectedMessage);
 		} catch (EvaluationException ee) {
 			SpelEvaluationException ex = (SpelEvaluationException) ee;
 			if (ex.getMessageCode() != expectedMessage) {
 //				System.out.println(ex.getMessage());
 				ex.printStackTrace();
-				Assert.assertEquals("Failed to get expected message", expectedMessage, ex.getMessageCode());
+				assertEquals("Failed to get expected message", expectedMessage, ex.getMessageCode());
 			}
 			if (otherProperties != null && otherProperties.length != 0) {
 				// first one is expected position of the error within the string
 				int pos = ((Integer) otherProperties[0]).intValue();
-				Assert.assertEquals("Did not get correct position reported in error ", pos, ex.getPosition());
+				assertEquals("Did not get correct position reported in error ", pos, ex.getPosition());
 				if (otherProperties.length > 1) {
 					// Check inserts match
 					Object[] inserts = ex.getInserts();
@@ -251,25 +252,25 @@ public abstract class ExpressionTestCase {
 					}
 					if (inserts.length < otherProperties.length - 1) {
 						ex.printStackTrace();
-						Assert.fail("Cannot check " + (otherProperties.length - 1)
+						fail("Cannot check " + (otherProperties.length - 1)
 								+ " properties of the exception, it only has " + inserts.length + " inserts");
 					}
 					for (int i = 1; i < otherProperties.length; i++) {
 						if (otherProperties[i] == null) {
 							if (inserts[i - 1] != null) {
 								ex.printStackTrace();
-								Assert.fail("Insert does not match, expected 'null' but insert value was '" + inserts[i - 1]
+								fail("Insert does not match, expected 'null' but insert value was '" + inserts[i - 1]
 										+ "'");
 							}
 						} else if (inserts[i - 1] == null) {
 							if (otherProperties[i] != null) {
 								ex.printStackTrace();
-								Assert.fail("Insert does not match, expected '" + otherProperties[i]
+								fail("Insert does not match, expected '" + otherProperties[i]
 										+ "' but insert value was 'null'");
 							}
 						} else if (!inserts[i - 1].equals(otherProperties[i])) {
 							ex.printStackTrace();
-							Assert.fail("Insert does not match, expected '" + otherProperties[i] + "' but insert value was '"
+							fail("Insert does not match, expected '" + otherProperties[i] + "' but insert value was '"
 									+ inserts[i - 1] + "'");
 						}
 					}
@@ -277,7 +278,7 @@ public abstract class ExpressionTestCase {
 			}
 		} catch (ParseException pe) {
 			pe.printStackTrace();
-			Assert.fail("Unexpected Exception: " + pe.getMessage());
+			fail("Unexpected Exception: " + pe.getMessage());
 		}
 	}
 
@@ -293,16 +294,16 @@ public abstract class ExpressionTestCase {
 		try {
 			Expression expr = parser.parseExpression(expression);
 			SpelUtilities.printAbstractSyntaxTree(System.out, expr);
-			Assert.fail("Parsing should have failed!");
+			fail("Parsing should have failed!");
 		} catch (ParseException pe) {
 //			pe.printStackTrace();
 //			Throwable t = pe.getCause();
 //			if (t == null) {
-//				Assert.fail("ParseException caught with no defined cause");
+//				fail("ParseException caught with no defined cause");
 //			}
 //			if (!(t instanceof SpelEvaluationException)) {
 //				t.printStackTrace();
-//				Assert.fail("Cause of parse exception is not a SpelException");
+//				fail("Cause of parse exception is not a SpelException");
 //			}
 //			SpelEvaluationException ex = (SpelEvaluationException) t;
 //			pe.printStackTrace();
@@ -310,12 +311,12 @@ public abstract class ExpressionTestCase {
 			if (ex.getMessageCode() != expectedMessage) {
 //				System.out.println(ex.getMessage());
 				ex.printStackTrace();
-				Assert.assertEquals("Failed to get expected message", expectedMessage, ex.getMessageCode());
+				assertEquals("Failed to get expected message", expectedMessage, ex.getMessageCode());
 			}
 			if (otherProperties != null && otherProperties.length != 0) {
 				// first one is expected position of the error within the string
 				int pos = ((Integer) otherProperties[0]).intValue();
-				Assert.assertEquals("Did not get correct position reported in error ", pos, ex.getPosition());
+				assertEquals("Did not get correct position reported in error ", pos, ex.getPosition());
 				if (otherProperties.length > 1) {
 					// Check inserts match
 					Object[] inserts = ex.getInserts();
@@ -324,13 +325,13 @@ public abstract class ExpressionTestCase {
 					}
 					if (inserts.length < otherProperties.length - 1) {
 						ex.printStackTrace();
-						Assert.fail("Cannot check " + (otherProperties.length - 1)
+						fail("Cannot check " + (otherProperties.length - 1)
 								+ " properties of the exception, it only has " + inserts.length + " inserts");
 					}
 					for (int i = 1; i < otherProperties.length; i++) {
 						if (!inserts[i - 1].equals(otherProperties[i])) {
 							ex.printStackTrace();
-							Assert.fail("Insert does not match, expected '" + otherProperties[i] + "' but insert value was '"
+							fail("Insert does not match, expected '" + otherProperties[i] + "' but insert value was '"
 									+ inserts[i - 1] + "'");
 						}
 					}
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
index 8071bc198f4..f7c8e4ac065 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ExpressionTestsUsingCoreConversionService.java
@@ -16,9 +16,9 @@
 
 package org.springframework.expression.spel;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/InProgressTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/InProgressTests.java
index 3e6ae17ff43..6729476f183 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/InProgressTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/InProgressTests.java
@@ -16,11 +16,11 @@
 
 package org.springframework.expression.spel;
 
+import static org.junit.Assert.assertEquals;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import junit.framework.Assert;
-
 import org.junit.Test;
 import org.springframework.expression.spel.standard.SpelExpression;
 
@@ -78,7 +78,7 @@ public class InProgressTests extends ExpressionTestCase {
 	@Test
 	public void testProjection06() throws Exception {
 		SpelExpression expr = (SpelExpression) parser.parseExpression("'abc'.![true]");
-		Assert.assertEquals("'abc'.![true]", expr.toStringAST());
+		assertEquals("'abc'.![true]", expr.toStringAST());
 	}
 
 	// SELECTION
@@ -141,11 +141,11 @@ public class InProgressTests extends ExpressionTestCase {
 	@Test
 	public void testSelectionAST() throws Exception {
 		SpelExpression expr = (SpelExpression) parser.parseExpression("'abc'.^[true]");
-		Assert.assertEquals("'abc'.^[true]", expr.toStringAST());
+		assertEquals("'abc'.^[true]", expr.toStringAST());
 		expr = (SpelExpression) parser.parseExpression("'abc'.?[true]");
-		Assert.assertEquals("'abc'.?[true]", expr.toStringAST());
+		assertEquals("'abc'.?[true]", expr.toStringAST());
 		expr = (SpelExpression) parser.parseExpression("'abc'.$[true]");
-		Assert.assertEquals("'abc'.$[true]", expr.toStringAST());
+		assertEquals("'abc'.$[true]", expr.toStringAST());
 	}
 
 	// Constructor invocation
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/LiteralExpressionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/LiteralExpressionTests.java
index 352b4869913..89961e2b069 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/LiteralExpressionTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/LiteralExpressionTests.java
@@ -16,7 +16,9 @@
 
 package org.springframework.expression.spel;
 
-import junit.framework.Assert;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
 
 import org.junit.Test;
 import org.springframework.expression.EvaluationContext;
@@ -41,10 +43,10 @@ public class LiteralExpressionTests {
 		checkString("somevalue", lEx.getValue(new Rooty(), String.class));
 		checkString("somevalue", lEx.getValue(ctx, new Rooty()));
 		checkString("somevalue", lEx.getValue(ctx, new Rooty(),String.class));
-		Assert.assertEquals("somevalue", lEx.getExpressionString());
-		Assert.assertFalse(lEx.isWritable(new StandardEvaluationContext()));
-		Assert.assertFalse(lEx.isWritable(new Rooty()));
-		Assert.assertFalse(lEx.isWritable(new StandardEvaluationContext(), new Rooty()));
+		assertEquals("somevalue", lEx.getExpressionString());
+		assertFalse(lEx.isWritable(new StandardEvaluationContext()));
+		assertFalse(lEx.isWritable(new Rooty()));
+		assertFalse(lEx.isWritable(new StandardEvaluationContext(), new Rooty()));
 	}
 
 	static class Rooty {}
@@ -54,51 +56,51 @@ public class LiteralExpressionTests {
 		try {
 			LiteralExpression lEx = new LiteralExpression("somevalue");
 			lEx.setValue(new StandardEvaluationContext(), "flibble");
-			Assert.fail("Should have got an exception that the value cannot be set");
+			fail("Should have got an exception that the value cannot be set");
 		}
 		catch (EvaluationException ee) {
 			// success, not allowed - whilst here, check the expression value in the exception
-			Assert.assertEquals(ee.getExpressionString(), "somevalue");
+			assertEquals(ee.getExpressionString(), "somevalue");
 		}
 		try {
 			LiteralExpression lEx = new LiteralExpression("somevalue");
 			lEx.setValue(new Rooty(), "flibble");
-			Assert.fail("Should have got an exception that the value cannot be set");
+			fail("Should have got an exception that the value cannot be set");
 		}
 		catch (EvaluationException ee) {
 			// success, not allowed - whilst here, check the expression value in the exception
-			Assert.assertEquals(ee.getExpressionString(), "somevalue");
+			assertEquals(ee.getExpressionString(), "somevalue");
 		}
 		try {
 			LiteralExpression lEx = new LiteralExpression("somevalue");
 			lEx.setValue(new StandardEvaluationContext(), new Rooty(), "flibble");
-			Assert.fail("Should have got an exception that the value cannot be set");
+			fail("Should have got an exception that the value cannot be set");
 		}
 		catch (EvaluationException ee) {
 			// success, not allowed - whilst here, check the expression value in the exception
-			Assert.assertEquals(ee.getExpressionString(), "somevalue");
+			assertEquals(ee.getExpressionString(), "somevalue");
 		}
 	}
 
 	@Test
 	public void testGetValueType() throws Exception {
 		LiteralExpression lEx = new LiteralExpression("somevalue");
-		Assert.assertEquals(String.class, lEx.getValueType());
-		Assert.assertEquals(String.class, lEx.getValueType(new StandardEvaluationContext()));
-		Assert.assertEquals(String.class, lEx.getValueType(new Rooty()));
-		Assert.assertEquals(String.class, lEx.getValueType(new StandardEvaluationContext(), new Rooty()));
-		Assert.assertEquals(String.class, lEx.getValueTypeDescriptor().getType());
-		Assert.assertEquals(String.class, lEx.getValueTypeDescriptor(new StandardEvaluationContext()).getType());
-		Assert.assertEquals(String.class, lEx.getValueTypeDescriptor(new Rooty()).getType());
-		Assert.assertEquals(String.class, lEx.getValueTypeDescriptor(new StandardEvaluationContext(), new Rooty()).getType());
+		assertEquals(String.class, lEx.getValueType());
+		assertEquals(String.class, lEx.getValueType(new StandardEvaluationContext()));
+		assertEquals(String.class, lEx.getValueType(new Rooty()));
+		assertEquals(String.class, lEx.getValueType(new StandardEvaluationContext(), new Rooty()));
+		assertEquals(String.class, lEx.getValueTypeDescriptor().getType());
+		assertEquals(String.class, lEx.getValueTypeDescriptor(new StandardEvaluationContext()).getType());
+		assertEquals(String.class, lEx.getValueTypeDescriptor(new Rooty()).getType());
+		assertEquals(String.class, lEx.getValueTypeDescriptor(new StandardEvaluationContext(), new Rooty()).getType());
 	}
 
 	private void checkString(String expectedString, Object value) {
 		if (!(value instanceof String)) {
-			Assert.fail("Result was not a string, it was of type " + value.getClass() + "  (value=" + value + ")");
+			fail("Result was not a string, it was of type " + value.getClass() + "  (value=" + value + ")");
 		}
 		if (!((String) value).equals(expectedString)) {
-			Assert.fail("Did not get expected result.  Should have been '" + expectedString + "' but was '" + value + "'");
+			fail("Did not get expected result.  Should have been '" + expectedString + "' but was '" + value + "'");
 		}
 	}
 
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/LiteralTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/LiteralTests.java
index 6eda3493255..a3097e03ca4 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/LiteralTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/LiteralTests.java
@@ -16,7 +16,8 @@
 
 package org.springframework.expression.spel;
 
-import junit.framework.Assert;
+import static org.junit.Assert.assertFalse;
+
 import org.junit.Test;
 import org.springframework.expression.spel.standard.SpelExpression;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
@@ -163,10 +164,10 @@ public class LiteralTests extends ExpressionTestCase {
 	@Test
 	public void testNotWritable() throws Exception {
 		SpelExpression expr = (SpelExpression)parser.parseExpression("37");
-		Assert.assertFalse(expr.isWritable(new StandardEvaluationContext()));
+		assertFalse(expr.isWritable(new StandardEvaluationContext()));
 		expr = (SpelExpression)parser.parseExpression("37L");
-		Assert.assertFalse(expr.isWritable(new StandardEvaluationContext()));
+		assertFalse(expr.isWritable(new StandardEvaluationContext()));
 		expr = (SpelExpression)parser.parseExpression("true");
-		Assert.assertFalse(expr.isWritable(new StandardEvaluationContext()));
+		assertFalse(expr.isWritable(new StandardEvaluationContext()));
 	}
 }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java
index 606d4c423f0..3ea0f98e3dd 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java
@@ -16,10 +16,10 @@
 
 package org.springframework.expression.spel;
 
-import java.util.Map;
-import java.util.HashMap;
+import static org.junit.Assert.assertEquals;
 
-import junit.framework.Assert;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.junit.Test;
 import org.springframework.expression.AccessException;
@@ -56,7 +56,7 @@ public class MapAccessTests extends ExpressionTestCase {
 
 		Expression expr = parser.parseExpression("testMap.monday");
 		Object value = expr.getValue(ctx, String.class);
-		Assert.assertEquals("montag", value);
+		assertEquals("montag", value);
 	}
 
 	@Test
@@ -67,7 +67,7 @@ public class MapAccessTests extends ExpressionTestCase {
 
 		Expression expr = parser.parseExpression("testMap[#day]");
 		Object value = expr.getValue(ctx, String.class);
-		Assert.assertEquals("samstag", value);
+		assertEquals("samstag", value);
 	}
 
 	@Test
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java
index 703b1b7394f..394ec38817e 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorOverloaderTests.java
@@ -16,7 +16,7 @@
 
 package org.springframework.expression.spel;
 
-import junit.framework.Assert;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.springframework.expression.EvaluationException;
@@ -64,12 +64,12 @@ public class OperatorOverloaderTests extends ExpressionTestCase {
 		eContext.setOperatorOverloader(new StringAndBooleanAddition());
 
 		SpelExpression expr = (SpelExpression)parser.parseExpression("'abc'+true");
-		Assert.assertEquals("abctrue",expr.getValue(eContext));
+		assertEquals("abctrue",expr.getValue(eContext));
 
 		expr = (SpelExpression)parser.parseExpression("'abc'-true");
-		Assert.assertEquals("abc",expr.getValue(eContext));
+		assertEquals("abc",expr.getValue(eContext));
 
 		expr = (SpelExpression)parser.parseExpression("'abc'+null");
-		Assert.assertEquals("abcnull",expr.getValue(eContext));
+		assertEquals("abcnull",expr.getValue(eContext));
 	}
 }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorTests.java
index 56f26cef121..2728626b4f9 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/OperatorTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/OperatorTests.java
@@ -16,7 +16,8 @@
 
 package org.springframework.expression.spel;
 
-import junit.framework.Assert;
+import static org.junit.Assert.assertEquals;
+
 import org.junit.Test;
 import org.springframework.expression.spel.ast.Operator;
 import org.springframework.expression.spel.standard.SpelExpression;
@@ -208,9 +209,9 @@ public class OperatorTests extends ExpressionTestCase {
 
 		// AST:
 		SpelExpression expr = (SpelExpression)parser.parseExpression("+3");
-		Assert.assertEquals("+3",expr.toStringAST());
+		assertEquals("+3",expr.toStringAST());
 		expr = (SpelExpression)parser.parseExpression("2+3");
-		Assert.assertEquals("(2 + 3)",expr.toStringAST());
+		assertEquals("(2 + 3)",expr.toStringAST());
 
 		// use as a unary operator
 		evaluate("+5d",5d,Double.class);
@@ -232,9 +233,9 @@ public class OperatorTests extends ExpressionTestCase {
 		evaluateAndCheckError("'ab' - 2", SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES);
 		evaluateAndCheckError("2-'ab'",SpelMessage.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES);
 		SpelExpression expr = (SpelExpression)parser.parseExpression("-3");
-		Assert.assertEquals("-3",expr.toStringAST());
+		assertEquals("-3",expr.toStringAST());
 		expr = (SpelExpression)parser.parseExpression("2-3");
-		Assert.assertEquals("(2 - 3)",expr.toStringAST());
+		assertEquals("(2 - 3)",expr.toStringAST());
 
 		evaluate("-5d",-5d,Double.class);
 		evaluate("-5L",-5L,Long.class);
@@ -286,40 +287,40 @@ public class OperatorTests extends ExpressionTestCase {
 	@Test
 	public void testOperatorNames() throws Exception {
 		Operator node = getOperatorNode((SpelExpression)parser.parseExpression("1==3"));
-		Assert.assertEquals("==",node.getOperatorName());
+		assertEquals("==",node.getOperatorName());
 
 		node = getOperatorNode((SpelExpression)parser.parseExpression("1!=3"));
-		Assert.assertEquals("!=",node.getOperatorName());
+		assertEquals("!=",node.getOperatorName());
 
 		node = getOperatorNode((SpelExpression)parser.parseExpression("3/3"));
-		Assert.assertEquals("/",node.getOperatorName());
+		assertEquals("/",node.getOperatorName());
 
 		node = getOperatorNode((SpelExpression)parser.parseExpression("3+3"));
-		Assert.assertEquals("+",node.getOperatorName());
+		assertEquals("+",node.getOperatorName());
 
 		node = getOperatorNode((SpelExpression)parser.parseExpression("3-3"));
-		Assert.assertEquals("-",node.getOperatorName());
+		assertEquals("-",node.getOperatorName());
 
 		node = getOperatorNode((SpelExpression)parser.parseExpression("3<4"));
-		Assert.assertEquals("<",node.getOperatorName());
+		assertEquals("<",node.getOperatorName());
 
 		node = getOperatorNode((SpelExpression)parser.parseExpression("3<=4"));
-		Assert.assertEquals("<=",node.getOperatorName());
+		assertEquals("<=",node.getOperatorName());
 
 		node = getOperatorNode((SpelExpression)parser.parseExpression("3*4"));
-		Assert.assertEquals("*",node.getOperatorName());
+		assertEquals("*",node.getOperatorName());
 
 		node = getOperatorNode((SpelExpression)parser.parseExpression("3%4"));
-		Assert.assertEquals("%",node.getOperatorName());
+		assertEquals("%",node.getOperatorName());
 
 		node = getOperatorNode((SpelExpression)parser.parseExpression("3>=4"));
-		Assert.assertEquals(">=",node.getOperatorName());
+		assertEquals(">=",node.getOperatorName());
 
 		node = getOperatorNode((SpelExpression)parser.parseExpression("3 between 4"));
-		Assert.assertEquals("between",node.getOperatorName());
+		assertEquals("between",node.getOperatorName());
 
 		node = getOperatorNode((SpelExpression)parser.parseExpression("3 ^ 4"));
-		Assert.assertEquals("^",node.getOperatorName());
+		assertEquals("^",node.getOperatorName());
 	}
 
 	@Test
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java
index d2d6b954fec..ff92b504761 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ParsingTests.java
@@ -16,7 +16,8 @@
 
 package org.springframework.expression.spel;
 
-import junit.framework.Assert;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import org.junit.Test;
 import org.springframework.expression.ParseException;
@@ -462,12 +463,12 @@ public class ParsingTests {
 				SpelUtilities.printAbstractSyntaxTree(System.err, e);
 			}
 			if (e == null) {
-				Assert.fail("Parsed exception was null");
+				fail("Parsed exception was null");
 			}
-			Assert.assertEquals("String form of AST does not match expected output", expectedStringFormOfAST, e.toStringAST());
+			assertEquals("String form of AST does not match expected output", expectedStringFormOfAST, e.toStringAST());
 		} catch (ParseException ee) {
 			ee.printStackTrace();
-			Assert.fail("Unexpected Exception: " + ee.getMessage());
+			fail("Unexpected Exception: " + ee.getMessage());
 		}
 	}
 
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java
index 029dd2440f2..7262d63b6d1 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java
@@ -16,7 +16,8 @@
 
 package org.springframework.expression.spel;
 
-import junit.framework.Assert;
+import static org.junit.Assert.fail;
+
 import org.junit.Test;
 
 import org.springframework.build.junit.Assume;
@@ -54,7 +55,7 @@ public class PerformanceTests {
 		for (int i = 0; i < ITERATIONS; i++) {
 			Expression expr = parser.parseExpression("placeOfBirth.city");
 			if (expr == null) {
-				Assert.fail("Parser returned null for expression");
+				fail("Parser returned null for expression");
 			}
 			expr.getValue(eContext);
 		}
@@ -63,7 +64,7 @@ public class PerformanceTests {
 		for (int i = 0; i < ITERATIONS; i++) {
 			Expression expr = parser.parseExpression("placeOfBirth.city");
 			if (expr == null) {
-				Assert.fail("Parser returned null for expression");
+				fail("Parser returned null for expression");
 			}
 			expr.getValue(eContext);
 		}
@@ -75,7 +76,7 @@ public class PerformanceTests {
 
 		Expression expr = parser.parseExpression("placeOfBirth.city");
 		if (expr == null) {
-			Assert.fail("Parser returned null for expression");
+			fail("Parser returned null for expression");
 		}
 		starttime = System.currentTimeMillis();
 		for (int i = 0; i < ITERATIONS; i++) {
@@ -89,7 +90,7 @@ public class PerformanceTests {
 		if (reuseTime > freshParseTime) {
 			System.out.println("Fresh parse every time, ITERATIONS iterations = " + freshParseTime + "ms");
 			System.out.println("Reuse SpelExpression, ITERATIONS iterations = " + reuseTime + "ms");
-			Assert.fail("Should have been quicker to reuse!");
+			fail("Should have been quicker to reuse!");
 		}
 	}
 
@@ -104,7 +105,7 @@ public class PerformanceTests {
 		for (int i = 0; i < ITERATIONS; i++) {
 			Expression expr = parser.parseExpression("getPlaceOfBirth().getCity()");
 			if (expr == null) {
-				Assert.fail("Parser returned null for expression");
+				fail("Parser returned null for expression");
 			}
 			expr.getValue(eContext);
 		}
@@ -113,7 +114,7 @@ public class PerformanceTests {
 		for (int i = 0; i < ITERATIONS; i++) {
 			Expression expr = parser.parseExpression("getPlaceOfBirth().getCity()");
 			if (expr == null) {
-				Assert.fail("Parser returned null for expression");
+				fail("Parser returned null for expression");
 			}
 			expr.getValue(eContext);
 		}
@@ -125,7 +126,7 @@ public class PerformanceTests {
 
 		Expression expr = parser.parseExpression("getPlaceOfBirth().getCity()");
 		if (expr == null) {
-			Assert.fail("Parser returned null for expression");
+			fail("Parser returned null for expression");
 		}
 		starttime = System.currentTimeMillis();
 		for (int i = 0; i < ITERATIONS; i++) {
@@ -140,7 +141,7 @@ public class PerformanceTests {
 		if (reuseTime > freshParseTime) {
 			System.out.println("Fresh parse every time, ITERATIONS iterations = " + freshParseTime + "ms");
 			System.out.println("Reuse SpelExpression, ITERATIONS iterations = " + reuseTime + "ms");
-			Assert.fail("Should have been quicker to reuse!");
+			fail("Should have been quicker to reuse!");
 		}
 	}
 
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java
index 104000d8780..117d7b87f20 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/PropertyAccessTests.java
@@ -16,13 +16,15 @@
 
 package org.springframework.expression.spel;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.Assert;
-
 import org.junit.Test;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.expression.AccessException;
@@ -78,14 +80,14 @@ public class PropertyAccessTests extends ExpressionTestCase {
 		EvaluationContext context = new StandardEvaluationContext(null);
 		try {
 			expr.getValue(context);
-			Assert.fail("Should have failed - default property resolver cannot resolve on null");
+			fail("Should have failed - default property resolver cannot resolve on null");
 		} catch (Exception e) {
 			checkException(e,SpelMessage.PROPERTY_OR_FIELD_NOT_READABLE_ON_NULL);
 		}
-		Assert.assertFalse(expr.isWritable(context));
+		assertFalse(expr.isWritable(context));
 		try {
 			expr.setValue(context,"abc");
-			Assert.fail("Should have failed - default property resolver cannot resolve on null");
+			fail("Should have failed - default property resolver cannot resolve on null");
 		} catch (Exception e) {
 			checkException(e,SpelMessage.PROPERTY_OR_FIELD_NOT_WRITABLE_ON_NULL);
 		}
@@ -94,9 +96,9 @@ public class PropertyAccessTests extends ExpressionTestCase {
 	private void checkException(Exception e, SpelMessage expectedMessage) {
 		if (e instanceof SpelEvaluationException) {
 			SpelMessage sm = ((SpelEvaluationException)e).getMessageCode();
-			Assert.assertEquals("Expected exception type did not occur",expectedMessage,sm);
+			assertEquals("Expected exception type did not occur",expectedMessage,sm);
 		} else {
-			Assert.fail("Should be a SpelException "+e);
+			fail("Should be a SpelException "+e);
 		}
 	}
 
@@ -112,22 +114,22 @@ public class PropertyAccessTests extends ExpressionTestCase {
 		ctx.addPropertyAccessor(new StringyPropertyAccessor());
 		Expression expr = parser.parseRaw("new String('hello').flibbles");
 		Integer i = expr.getValue(ctx, Integer.class);
-		Assert.assertEquals((int) i, 7);
+		assertEquals((int) i, 7);
 
 		// The reflection one will be used for other properties...
 		expr = parser.parseRaw("new String('hello').CASE_INSENSITIVE_ORDER");
 		Object o = expr.getValue(ctx);
-		Assert.assertNotNull(o);
+		assertNotNull(o);
 
 		expr = parser.parseRaw("new String('hello').flibbles");
 		expr.setValue(ctx, 99);
 		i = expr.getValue(ctx, Integer.class);
-		Assert.assertEquals((int) i, 99);
+		assertEquals((int) i, 99);
 
 		// Cannot set it to a string value
 		try {
 			expr.setValue(ctx, "not allowed");
-			Assert.fail("Should not have been allowed");
+			fail("Should not have been allowed");
 		} catch (EvaluationException e) {
 			// success - message will be: EL1063E:(pos 20): A problem occurred whilst attempting to set the property
 			// 'flibbles': 'Cannot set flibbles to an object of type 'class java.lang.String''
@@ -141,20 +143,20 @@ public class PropertyAccessTests extends ExpressionTestCase {
 
 		// reflective property accessor is the only one by default
 		List propertyAccessors = ctx.getPropertyAccessors();
-		Assert.assertEquals(1,propertyAccessors.size());
+		assertEquals(1,propertyAccessors.size());
 
 		StringyPropertyAccessor spa = new StringyPropertyAccessor();
 		ctx.addPropertyAccessor(spa);
-		Assert.assertEquals(2,ctx.getPropertyAccessors().size());
+		assertEquals(2,ctx.getPropertyAccessors().size());
 
 		List copy = new ArrayList();
 		copy.addAll(ctx.getPropertyAccessors());
-		Assert.assertTrue(ctx.removePropertyAccessor(spa));
-		Assert.assertFalse(ctx.removePropertyAccessor(spa));
-		Assert.assertEquals(1,ctx.getPropertyAccessors().size());
+		assertTrue(ctx.removePropertyAccessor(spa));
+		assertFalse(ctx.removePropertyAccessor(spa));
+		assertEquals(1,ctx.getPropertyAccessors().size());
 
 		ctx.setPropertyAccessors(copy);
-		Assert.assertEquals(2,ctx.getPropertyAccessors().size());
+		assertEquals(2,ctx.getPropertyAccessors().size());
 	}
 
 	@Test
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java b/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java
index 568bdfad27a..ca44e2e762f 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/ScenariosForSpringSecurity.java
@@ -16,11 +16,13 @@
 
 package org.springframework.expression.spel;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.lang.reflect.Method;
 import java.util.List;
 
-import junit.framework.Assert;
-
 import org.junit.Test;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.convert.TypeDescriptor;
@@ -54,15 +56,15 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase {
 
 			ctx.setRootObject(new Person("Ben"));
 			Boolean value = expr.getValue(ctx,Boolean.class);
-			Assert.assertFalse(value);
+			assertFalse(value);
 
 			ctx.setRootObject(new Manager("Luke"));
 			value = expr.getValue(ctx,Boolean.class);
-			Assert.assertTrue(value);
+			assertTrue(value);
 
 		} catch (EvaluationException ee) {
 			ee.printStackTrace();
-			Assert.fail("Unexpected SpelException: " + ee.getMessage());
+			fail("Unexpected SpelException: " + ee.getMessage());
 		}
 	}
 
@@ -79,11 +81,11 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase {
 
 		ctx.setRootObject(new Person("Andy"));
 		Boolean value = expr.getValue(ctx,Boolean.class);
-		Assert.assertTrue(value);
+		assertTrue(value);
 
 		ctx.setRootObject(new Person("Christian"));
 		value = expr.getValue(ctx,Boolean.class);
-		Assert.assertFalse(value);
+		assertFalse(value);
 
 		// (2) Or register an accessor that can understand 'p' and return the right person
 		expr = parser.parseRaw("p.name == principal.name");
@@ -94,11 +96,11 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase {
 
 		pAccessor.setPerson(new Person("Andy"));
 		value = expr.getValue(ctx,Boolean.class);
-		Assert.assertTrue(value);
+		assertTrue(value);
 
 		pAccessor.setPerson(new Person("Christian"));
 		value = expr.getValue(ctx,Boolean.class);
-		Assert.assertFalse(value);
+		assertFalse(value);
 	}
 
 	@Test
@@ -115,12 +117,12 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase {
 		ctx.setVariable("a",1.0d); // referenced as #a in the expression
 		ctx.setRootObject(new Supervisor("Ben")); // so non-qualified references 'hasRole()' 'hasIpAddress()' are invoked against it
 		value = expr.getValue(ctx,Boolean.class);
-		Assert.assertTrue(value);
+		assertTrue(value);
 
 		ctx.setRootObject(new Manager("Luke"));
 		ctx.setVariable("a",1.043d);
 		value = expr.getValue(ctx,Boolean.class);
-		Assert.assertFalse(value);
+		assertFalse(value);
 	}
 
 	// Here i'm going to change which hasRole() executes and make it one of my own Java methods
@@ -141,7 +143,7 @@ public class ScenariosForSpringSecurity extends ExpressionTestCase {
 
 		ctx.setVariable("a",1.0d); // referenced as #a in the expression
 		value = expr.getValue(ctx,Boolean.class);
-		Assert.assertTrue(value);
+		assertTrue(value);
 
 //			ctx.setRootObject(new Manager("Luke"));
 //			ctx.setVariable("a",1.043d);
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java
index 5c2a3de1f25..38ac64801be 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/SetValueTests.java
@@ -16,11 +16,15 @@
 
 package org.springframework.expression.spel;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.util.Collection;
 import java.util.Set;
 
-import junit.framework.Assert;
-
 import org.junit.Test;
 import org.springframework.expression.EvaluationException;
 import org.springframework.expression.Expression;
@@ -146,8 +150,8 @@ public class SetValueTests extends ExpressionTestCase {
 	public void testAssign() throws Exception {
 		StandardEvaluationContext eContext = TestScenarioCreator.getTestEvaluationContext();
 		Expression e = parse("publicName='Andy'");
-		Assert.assertFalse(e.isWritable(eContext));
-		Assert.assertEquals("Andy",e.getValue(eContext));
+		assertFalse(e.isWritable(eContext));
+		assertEquals("Andy",e.getValue(eContext));
 	}
 
 	/*
@@ -157,7 +161,7 @@ public class SetValueTests extends ExpressionTestCase {
 	public void testSetGenericMapElementRequiresCoercion() throws Exception {
 		StandardEvaluationContext eContext = TestScenarioCreator.getTestEvaluationContext();
 		Expression e = parse("mapOfStringToBoolean[42]");
-		Assert.assertNull(e.getValue(eContext));
+		assertNull(e.getValue(eContext));
 
 		// Key should be coerced to string representation of 42
 		e.setValue(eContext, "true");
@@ -165,18 +169,18 @@ public class SetValueTests extends ExpressionTestCase {
 		// All keys should be strings
 		Set ks = parse("mapOfStringToBoolean.keySet()").getValue(eContext,Set.class);
 		for (Object o: ks) {
-			Assert.assertEquals(String.class,o.getClass());
+			assertEquals(String.class,o.getClass());
 		}
 
 		// All values should be booleans
 		Collection vs = parse("mapOfStringToBoolean.values()").getValue(eContext,Collection.class);
 		for (Object o: vs) {
-			Assert.assertEquals(Boolean.class,o.getClass());
+			assertEquals(Boolean.class,o.getClass());
 		}
 
 		// One final test check coercion on the key for a map lookup
 		Object o = e.getValue(eContext);
-		Assert.assertEquals(Boolean.TRUE,o);
+		assertEquals(Boolean.TRUE,o);
 	}
 
 
@@ -191,17 +195,17 @@ public class SetValueTests extends ExpressionTestCase {
 		try {
 			Expression e = parser.parseExpression(expression);
 			if (e == null) {
-				Assert.fail("Parser returned null for expression");
+				fail("Parser returned null for expression");
 			}
 			if (DEBUG) {
 				SpelUtilities.printAbstractSyntaxTree(System.out, e);
 			}
 			StandardEvaluationContext lContext = TestScenarioCreator.getTestEvaluationContext();
 			e.setValue(lContext, value);
-			Assert.fail("expected an error");
+			fail("expected an error");
 		} catch (ParseException pe) {
 			pe.printStackTrace();
-			Assert.fail("Unexpected Exception: " + pe.getMessage());
+			fail("Unexpected Exception: " + pe.getMessage());
 		} catch (EvaluationException ee) {
 			// success!
 		}
@@ -211,21 +215,21 @@ public class SetValueTests extends ExpressionTestCase {
 		try {
 			Expression e = parser.parseExpression(expression);
 			if (e == null) {
-				Assert.fail("Parser returned null for expression");
+				fail("Parser returned null for expression");
 			}
 			if (DEBUG) {
 				SpelUtilities.printAbstractSyntaxTree(System.out, e);
 			}
 			StandardEvaluationContext lContext = TestScenarioCreator.getTestEvaluationContext();
-			Assert.assertTrue("Expression is not writeable but should be", e.isWritable(lContext));
+			assertTrue("Expression is not writeable but should be", e.isWritable(lContext));
 			e.setValue(lContext, value);
-			Assert.assertEquals("Retrieved value was not equal to set value", value, e.getValue(lContext,value.getClass()));
+			assertEquals("Retrieved value was not equal to set value", value, e.getValue(lContext,value.getClass()));
 		} catch (EvaluationException ee) {
 			ee.printStackTrace();
-			Assert.fail("Unexpected Exception: " + ee.getMessage());
+			fail("Unexpected Exception: " + ee.getMessage());
 		} catch (ParseException pe) {
 			pe.printStackTrace();
-			Assert.fail("Unexpected Exception: " + pe.getMessage());
+			fail("Unexpected Exception: " + pe.getMessage());
 		}
 	}
 
@@ -237,26 +241,26 @@ public class SetValueTests extends ExpressionTestCase {
 		try {
 			Expression e = parser.parseExpression(expression);
 			if (e == null) {
-				Assert.fail("Parser returned null for expression");
+				fail("Parser returned null for expression");
 			}
 			if (DEBUG) {
 				SpelUtilities.printAbstractSyntaxTree(System.out, e);
 			}
 			StandardEvaluationContext lContext = TestScenarioCreator.getTestEvaluationContext();
-			Assert.assertTrue("Expression is not writeable but should be", e.isWritable(lContext));
+			assertTrue("Expression is not writeable but should be", e.isWritable(lContext));
 			e.setValue(lContext, value);
 			Object a = expectedValue;
 			Object b = e.getValue(lContext);
 			if (!a.equals(b)) {
-				Assert.fail("Not the same: ["+a+"] type="+a.getClass()+"  ["+b+"] type="+b.getClass());
-//				Assert.assertEquals("Retrieved value was not equal to set value", expectedValue, e.getValue(lContext));
+				fail("Not the same: ["+a+"] type="+a.getClass()+"  ["+b+"] type="+b.getClass());
+//				assertEquals("Retrieved value was not equal to set value", expectedValue, e.getValue(lContext));
 			}
 		} catch (EvaluationException ee) {
 			ee.printStackTrace();
-			Assert.fail("Unexpected Exception: " + ee.getMessage());
+			fail("Unexpected Exception: " + ee.getMessage());
 		} catch (ParseException pe) {
 			pe.printStackTrace();
-			Assert.fail("Unexpected Exception: " + pe.getMessage());
+			fail("Unexpected Exception: " + pe.getMessage());
 		}
 	}
 }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
index d9b05524a73..9416ba87cff 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelDocumentationTests.java
@@ -16,6 +16,11 @@
 
 package org.springframework.expression.spel;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -24,8 +29,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Assert;
-
 import org.junit.Test;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.Expression;
@@ -122,7 +125,7 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		context.setRootObject(tesla);
 
 		String name = (String) exp.getValue(context);
-		Assert.assertEquals("Nikola Tesla",name);
+		assertEquals("Nikola Tesla",name);
 	}
 
 	@Test
@@ -134,7 +137,7 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 
 		Expression exp = parser.parseExpression("name == 'Nikola Tesla'");
 		boolean isEqual = exp.getValue(context, Boolean.class);  // evaluates to true
-		Assert.assertTrue(isEqual);
+		assertTrue(isEqual);
 	}
 
 	// Section 7.4.1
@@ -150,29 +153,29 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		ExpressionParser parser = new SpelExpressionParser();
 
 		String helloWorld = (String) parser.parseExpression("'Hello World'").getValue(); // evals to "Hello World"
-		Assert.assertEquals("Hello World",helloWorld);
+		assertEquals("Hello World",helloWorld);
 
 		double avogadrosNumber  = (Double) parser.parseExpression("6.0221415E+23").getValue();
-		Assert.assertEquals(6.0221415E+23,avogadrosNumber);
+		assertEquals(6.0221415E+23, avogadrosNumber, 0);
 
 		int maxValue = (Integer) parser.parseExpression("0x7FFFFFFF").getValue();  // evals to 2147483647
-		Assert.assertEquals(Integer.MAX_VALUE,maxValue);
+		assertEquals(Integer.MAX_VALUE,maxValue);
 
 		boolean trueValue = (Boolean) parser.parseExpression("true").getValue();
-		Assert.assertTrue(trueValue);
+		assertTrue(trueValue);
 
 		Object nullValue = parser.parseExpression("null").getValue();
-		Assert.assertNull(nullValue);
+		assertNull(nullValue);
 	}
 
 	@Test
 	public void testPropertyAccess() throws Exception {
 		EvaluationContext context = TestScenarioCreator.getTestEvaluationContext();
 		int year = (Integer) parser.parseExpression("Birthdate.Year + 1900").getValue(context); // 1856
-		Assert.assertEquals(1856,year);
+		assertEquals(1856,year);
 
 		String city = (String) parser.parseExpression("placeOfBirth.City").getValue(context);
-		Assert.assertEquals("SmilJan",city);
+		assertEquals("SmilJan",city);
 	}
 
 	@Test
@@ -185,7 +188,7 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 
 		// evaluates to "Induction motor"
 		String invention = parser.parseExpression("inventions[3]").getValue(teslaContext, String.class);
-		Assert.assertEquals("Induction motor",invention);
+		assertEquals("Induction motor",invention);
 
 		// Members List
 		StandardEvaluationContext societyContext = new StandardEvaluationContext();
@@ -195,12 +198,12 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 
 		// evaluates to "Nikola Tesla"
 		String name = parser.parseExpression("Members[0].Name").getValue(societyContext, String.class);
-		Assert.assertEquals("Nikola Tesla",name);
+		assertEquals("Nikola Tesla",name);
 
 		// List and Array navigation
 		// evaluates to "Wireless communication"
 		invention = parser.parseExpression("Members[0].Inventions[6]").getValue(societyContext, String.class);
-		Assert.assertEquals("Wireless communication",invention);
+		assertEquals("Wireless communication",invention);
 	}
 
 
@@ -216,12 +219,12 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 
 		// setting values
 		Inventor i = parser.parseExpression("officers['advisors'][0]").getValue(societyContext,Inventor.class);
-		Assert.assertEquals("Nikola Tesla",i.getName());
+		assertEquals("Nikola Tesla",i.getName());
 
 		parser.parseExpression("officers['advisors'][0].PlaceOfBirth.Country").setValue(societyContext, "Croatia");
 
 		Inventor i2 = parser.parseExpression("reverse[0]['advisors'][0]").getValue(societyContext,Inventor.class);
-		Assert.assertEquals("Nikola Tesla",i2.getName());
+		assertEquals("Nikola Tesla",i2.getName());
 
 	}
 
@@ -231,13 +234,13 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 	public void testMethodInvocation2() throws Exception {
 		// string literal, evaluates to "bc"
 		String c = parser.parseExpression("'abc'.substring(1, 3)").getValue(String.class);
-		Assert.assertEquals("bc",c);
+		assertEquals("bc",c);
 
 		StandardEvaluationContext societyContext = new StandardEvaluationContext();
 		societyContext.setRootObject(new IEEE());
 		// evaluates to true
 		boolean isMember = parser.parseExpression("isMember('Mihajlo Pupin')").getValue(societyContext, Boolean.class);
-		Assert.assertTrue(isMember);
+		assertTrue(isMember);
 	}
 
 	// 7.5.4.1
@@ -245,29 +248,29 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 	@Test
 	public void testRelationalOperators() throws Exception {
 		boolean result = parser.parseExpression("2 == 2").getValue(Boolean.class);
-		Assert.assertTrue(result);
+		assertTrue(result);
 		// evaluates to false
 		result = parser.parseExpression("2 < -5.0").getValue(Boolean.class);
-		Assert.assertFalse(result);
+		assertFalse(result);
 
 		// evaluates to true
 		result = parser.parseExpression("'black' < 'block'").getValue(Boolean.class);
-		Assert.assertTrue(result);
+		assertTrue(result);
 	}
 
 	@Test
 	public void testOtherOperators() throws Exception {
 		// evaluates to false
 		boolean falseValue = parser.parseExpression("'xyz' instanceof T(int)").getValue(Boolean.class);
-		Assert.assertFalse(falseValue);
+		assertFalse(falseValue);
 
 		// evaluates to true
 		boolean trueValue = parser.parseExpression("'5.00' matches '^-?\\d+(\\.\\d{2})?$'").getValue(Boolean.class);
-		Assert.assertTrue(trueValue);
+		assertTrue(trueValue);
 
 		//evaluates to false
 		falseValue = parser.parseExpression("'5.0067' matches '^-?\\d+(\\.\\d{2})?$'").getValue(Boolean.class);
-		Assert.assertFalse(falseValue);
+		assertFalse(falseValue);
 	}
 
 	// 7.5.4.2
@@ -282,7 +285,7 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 
 		// evaluates to false
 		boolean falseValue = parser.parseExpression("true and false").getValue(Boolean.class);
-		Assert.assertFalse(falseValue);
+		assertFalse(falseValue);
 		// evaluates to true
 		String expression =  "isMember('Nikola Tesla') and isMember('Mihajlo Pupin')";
 		boolean trueValue = parser.parseExpression(expression).getValue(societyContext, Boolean.class);
@@ -291,24 +294,24 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 
 		// evaluates to true
 		trueValue = parser.parseExpression("true or false").getValue(Boolean.class);
-		Assert.assertTrue(trueValue);
+		assertTrue(trueValue);
 
 		// evaluates to true
 		expression =  "isMember('Nikola Tesla') or isMember('Albert Einstien')";
 		trueValue = parser.parseExpression(expression).getValue(societyContext, Boolean.class);
-		Assert.assertTrue(trueValue);
+		assertTrue(trueValue);
 
 		// -- NOT --
 
 		// evaluates to false
 		falseValue = parser.parseExpression("!true").getValue(Boolean.class);
-		Assert.assertFalse(falseValue);
+		assertFalse(falseValue);
 
 
 		// -- AND and NOT --
 		expression =  "isMember('Nikola Tesla') and !isMember('Mihajlo Pupin')";
 		falseValue = parser.parseExpression(expression).getValue(societyContext, Boolean.class);
-		Assert.assertFalse(falseValue);
+		assertFalse(falseValue);
 	}
 
 	// 7.5.4.3
@@ -317,42 +320,42 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 	public void testNumericalOperators() throws Exception {
 		// Addition
 		int two = parser.parseExpression("1 + 1").getValue(Integer.class); // 2
-		Assert.assertEquals(2,two);
+		assertEquals(2,two);
 
 		String testString = parser.parseExpression("'test' + ' ' + 'string'").getValue(String.class); // 'test string'
-		Assert.assertEquals("test string",testString);
+		assertEquals("test string",testString);
 
 		// Subtraction
 		int four =  parser.parseExpression("1 - -3").getValue(Integer.class); // 4
-		Assert.assertEquals(4,four);
+		assertEquals(4,four);
 
 		double d = parser.parseExpression("1000.00 - 1e4").getValue(Double.class); // -9000
-		Assert.assertEquals(-9000.0d,d);
+		assertEquals(-9000.0d, d, 0);
 
 		// Multiplication
 		int six =  parser.parseExpression("-2 * -3").getValue(Integer.class); // 6
-		Assert.assertEquals(6,six);
+		assertEquals(6,six);
 
 		double twentyFour = parser.parseExpression("2.0 * 3e0 * 4").getValue(Double.class); // 24.0
-		Assert.assertEquals(24.0d,twentyFour);
+		assertEquals(24.0d, twentyFour, 0);
 
 		// Division
 		int minusTwo =  parser.parseExpression("6 / -3").getValue(Integer.class); // -2
-		Assert.assertEquals(-2,minusTwo);
+		assertEquals(-2,minusTwo);
 
 		double one = parser.parseExpression("8.0 / 4e0 / 2").getValue(Double.class); // 1.0
-		Assert.assertEquals(1.0d,one);
+		assertEquals(1.0d, one, 0);
 
 		// Modulus
 		int three =  parser.parseExpression("7 % 4").getValue(Integer.class); // 3
-		Assert.assertEquals(3,three);
+		assertEquals(3,three);
 
 		int oneInt = parser.parseExpression("8 / 5 % 2").getValue(Integer.class); // 1
-		Assert.assertEquals(1,oneInt);
+		assertEquals(1,oneInt);
 
 		// Operator precedence
 		int minusTwentyOne = parser.parseExpression("1+2-3*8").getValue(Integer.class); // -21
-		Assert.assertEquals(-21,minusTwentyOne);
+		assertEquals(-21,minusTwentyOne);
 	}
 
 	// 7.5.5
@@ -365,12 +368,12 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 
 		parser.parseExpression("foo").setValue(inventorContext, "Alexander Seovic2");
 
-		Assert.assertEquals("Alexander Seovic2",parser.parseExpression("foo").getValue(inventorContext,String.class));
+		assertEquals("Alexander Seovic2",parser.parseExpression("foo").getValue(inventorContext,String.class));
 		// alternatively
 
 		String aleks = parser.parseExpression("foo = 'Alexandar Seovic'").getValue(inventorContext, String.class);
-		Assert.assertEquals("Alexandar Seovic",parser.parseExpression("foo").getValue(inventorContext,String.class));
-		Assert.assertEquals("Alexandar Seovic",aleks);
+		assertEquals("Alexandar Seovic",parser.parseExpression("foo").getValue(inventorContext,String.class));
+		assertEquals("Alexandar Seovic",aleks);
 	}
 
 	// 7.5.6
@@ -378,9 +381,9 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 	@Test
 	public void testTypes() throws Exception {
 		Class dateClass = parser.parseExpression("T(java.util.Date)").getValue(Class.class);
-		Assert.assertEquals(Date.class,dateClass);
+		assertEquals(Date.class,dateClass);
 		boolean trueValue = parser.parseExpression("T(java.math.RoundingMode).CEILING < T(java.math.RoundingMode).FLOOR").getValue(Boolean.class);
-		Assert.assertTrue(trueValue);
+		assertTrue(trueValue);
 	}
 
 	// 7.5.7
@@ -391,7 +394,7 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		societyContext.setRootObject(new IEEE());
 		Inventor einstein =
 			   parser.parseExpression("new org.springframework.expression.spel.testresources.Inventor('Albert Einstein',new java.util.Date(), 'German')").getValue(Inventor.class);
-		Assert.assertEquals("Albert Einstein", einstein.getName());
+		assertEquals("Albert Einstein", einstein.getName());
 		//create new inventor instance within add method of List
 		parser.parseExpression("Members2.add(new org.springframework.expression.spel.testresources.Inventor('Albert Einstein', 'German'))").getValue(societyContext);
 	}
@@ -408,7 +411,7 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 
 		parser.parseExpression("foo = #newName").getValue(context);
 
-		Assert.assertEquals("Mike Tesla",tesla.getFoo());
+		assertEquals("Mike Tesla",tesla.getFoo());
 	}
 
 	@SuppressWarnings("unchecked")
@@ -425,7 +428,7 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 
 		// all prime numbers > 10 from the list (using selection ?{...})
 		List primesGreaterThanTen = (List) parser.parseExpression("#primes.?[#this>10]").getValue(context);
-		Assert.assertEquals("[11, 13, 17]",primesGreaterThanTen.toString());
+		assertEquals("[11, 13, 17]",primesGreaterThanTen.toString());
 	}
 
 	// 7.5.9
@@ -439,7 +442,7 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 				"reverseString", new Class[] { String.class }));
 
 		String helloWorldReversed = parser.parseExpression("#reverseString('hello world')").getValue(context, String.class);
-		Assert.assertEquals("dlrow olleh",helloWorldReversed);
+		assertEquals("dlrow olleh",helloWorldReversed);
 	}
 
 	// 7.5.10
@@ -447,7 +450,7 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 	@Test
 	public void testTernary() throws Exception {
 		String falseString = parser.parseExpression("false ? 'trueExp' : 'falseExp'").getValue(String.class);
-		Assert.assertEquals("falseExp",falseString);
+		assertEquals("falseExp",falseString);
 
 		StandardEvaluationContext societyContext = new StandardEvaluationContext();
 		societyContext.setRootObject(new IEEE());
@@ -460,7 +463,7 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 				+ "+ Name + ' Society' : #queryName + ' is not a member of the ' + Name + ' Society'";
 
 		String queryResultString = parser.parseExpression(expression).getValue(societyContext, String.class);
-		Assert.assertEquals("Nikola Tesla is a member of the IEEE Society",queryResultString);
+		assertEquals("Nikola Tesla is a member of the IEEE Society",queryResultString);
 		// queryResultString = "Nikola Tesla is a member of the IEEE Society"
 	}
 
@@ -472,8 +475,8 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 		StandardEvaluationContext societyContext = new StandardEvaluationContext();
 		societyContext.setRootObject(new IEEE());
 		List list = (List) parser.parseExpression("Members2.?[nationality == 'Serbian']").getValue(societyContext);
-		Assert.assertEquals(1,list.size());
-		Assert.assertEquals("Nikola Tesla",list.get(0).getName());
+		assertEquals(1,list.size());
+		assertEquals("Nikola Tesla",list.get(0).getName());
 	}
 
 	// 7.5.12
@@ -482,7 +485,7 @@ public class SpelDocumentationTests extends ExpressionTestCase {
 	public void testTemplating() throws Exception {
 		String randomPhrase =
 			   parser.parseExpression("random number is ${T(java.lang.Math).random()}", new TemplatedParserContext()).getValue(String.class);
-		Assert.assertTrue(randomPhrase.startsWith("random number"));
+		assertTrue(randomPhrase.startsWith("random number"));
 	}
 
 	static class TemplatedParserContext implements ParserContext {
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java
index 545e3137136..d2f1433ad3c 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/StandardTypeLocatorTests.java
@@ -15,9 +15,12 @@
  */
 package org.springframework.expression.spel;
 
-import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
-import junit.framework.Assert;
+import java.util.List;
 
 import org.junit.Test;
 import org.springframework.expression.EvaluationException;
@@ -33,28 +36,27 @@ public class StandardTypeLocatorTests {
 	@Test
 	public void testImports() throws EvaluationException {
 		StandardTypeLocator locator = new StandardTypeLocator();
-		Assert.assertEquals(Integer.class,locator.findType("java.lang.Integer"));
-		Assert.assertEquals(String.class,locator.findType("java.lang.String"));
+		assertEquals(Integer.class,locator.findType("java.lang.Integer"));
+		assertEquals(String.class,locator.findType("java.lang.String"));
 
 		List prefixes = locator.getImportPrefixes();
-		Assert.assertEquals(1,prefixes.size());
-		Assert.assertTrue(prefixes.contains("java.lang"));
-		Assert.assertFalse(prefixes.contains("java.util"));
+		assertEquals(1,prefixes.size());
+		assertTrue(prefixes.contains("java.lang"));
+		assertFalse(prefixes.contains("java.util"));
 
-		Assert.assertEquals(Boolean.class,locator.findType("Boolean"));
+		assertEquals(Boolean.class,locator.findType("Boolean"));
 		// currently does not know about java.util by default
 //		assertEquals(java.util.List.class,locator.findType("List"));
 
 		try {
 			locator.findType("URL");
-			Assert.fail("Should have failed");
+			fail("Should have failed");
 		} catch (EvaluationException ee) {
 			SpelEvaluationException sEx = (SpelEvaluationException)ee;
-			Assert.assertEquals(SpelMessage.TYPE_NOT_FOUND,sEx.getMessageCode());
+			assertEquals(SpelMessage.TYPE_NOT_FOUND,sEx.getMessageCode());
 		}
 		locator.registerImport("java.net");
-		Assert.assertEquals(java.net.URL.class,locator.findType("URL"));
-
+		assertEquals(java.net.URL.class,locator.findType("URL"));
 	}
 
 }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java
index 74fff9810e5..a5216e9ca07 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/TemplateExpressionParsingTests.java
@@ -16,7 +16,10 @@
 
 package org.springframework.expression.spel;
 
-import junit.framework.Assert;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import org.junit.Test;
 import org.springframework.expression.EvaluationContext;
@@ -71,7 +74,7 @@ public class TemplateExpressionParsingTests extends ExpressionTestCase {
 		SpelExpressionParser parser = new SpelExpressionParser();
 		Expression expr = parser.parseExpression("hello ${'world'}", DEFAULT_TEMPLATE_PARSER_CONTEXT);
 		Object o = expr.getValue();
-		Assert.assertEquals("hello world", o.toString());
+		assertEquals("hello world", o.toString());
 	}
 
 	@Test
@@ -79,7 +82,7 @@ public class TemplateExpressionParsingTests extends ExpressionTestCase {
 		SpelExpressionParser parser = new SpelExpressionParser();
 		Expression expr = parser.parseExpression("hello ${'to'} you", DEFAULT_TEMPLATE_PARSER_CONTEXT);
 		Object o = expr.getValue();
-		Assert.assertEquals("hello to you", o.toString());
+		assertEquals("hello to you", o.toString());
 	}
 
 	@Test
@@ -88,7 +91,7 @@ public class TemplateExpressionParsingTests extends ExpressionTestCase {
 		Expression expr = parser.parseExpression("The quick ${'brown'} fox jumped over the ${'lazy'} dog",
 				DEFAULT_TEMPLATE_PARSER_CONTEXT);
 		Object o = expr.getValue();
-		Assert.assertEquals("The quick brown fox jumped over the lazy dog", o.toString());
+		assertEquals("The quick brown fox jumped over the lazy dog", o.toString());
 	}
 
 	@Test
@@ -96,19 +99,19 @@ public class TemplateExpressionParsingTests extends ExpressionTestCase {
 		SpelExpressionParser parser = new SpelExpressionParser();
 		Expression expr = parser.parseExpression("${'hello'} world", DEFAULT_TEMPLATE_PARSER_CONTEXT);
 		Object o = expr.getValue();
-		Assert.assertEquals("hello world", o.toString());
+		assertEquals("hello world", o.toString());
 
 		expr = parser.parseExpression("", DEFAULT_TEMPLATE_PARSER_CONTEXT);
 		o = expr.getValue();
-		Assert.assertEquals("", o.toString());
+		assertEquals("", o.toString());
 
 		expr = parser.parseExpression("abc", DEFAULT_TEMPLATE_PARSER_CONTEXT);
 		o = expr.getValue();
-		Assert.assertEquals("abc", o.toString());
+		assertEquals("abc", o.toString());
 
 		expr = parser.parseExpression("abc", DEFAULT_TEMPLATE_PARSER_CONTEXT);
 		o = expr.getValue((Object)null);
-		Assert.assertEquals("abc", o.toString());
+		assertEquals("abc", o.toString());
 	}
 
 	@Test
@@ -128,35 +131,35 @@ public class TemplateExpressionParsingTests extends ExpressionTestCase {
 		checkString("hello world", ex.getValue(ctx, new Rooty()));
 		checkString("hello world", ex.getValue(ctx, new Rooty(), String.class));
 		checkString("hello world", ex.getValue(ctx, new Rooty(), String.class));
-		Assert.assertEquals("hello ${'world'}", ex.getExpressionString());
-		Assert.assertFalse(ex.isWritable(new StandardEvaluationContext()));
-		Assert.assertFalse(ex.isWritable(new Rooty()));
-		Assert.assertFalse(ex.isWritable(new StandardEvaluationContext(), new Rooty()));
-
-		Assert.assertEquals(String.class,ex.getValueType());
-		Assert.assertEquals(String.class,ex.getValueType(ctx));
-		Assert.assertEquals(String.class,ex.getValueTypeDescriptor().getType());
-		Assert.assertEquals(String.class,ex.getValueTypeDescriptor(ctx).getType());
-		Assert.assertEquals(String.class,ex.getValueType(new Rooty()));
-		Assert.assertEquals(String.class,ex.getValueType(ctx, new Rooty()));
-		Assert.assertEquals(String.class,ex.getValueTypeDescriptor(new Rooty()).getType());
-		Assert.assertEquals(String.class,ex.getValueTypeDescriptor(ctx, new Rooty()).getType());
+		assertEquals("hello ${'world'}", ex.getExpressionString());
+		assertFalse(ex.isWritable(new StandardEvaluationContext()));
+		assertFalse(ex.isWritable(new Rooty()));
+		assertFalse(ex.isWritable(new StandardEvaluationContext(), new Rooty()));
+
+		assertEquals(String.class,ex.getValueType());
+		assertEquals(String.class,ex.getValueType(ctx));
+		assertEquals(String.class,ex.getValueTypeDescriptor().getType());
+		assertEquals(String.class,ex.getValueTypeDescriptor(ctx).getType());
+		assertEquals(String.class,ex.getValueType(new Rooty()));
+		assertEquals(String.class,ex.getValueType(ctx, new Rooty()));
+		assertEquals(String.class,ex.getValueTypeDescriptor(new Rooty()).getType());
+		assertEquals(String.class,ex.getValueTypeDescriptor(ctx, new Rooty()).getType());
 
 		try {
 			ex.setValue(ctx, null);
-			Assert.fail();
+			fail();
 		} catch (EvaluationException ee) {
 			// success
 		}
 		try {
 			ex.setValue((Object)null, null);
-			Assert.fail();
+			fail();
 		} catch (EvaluationException ee) {
 			// success
 		}
 		try {
 			ex.setValue(ctx, null, null);
-			Assert.fail();
+			fail();
 		} catch (EvaluationException ee) {
 			// success
 		}
@@ -170,34 +173,34 @@ public class TemplateExpressionParsingTests extends ExpressionTestCase {
 		// treat the nested ${..} as a part of the expression
 		Expression ex = parser.parseExpression("hello ${listOfNumbersUpToTen.$[#this<5]} world",DEFAULT_TEMPLATE_PARSER_CONTEXT);
 		String s = ex.getValue(TestScenarioCreator.getTestEvaluationContext(),String.class);
-		Assert.assertEquals("hello 4 world",s);
+		assertEquals("hello 4 world",s);
 
 		// not a useful expression but tests nested expression syntax that clashes with template prefix/suffix
 		ex = parser.parseExpression("hello ${listOfNumbersUpToTen.$[#root.listOfNumbersUpToTen.$[#this%2==1]==3]} world",DEFAULT_TEMPLATE_PARSER_CONTEXT);
-		Assert.assertEquals(CompositeStringExpression.class,ex.getClass());
+		assertEquals(CompositeStringExpression.class,ex.getClass());
 		CompositeStringExpression cse = (CompositeStringExpression)ex;
 		Expression[] exprs = cse.getExpressions();
-		Assert.assertEquals(3,exprs.length);
-		Assert.assertEquals("listOfNumbersUpToTen.$[#root.listOfNumbersUpToTen.$[#this%2==1]==3]",exprs[1].getExpressionString());
+		assertEquals(3,exprs.length);
+		assertEquals("listOfNumbersUpToTen.$[#root.listOfNumbersUpToTen.$[#this%2==1]==3]",exprs[1].getExpressionString());
 		s = ex.getValue(TestScenarioCreator.getTestEvaluationContext(),String.class);
-		Assert.assertEquals("hello  world",s);
+		assertEquals("hello  world",s);
 
 		ex = parser.parseExpression("hello ${listOfNumbersUpToTen.$[#this<5]} ${listOfNumbersUpToTen.$[#this>5]} world",DEFAULT_TEMPLATE_PARSER_CONTEXT);
 		s = ex.getValue(TestScenarioCreator.getTestEvaluationContext(),String.class);
-		Assert.assertEquals("hello 4 10 world",s);
+		assertEquals("hello 4 10 world",s);
 
 		try {
 			ex = parser.parseExpression("hello ${listOfNumbersUpToTen.$[#this<5]} ${listOfNumbersUpToTen.$[#this>5] world",DEFAULT_TEMPLATE_PARSER_CONTEXT);
-			Assert.fail("Should have failed");
+			fail("Should have failed");
 		} catch (ParseException pe) {
-			Assert.assertEquals("No ending suffix '}' for expression starting at character 41: ${listOfNumbersUpToTen.$[#this>5] world",pe.getMessage());
+			assertEquals("No ending suffix '}' for expression starting at character 41: ${listOfNumbersUpToTen.$[#this>5] world",pe.getMessage());
 		}
 
 		try {
 			ex = parser.parseExpression("hello ${listOfNumbersUpToTen.$[#root.listOfNumbersUpToTen.$[#this%2==1==3]} world",DEFAULT_TEMPLATE_PARSER_CONTEXT);
-			Assert.fail("Should have failed");
+			fail("Should have failed");
 		} catch (ParseException pe) {
-			Assert.assertEquals("Found closing '}' at position 74 but most recent opening is '[' at position 30",pe.getMessage());
+			assertEquals("Found closing '}' at position 74 but most recent opening is '[' at position 30",pe.getMessage());
 		}
 	}
 
@@ -207,74 +210,74 @@ public class TemplateExpressionParsingTests extends ExpressionTestCase {
 		// Just wanting to use the prefix or suffix within the template:
 		Expression ex = parser.parseExpression("hello ${3+4} world",DEFAULT_TEMPLATE_PARSER_CONTEXT);
 		String s = ex.getValue(TestScenarioCreator.getTestEvaluationContext(),String.class);
-		Assert.assertEquals("hello 7 world",s);
+		assertEquals("hello 7 world",s);
 
 		ex = parser.parseExpression("hello ${3+4} wo${'${'}rld",DEFAULT_TEMPLATE_PARSER_CONTEXT);
 		s = ex.getValue(TestScenarioCreator.getTestEvaluationContext(),String.class);
-		Assert.assertEquals("hello 7 wo${rld",s);
+		assertEquals("hello 7 wo${rld",s);
 
 		ex = parser.parseExpression("hello ${3+4} wo}rld",DEFAULT_TEMPLATE_PARSER_CONTEXT);
 		s = ex.getValue(TestScenarioCreator.getTestEvaluationContext(),String.class);
-		Assert.assertEquals("hello 7 wo}rld",s);
+		assertEquals("hello 7 wo}rld",s);
 	}
 
 	@Test
 	public void testParsingNormalExpressionThroughTemplateParser() throws Exception {
 		Expression expr = parser.parseExpression("1+2+3");
-		Assert.assertEquals(6,expr.getValue());
+		assertEquals(6,expr.getValue());
 		expr = parser.parseExpression("1+2+3",null);
-		Assert.assertEquals(6,expr.getValue());
+		assertEquals(6,expr.getValue());
 	}
 
 	@Test
 	public void testErrorCases() throws Exception {
 		try {
 			parser.parseExpression("hello ${'world'", DEFAULT_TEMPLATE_PARSER_CONTEXT);
-			Assert.fail("Should have failed");
+			fail("Should have failed");
 		} catch (ParseException pe) {
-			Assert.assertEquals("No ending suffix '}' for expression starting at character 6: ${'world'",pe.getMessage());
-			Assert.assertEquals("hello ${'world'",pe.getExpressionString());
+			assertEquals("No ending suffix '}' for expression starting at character 6: ${'world'",pe.getMessage());
+			assertEquals("hello ${'world'",pe.getExpressionString());
 		}
 		try {
 			parser.parseExpression("hello ${'wibble'${'world'}", DEFAULT_TEMPLATE_PARSER_CONTEXT);
-			Assert.fail("Should have failed");
+			fail("Should have failed");
 		} catch (ParseException pe) {
-			Assert.assertEquals("No ending suffix '}' for expression starting at character 6: ${'wibble'${'world'}",pe.getMessage());
+			assertEquals("No ending suffix '}' for expression starting at character 6: ${'wibble'${'world'}",pe.getMessage());
 		}
 		try {
 			parser.parseExpression("hello ${} world", DEFAULT_TEMPLATE_PARSER_CONTEXT);
-			Assert.fail("Should have failed");
+			fail("Should have failed");
 		} catch (ParseException pe) {
-			Assert.assertEquals("No expression defined within delimiter '${}' at character 6",pe.getMessage());
+			assertEquals("No expression defined within delimiter '${}' at character 6",pe.getMessage());
 		}
 	}
 
 	@Test
 	public void testTemplateParserContext() {
 		TemplateParserContext tpc = new TemplateParserContext("abc","def");
-		Assert.assertEquals("abc", tpc.getExpressionPrefix());
-		Assert.assertEquals("def", tpc.getExpressionSuffix());
-		Assert.assertTrue(tpc.isTemplate());
+		assertEquals("abc", tpc.getExpressionPrefix());
+		assertEquals("def", tpc.getExpressionSuffix());
+		assertTrue(tpc.isTemplate());
 
 		tpc = new TemplateParserContext();
-		Assert.assertEquals("#{", tpc.getExpressionPrefix());
-		Assert.assertEquals("}", tpc.getExpressionSuffix());
-		Assert.assertTrue(tpc.isTemplate());
+		assertEquals("#{", tpc.getExpressionPrefix());
+		assertEquals("}", tpc.getExpressionSuffix());
+		assertTrue(tpc.isTemplate());
 
 		ParserContext pc = ParserContext.TEMPLATE_EXPRESSION;
-		Assert.assertEquals("#{", pc.getExpressionPrefix());
-		Assert.assertEquals("}", pc.getExpressionSuffix());
-		Assert.assertTrue(pc.isTemplate());
+		assertEquals("#{", pc.getExpressionPrefix());
+		assertEquals("}", pc.getExpressionSuffix());
+		assertTrue(pc.isTemplate());
 	}
 
 	// ---
 
 	private void checkString(String expectedString, Object value) {
 		if (!(value instanceof String)) {
-			Assert.fail("Result was not a string, it was of type " + value.getClass() + "  (value=" + value + ")");
+			fail("Result was not a string, it was of type " + value.getClass() + "  (value=" + value + ")");
 		}
 		if (!value.equals(expectedString)) {
-			Assert.fail("Did not get expected result.  Should have been '" + expectedString + "' but was '" + value + "'");
+			fail("Did not get expected result.  Should have been '" + expectedString + "' but was '" + value + "'");
 		}
 	}
 
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java
index 59c61a73d1d..78b3dfbede9 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/VariableAndFunctionTests.java
@@ -16,7 +16,7 @@
 
 package org.springframework.expression.spel;
 
-import junit.framework.Assert;
+import static org.junit.Assert.fail;
 
 import org.junit.Test;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
@@ -77,11 +77,11 @@ public class VariableAndFunctionTests extends ExpressionTestCase {
 		try {
 			@SuppressWarnings("unused")
 			Object v = parser.parseRaw("#notStatic()").getValue(ctx);
-			Assert.fail("Should have failed with exception - cannot call non static method that way");
+			fail("Should have failed with exception - cannot call non static method that way");
 		} catch (SpelEvaluationException se) {
 			if (se.getMessageCode() != SpelMessage.FUNCTION_MUST_BE_STATIC) {
 				se.printStackTrace();
-				Assert.fail("Should have failed a message about the function needing to be static, not: "
+				fail("Should have failed a message about the function needing to be static, not: "
 						+ se.getMessageCode());
 			}
 		}
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java
index 523fe69a687..c31a94a71b4 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java
@@ -16,15 +16,20 @@
 
 package org.springframework.expression.spel.support;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Assert;
 import org.junit.Test;
-
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.ParseException;
@@ -47,19 +52,19 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 
 	@Test
 	public void testFormatHelperForClassName() {
-		Assert.assertEquals("java.lang.String",FormatHelper.formatClassNameForMessage(String.class));
-		Assert.assertEquals("java.lang.String[]",FormatHelper.formatClassNameForMessage(new String[1].getClass()));
-		Assert.assertEquals("int[]",FormatHelper.formatClassNameForMessage(new int[1].getClass()));
-		Assert.assertEquals("int[][]",FormatHelper.formatClassNameForMessage(new int[1][2].getClass()));
-		Assert.assertEquals("null",FormatHelper.formatClassNameForMessage(null));
+		assertEquals("java.lang.String",FormatHelper.formatClassNameForMessage(String.class));
+		assertEquals("java.lang.String[]",FormatHelper.formatClassNameForMessage(new String[1].getClass()));
+		assertEquals("int[]",FormatHelper.formatClassNameForMessage(new int[1].getClass()));
+		assertEquals("int[][]",FormatHelper.formatClassNameForMessage(new int[1][2].getClass()));
+		assertEquals("null",FormatHelper.formatClassNameForMessage(null));
 	}
 
 	/*
 	@Test
 	public void testFormatHelperForMethod() {
-		Assert.assertEquals("foo(java.lang.String)",FormatHelper.formatMethodForMessage("foo", String.class));
-		Assert.assertEquals("goo(java.lang.String,int[])",FormatHelper.formatMethodForMessage("goo", String.class,new int[1].getClass()));
-		Assert.assertEquals("boo()",FormatHelper.formatMethodForMessage("boo"));
+		assertEquals("foo(java.lang.String)",FormatHelper.formatMethodForMessage("foo", String.class));
+		assertEquals("goo(java.lang.String,int[])",FormatHelper.formatMethodForMessage("goo", String.class,new int[1].getClass()));
+		assertEquals("boo()",FormatHelper.formatMethodForMessage("boo"));
 	}
 	*/
 
@@ -90,15 +95,15 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 //		  CompoundExpression  value:2
 //		    IntLiteral  value:2
 //		===> Expression '3+4+5+6+7-2' - AST end
-		Assert.assertTrue(s.indexOf("===> Expression '3+4+5+6+7-2' - AST start")!=-1);
-		Assert.assertTrue(s.indexOf(" OpPlus  value:((((3 + 4) + 5) + 6) + 7)  #children:2")!=-1);
+		assertTrue(s.indexOf("===> Expression '3+4+5+6+7-2' - AST start")!=-1);
+		assertTrue(s.indexOf(" OpPlus  value:((((3 + 4) + 5) + 6) + 7)  #children:2")!=-1);
 	}
 
 	@Test
 	public void testTypedValue() {
 		TypedValue tValue = new TypedValue("hello");
-		Assert.assertEquals(String.class,tValue.getTypeDescriptor().getType());
-		Assert.assertEquals("TypedValue: 'hello' of [java.lang.String]",tValue.toString());
+		assertEquals(String.class,tValue.getTypeDescriptor().getType());
+		assertEquals("TypedValue: 'hello' of [java.lang.String]",tValue.toString());
 	}
 
 	@Test
@@ -256,10 +261,10 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 		args = new Object[]{3,false,3.0f};
 		try {
 			ReflectionHelper.convertAllArguments(null, args, twoArg);
-			Assert.fail("Should have failed because no converter supplied");
+			fail("Should have failed because no converter supplied");
 		}
 		catch (SpelEvaluationException se) {
-			Assert.assertEquals(SpelMessage.TYPE_CONVERSION_ERROR,se.getMessageCode());
+			assertEquals(SpelMessage.TYPE_CONVERSION_ERROR,se.getMessageCode());
 		}
 
 		// null value
@@ -272,14 +277,14 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 	public void testSetupArguments() {
 		Object[] newArray = ReflectionHelper.setupArgumentsForVarargsInvocation(new Class[]{new String[0].getClass()},"a","b","c");
 
-		Assert.assertEquals(1,newArray.length);
+		assertEquals(1,newArray.length);
 		Object firstParam = newArray[0];
-		Assert.assertEquals(String.class,firstParam.getClass().getComponentType());
+		assertEquals(String.class,firstParam.getClass().getComponentType());
 		Object[] firstParamArray = (Object[])firstParam;
-		Assert.assertEquals(3,firstParamArray.length);
-		Assert.assertEquals("a",firstParamArray[0]);
-		Assert.assertEquals("b",firstParamArray[1]);
-		Assert.assertEquals("c",firstParamArray[2]);
+		assertEquals(3,firstParamArray.length);
+		assertEquals("a",firstParamArray[0]);
+		assertEquals("b",firstParamArray[1]);
+		assertEquals("c",firstParamArray[2]);
 	}
 
 	@Test
@@ -288,19 +293,19 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 		Tester t = new Tester();
 		t.setProperty("hello");
 		EvaluationContext ctx = new StandardEvaluationContext(t);
-		Assert.assertTrue(rpr.canRead(ctx, t, "property"));
-		Assert.assertEquals("hello",rpr.read(ctx, t, "property").getValue());
-		Assert.assertEquals("hello",rpr.read(ctx, t, "property").getValue()); // cached accessor used
+		assertTrue(rpr.canRead(ctx, t, "property"));
+		assertEquals("hello",rpr.read(ctx, t, "property").getValue());
+		assertEquals("hello",rpr.read(ctx, t, "property").getValue()); // cached accessor used
 
-		Assert.assertTrue(rpr.canRead(ctx, t, "field"));
-		Assert.assertEquals(3,rpr.read(ctx, t, "field").getValue());
-		Assert.assertEquals(3,rpr.read(ctx, t, "field").getValue()); // cached accessor used
+		assertTrue(rpr.canRead(ctx, t, "field"));
+		assertEquals(3,rpr.read(ctx, t, "field").getValue());
+		assertEquals(3,rpr.read(ctx, t, "field").getValue()); // cached accessor used
 
-		Assert.assertTrue(rpr.canWrite(ctx, t, "property"));
+		assertTrue(rpr.canWrite(ctx, t, "property"));
 		rpr.write(ctx, t, "property","goodbye");
 		rpr.write(ctx, t, "property","goodbye"); // cached accessor used
 
-		Assert.assertTrue(rpr.canWrite(ctx, t, "field"));
+		assertTrue(rpr.canWrite(ctx, t, "field"));
 		rpr.write(ctx, t, "field",12);
 		rpr.write(ctx, t, "field",12);
 
@@ -308,31 +313,31 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 		// of populating type descriptor cache
 		rpr.write(ctx,t,"field2",3);
 		rpr.write(ctx, t, "property2","doodoo");
-		Assert.assertEquals(3,rpr.read(ctx,t,"field2").getValue());
+		assertEquals(3,rpr.read(ctx,t,"field2").getValue());
 
 		// Attempted read as first activity on this field and property (no canRead before them)
-		Assert.assertEquals(0,rpr.read(ctx,t,"field3").getValue());
-		Assert.assertEquals("doodoo",rpr.read(ctx,t,"property3").getValue());
+		assertEquals(0,rpr.read(ctx,t,"field3").getValue());
+		assertEquals("doodoo",rpr.read(ctx,t,"property3").getValue());
 
 		// Access through is method
-//		Assert.assertEquals(0,rpr.read(ctx,t,"field3").getValue());
-		Assert.assertEquals(false,rpr.read(ctx,t,"property4").getValue());
-		Assert.assertTrue(rpr.canRead(ctx,t,"property4"));
+//		assertEquals(0,rpr.read(ctx,t,"field3").getValue());
+		assertEquals(false,rpr.read(ctx,t,"property4").getValue());
+		assertTrue(rpr.canRead(ctx,t,"property4"));
 
 		// repro SPR-9123, ReflectivePropertyAccessor JavaBean property names compliance tests
-		Assert.assertEquals("iD",rpr.read(ctx,t,"iD").getValue());
-		Assert.assertTrue(rpr.canRead(ctx,t,"iD"));
-		Assert.assertEquals("id",rpr.read(ctx,t,"id").getValue());
-		Assert.assertTrue(rpr.canRead(ctx,t,"id"));
-		Assert.assertEquals("ID",rpr.read(ctx,t,"ID").getValue());
-		Assert.assertTrue(rpr.canRead(ctx,t,"ID"));
+		assertEquals("iD",rpr.read(ctx,t,"iD").getValue());
+		assertTrue(rpr.canRead(ctx,t,"iD"));
+		assertEquals("id",rpr.read(ctx,t,"id").getValue());
+		assertTrue(rpr.canRead(ctx,t,"id"));
+		assertEquals("ID",rpr.read(ctx,t,"ID").getValue());
+		assertTrue(rpr.canRead(ctx,t,"ID"));
 		// note: "Id" is not a valid JavaBean name, nevertheless it is treated as "id"
-		Assert.assertEquals("id",rpr.read(ctx,t,"Id").getValue());
-		Assert.assertTrue(rpr.canRead(ctx,t,"Id"));
+		assertEquals("id",rpr.read(ctx,t,"Id").getValue());
+		assertTrue(rpr.canRead(ctx,t,"Id"));
 
 		// SPR-10122, ReflectivePropertyAccessor JavaBean property names compliance tests - setters
 		rpr.write(ctx, t, "pEBS","Test String");
-		Assert.assertEquals("Test String",rpr.read(ctx,t,"pEBS").getValue());
+		assertEquals("Test String",rpr.read(ctx,t,"pEBS").getValue());
 	}
 
 	@Test
@@ -341,68 +346,68 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 		Tester t = new Tester();
 		t.setProperty("hello");
 		EvaluationContext ctx = new StandardEvaluationContext(t);
-//		Assert.assertTrue(rpr.canRead(ctx, t, "property"));
-//		Assert.assertEquals("hello",rpr.read(ctx, t, "property").getValue());
-//		Assert.assertEquals("hello",rpr.read(ctx, t, "property").getValue()); // cached accessor used
+//		assertTrue(rpr.canRead(ctx, t, "property"));
+//		assertEquals("hello",rpr.read(ctx, t, "property").getValue());
+//		assertEquals("hello",rpr.read(ctx, t, "property").getValue()); // cached accessor used
 
 		PropertyAccessor optA = rpr.createOptimalAccessor(ctx, t, "property");
-		Assert.assertTrue(optA.canRead(ctx, t, "property"));
-		Assert.assertFalse(optA.canRead(ctx, t, "property2"));
+		assertTrue(optA.canRead(ctx, t, "property"));
+		assertFalse(optA.canRead(ctx, t, "property2"));
 		try {
 			optA.canWrite(ctx, t, "property");
-			Assert.fail();
+			fail();
 		} catch (UnsupportedOperationException uoe) {
 			// success
 		}
 		try {
 			optA.canWrite(ctx, t, "property2");
-			Assert.fail();
+			fail();
 		} catch (UnsupportedOperationException uoe) {
 			// success
 		}
-		Assert.assertEquals("hello",optA.read(ctx, t, "property").getValue());
-		Assert.assertEquals("hello",optA.read(ctx, t, "property").getValue()); // cached accessor used
+		assertEquals("hello",optA.read(ctx, t, "property").getValue());
+		assertEquals("hello",optA.read(ctx, t, "property").getValue()); // cached accessor used
 
 		try {
 			optA.getSpecificTargetClasses();
-			Assert.fail();
+			fail();
 		} catch (UnsupportedOperationException uoe) {
 			// success
 		}
 		try {
 			optA.write(ctx,t,"property",null);
-			Assert.fail();
+			fail();
 		} catch (UnsupportedOperationException uoe) {
 			// success
 		}
 
 		optA = rpr.createOptimalAccessor(ctx, t, "field");
-		Assert.assertTrue(optA.canRead(ctx, t, "field"));
-		Assert.assertFalse(optA.canRead(ctx, t, "field2"));
+		assertTrue(optA.canRead(ctx, t, "field"));
+		assertFalse(optA.canRead(ctx, t, "field2"));
 		try {
 			optA.canWrite(ctx, t, "field");
-			Assert.fail();
+			fail();
 		} catch (UnsupportedOperationException uoe) {
 			// success
 		}
 		try {
 			optA.canWrite(ctx, t, "field2");
-			Assert.fail();
+			fail();
 		} catch (UnsupportedOperationException uoe) {
 			// success
 		}
-		Assert.assertEquals(3,optA.read(ctx, t, "field").getValue());
-		Assert.assertEquals(3,optA.read(ctx, t, "field").getValue()); // cached accessor used
+		assertEquals(3,optA.read(ctx, t, "field").getValue());
+		assertEquals(3,optA.read(ctx, t, "field").getValue()); // cached accessor used
 
 		try {
 			optA.getSpecificTargetClasses();
-			Assert.fail();
+			fail();
 		} catch (UnsupportedOperationException uoe) {
 			// success
 		}
 		try {
 			optA.write(ctx,t,"field",null);
-			Assert.fail();
+			fail();
 		} catch (UnsupportedOperationException uoe) {
 			// success
 		}
@@ -465,25 +470,25 @@ public class ReflectionHelperTests extends ExpressionTestCase {
 	private void checkMatch(Class[] inputTypes, Class[] expectedTypes, StandardTypeConverter typeConverter,ArgsMatchKind expectedMatchKind,int... argsForConversion) {
 		ReflectionHelper.ArgumentsMatchInfo matchInfo = ReflectionHelper.compareArguments(getTypeDescriptors(expectedTypes), getTypeDescriptors(inputTypes), typeConverter);
 		if (expectedMatchKind==null) {
-			Assert.assertNull("Did not expect them to match in any way", matchInfo);
+			assertNull("Did not expect them to match in any way", matchInfo);
 		} else {
-			Assert.assertNotNull("Should not be a null match", matchInfo);
+			assertNotNull("Should not be a null match", matchInfo);
 		}
 
 		if (expectedMatchKind==ArgsMatchKind.EXACT) {
-			Assert.assertTrue(matchInfo.isExactMatch());
-			Assert.assertNull(matchInfo.argsRequiringConversion);
+			assertTrue(matchInfo.isExactMatch());
+			assertNull(matchInfo.argsRequiringConversion);
 		} else if (expectedMatchKind==ArgsMatchKind.CLOSE) {
-			Assert.assertTrue(matchInfo.isCloseMatch());
-			Assert.assertNull(matchInfo.argsRequiringConversion);
+			assertTrue(matchInfo.isCloseMatch());
+			assertNull(matchInfo.argsRequiringConversion);
 		} else if (expectedMatchKind==ArgsMatchKind.REQUIRES_CONVERSION) {
-			Assert.assertTrue("expected to be a match requiring conversion, but was "+matchInfo,matchInfo.isMatchRequiringConversion());
+			assertTrue("expected to be a match requiring conversion, but was "+matchInfo,matchInfo.isMatchRequiringConversion());
 			if (argsForConversion==null) {
-				Assert.fail("there are arguments that need conversion");
+				fail("there are arguments that need conversion");
 			}
-			Assert.assertEquals("The array of args that need conversion is different length to that expected",argsForConversion.length, matchInfo.argsRequiringConversion.length);
+			assertEquals("The array of args that need conversion is different length to that expected",argsForConversion.length, matchInfo.argsRequiringConversion.length);
 			for (int a=0;a getTypeDescriptors(Class... types) {
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/config/JdbcNamespaceIntegrationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/config/JdbcNamespaceIntegrationTests.java
index 3419ccd417b..0238a203bca 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/config/JdbcNamespaceIntegrationTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/config/JdbcNamespaceIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,16 +16,20 @@
 
 package org.springframework.jdbc.config;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
 import javax.sql.DataSource;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-
 import org.springframework.beans.PropertyValue;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.core.io.ClassPathResource;
@@ -34,9 +38,6 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseFactoryBean;
 import org.springframework.jdbc.datasource.init.DataSourceInitializer;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-
 /**
  * @author Dave Syer
  * @author Juergen Hoeller
@@ -123,7 +124,8 @@ public class JdbcNamespaceIntegrationTests {
 
 	@Test
 	public void testMultipleDataSourcesHaveDifferentDatabaseNames() throws Exception {
-		DefaultListableBeanFactory factory = new XmlBeanFactory(new ClassPathResource(
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(factory).loadBeanDefinitions(new ClassPathResource(
 				"org/springframework/jdbc/config/jdbc-config-multiple-datasources.xml"));
 		assertBeanPropertyValueOf("databaseName", "firstDataSource", factory);
 		assertBeanPropertyValueOf("databaseName", "secondDataSource", factory);
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
index 6b9c9840abd..e338ef8805a 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
@@ -18,7 +18,6 @@ package org.springframework.jdbc.core;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.isA;
 import static org.hamcrest.Matchers.sameInstance;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java
index 5b52d8ac46b..05f289076ba 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcTemplateTests.java
@@ -54,6 +54,7 @@ import org.springframework.jdbc.core.namedparam.SqlParameterSource;
  * @author Juergen Hoeller
  * @author Thomas Risberg
  */
+@Deprecated
 public class SimpleJdbcTemplateTests {
 
 	private static final String SQL = "sql";
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java
index 8540edc8a93..6f17fc2044e 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericSqlQueryTests.java
@@ -36,7 +36,9 @@ import javax.sql.DataSource;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.jdbc.Customer;
 import org.springframework.jdbc.datasource.TestDataSourceWrapper;
@@ -59,7 +61,8 @@ public class GenericSqlQueryTests  {
 
 	@Before
 	public void setUp() throws Exception {
-		this.beanFactory = new XmlBeanFactory(
+		this.beanFactory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader((BeanDefinitionRegistry) this.beanFactory).loadBeanDefinitions(
 				new ClassPathResource("org/springframework/jdbc/object/GenericSqlQueryTests-context.xml"));
 		DataSource dataSource = mock(DataSource.class);
 		this.connection = mock(Connection.class);
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java
index 3280a2edad4..4a5c7873825 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/object/GenericStoredProcedureTests.java
@@ -31,8 +31,8 @@ import javax.sql.DataSource;
 
 import org.apache.commons.logging.LogFactory;
 import org.junit.Test;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.TestDataSourceWrapper;
@@ -46,7 +46,8 @@ public class GenericStoredProcedureTests {
 
 	@Test
 	public void testAddInvoices() throws Exception {
-		BeanFactory bf = new XmlBeanFactory(
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
 				new ClassPathResource("org/springframework/jdbc/object/GenericStoredProcedureTests-context.xml"));
 		Connection connection = mock(Connection.class);
 		DataSource dataSource = mock(DataSource.class);
diff --git a/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java b/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java
index c87a423c4a3..2cec656f949 100644
--- a/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/hibernate3/LocalSessionFactoryBeanTests.java
@@ -28,9 +28,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+
 import javax.transaction.TransactionManager;
 
 import junit.framework.TestCase;
+
 import org.easymock.MockControl;
 import org.hibernate.HibernateException;
 import org.hibernate.Interceptor;
@@ -49,8 +51,8 @@ import org.hibernate.engine.FilterDefinition;
 import org.hibernate.event.MergeEvent;
 import org.hibernate.event.MergeEventListener;
 import org.hibernate.mapping.TypeDef;
-
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
@@ -612,7 +614,8 @@ public class LocalSessionFactoryBeanTests extends TestCase {
 	*/
 
 	public void testLocalSessionFactoryBeanWithTypeDefinitions() throws Exception {
-		XmlBeanFactory xbf = new XmlBeanFactory(new ClassPathResource("typeDefinitions.xml", getClass()));
+		DefaultListableBeanFactory xbf = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(xbf).loadBeanDefinitions(new ClassPathResource("typeDefinitions.xml", getClass()));
 		TypeTestLocalSessionFactoryBean sf = (TypeTestLocalSessionFactoryBean) xbf.getBean("&sessionFactory");
 		// Requires re-compilation when switching to Hibernate 3.5/3.6
 		// since Mappings changed from a class to an interface
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java
index 8a7f1f82f1f..1ffc5363044 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java
@@ -16,10 +16,20 @@
 
 package org.springframework.oxm.castor;
 
+import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.easymock.EasyMock.aryEq;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.isA;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+
 import java.io.StringWriter;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.xml.transform.sax.SAXResult;
 import javax.xml.transform.stream.StreamResult;
 
@@ -29,18 +39,14 @@ import org.custommonkey.xmlunit.XMLUnit;
 import org.custommonkey.xmlunit.XpathEngine;
 import org.junit.Assert;
 import org.junit.Test;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.oxm.AbstractMarshallerTests;
+import org.springframework.oxm.Marshaller;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.oxm.AbstractMarshallerTests;
-import org.springframework.oxm.Marshaller;
-
-import static org.custommonkey.xmlunit.XMLAssert.*;
-import static org.easymock.EasyMock.*;
-
 /**
  * Tests the {@link CastorMarshaller} class.
  *
diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java
index 9255438766b..3d7a4978671 100644
--- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java
+++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java
@@ -16,12 +16,26 @@
 
 package org.springframework.oxm.jaxb;
 
+import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.createStrictMock;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.isA;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.io.ByteArrayOutputStream;
 import java.io.StringWriter;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.Collections;
+
 import javax.activation.DataHandler;
 import javax.activation.FileDataSource;
 import javax.xml.bind.JAXBElement;
@@ -33,10 +47,6 @@ import javax.xml.transform.sax.SAXResult;
 import javax.xml.transform.stream.StreamResult;
 
 import org.junit.Test;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.oxm.AbstractMarshallerTests;
@@ -49,11 +59,9 @@ import org.springframework.oxm.jaxb.test.ObjectFactory;
 import org.springframework.oxm.mime.MimeContainer;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.util.ReflectionUtils;
-
-import static org.custommonkey.xmlunit.XMLAssert.assertFalse;
-import static org.custommonkey.xmlunit.XMLAssert.*;
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.assertTrue;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
 
 public class Jaxb2MarshallerTests extends AbstractMarshallerTests {
 
diff --git a/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TestComponentController.java b/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TestComponentController.java
index a0499247dbc..f554032e75e 100644
--- a/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TestComponentController.java
+++ b/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TestComponentController.java
@@ -25,6 +25,7 @@ import org.apache.struts.tiles.ComponentContext;
  * @author Juergen Hoeller
  * @since 22.08.2003
  */
+@Deprecated
 public class TestComponentController extends ComponentControllerSupport {
 
 	@Override
diff --git a/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TilesViewTests.java b/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TilesViewTests.java
index 34a09a170f7..71839c1837e 100644
--- a/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TilesViewTests.java
+++ b/spring-struts/src/test/java/org/springframework/web/servlet/view/tiles/TilesViewTests.java
@@ -42,6 +42,7 @@ import org.springframework.web.servlet.view.InternalResourceViewResolver;
  * @author Alef Arendsen
  * @author Juergen Hoeller
  */
+@Deprecated
 public class TilesViewTests {
 
 	protected StaticWebApplicationContext prepareWebApplicationContext() throws Exception {
diff --git a/spring-test/src/main/java/org/springframework/test/AssertThrows.java b/spring-test/src/main/java/org/springframework/test/AssertThrows.java
index 8e56f2e9e6e..2958fe02546 100644
--- a/spring-test/src/main/java/org/springframework/test/AssertThrows.java
+++ b/spring-test/src/main/java/org/springframework/test/AssertThrows.java
@@ -185,7 +185,7 @@ public abstract class AssertThrows {
 	 * Template method called when the test fails; i.e. the expected
 	 * {@link java.lang.Exception} is not thrown.
 	 * 
The default implementation simply fails the test via a call to
-	 * {@link junit.framework.Assert#fail(String)}.
+	 * {@link org.junit.Assert#fail(String)}.
 	 * 
If you want to customise the failure message, consider overriding
 	 * {@link #createMessageForNoExceptionThrown()}, and / or supplying an
 	 * extra, contextual failure message via the appropriate constructor overload.
diff --git a/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java b/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
index ea1ad34afd6..c7066b5cc7f 100644
--- a/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
+++ b/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
@@ -19,6 +19,7 @@ package org.springframework.beans.factory.parsing;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -33,9 +34,9 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 
 	private final List defaults = new LinkedList();
 
-	private final Map componentDefinitions = CollectionFactory.createLinkedMapIfPossible(8);
+	private final Map componentDefinitions = new LinkedHashMap<>(8);
 
-	private final Map aliasMap = CollectionFactory.createLinkedMapIfPossible(8);
+	private final Map aliasMap = new LinkedHashMap<>(8);
 
 	private final List imports = new LinkedList();
 
@@ -87,4 +88,4 @@ public class CollectingReaderEventListener implements ReaderEventListener {
 		return Collections.unmodifiableList(this.imports);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java
index 593c4dd4643..a34a228a456 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java
@@ -21,10 +21,10 @@ import java.lang.reflect.Proxy;
 import java.util.Map;
 
 import junit.framework.TestCase;
+
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 import org.easymock.MockControl;
-
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.support.StaticMethodMatcherPointcut;
 import org.springframework.aop.target.HotSwappableTargetSource;
@@ -32,7 +32,8 @@ import org.springframework.beans.DerivedTestBean;
 import org.springframework.beans.FatalBeanException;
 import org.springframework.beans.ITestBean;
 import org.springframework.beans.TestBean;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -48,11 +49,13 @@ import org.springframework.transaction.TransactionStatus;
  */
 public class BeanFactoryTransactionTests extends TestCase {
 
-	private XmlBeanFactory factory;
+	private DefaultListableBeanFactory factory;
 
 	@Override
 	public void setUp() {
-		this.factory = new XmlBeanFactory(new ClassPathResource("transactionalBeanFactory.xml", getClass()));
+		this.factory = new DefaultListableBeanFactory();
+		new XmlBeanDefinitionReader(this.factory).loadBeanDefinitions(
+				new ClassPathResource("transactionalBeanFactory.xml", getClass()));
 	}
 
 	public void testGetsAreNotTransactionalWithProxyFactory1() throws NoSuchMethodException {
@@ -167,7 +170,8 @@ public class BeanFactoryTransactionTests extends TestCase {
 	 */
 	public void testNoTransactionAttributeSource() {
 		try {
-			XmlBeanFactory bf = new XmlBeanFactory(new ClassPathResource("noTransactionAttributeSource.xml", getClass()));
+			DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+			new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource("noTransactionAttributeSource.xml", getClass()));
 			ITestBean testBean = (ITestBean) bf.getBean("noTransactionAttributeSource");
 			fail("Should require TransactionAttributeSource to be set");
 		}
diff --git a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
index ea8382ee019..67b7a4c024f 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
@@ -397,6 +397,7 @@ public class UrlPathHelper {
 		return source;
 	}
 
+	@SuppressWarnings("deprecation")
 	private String decodeInternal(HttpServletRequest request, String source) {
 		String enc = determineEncoding(request);
 		try {
diff --git a/spring-web/src/test/java/org/springframework/http/client/CommonsHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/CommonsHttpRequestFactoryTests.java
index 4fd3017ca23..c067159017e 100644
--- a/spring-web/src/test/java/org/springframework/http/client/CommonsHttpRequestFactoryTests.java
+++ b/spring-web/src/test/java/org/springframework/http/client/CommonsHttpRequestFactoryTests.java
@@ -21,6 +21,7 @@ import java.net.URI;
 import org.junit.Test;
 import org.springframework.http.HttpMethod;
 
+@Deprecated
 public class CommonsHttpRequestFactoryTests extends AbstractHttpRequestFactoryTestCase {
 
 	@Override
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java
index afafe13a36a..c34e202330d 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java
@@ -16,9 +16,14 @@
 
 package org.springframework.http.converter.xml;
 
+import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.nio.charset.Charset;
+
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
@@ -27,19 +32,17 @@ import javax.xml.transform.stream.StreamSource;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-
 import org.springframework.http.MediaType;
 import org.springframework.http.MockHttpInputMessage;
 import org.springframework.http.MockHttpOutputMessage;
 import org.springframework.util.FileCopyUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
 
-import static org.custommonkey.xmlunit.XMLAssert.*;
-
-/** @author Arjen Poutsma */
-@SuppressWarnings("unchecked")
+/**
+ * @author Arjen Poutsma
+ */
 public class SourceHttpMessageConverterTests {
 
 	private SourceHttpMessageConverter converter;
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockExpressionEvaluator.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockExpressionEvaluator.java
index b399bafe62a..95e5c5d436d 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockExpressionEvaluator.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockExpressionEvaluator.java
@@ -40,6 +40,7 @@ import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;
  * @since 1.1.5
  * @see org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager
  */
+@Deprecated
 public class MockExpressionEvaluator extends ExpressionEvaluator {
 
 	private final PageContext pageContext;
diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockPageContext.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockPageContext.java
index 2c17aca78e0..d4d5f2011eb 100644
--- a/spring-web/src/test/java/org/springframework/mock/web/test/MockPageContext.java
+++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockPageContext.java
@@ -22,6 +22,7 @@ import java.util.Collections;
 import java.util.Enumeration;
 import java.util.LinkedHashMap;
 import java.util.Map;
+
 import javax.el.ELContext;
 import javax.servlet.Servlet;
 import javax.servlet.ServletConfig;
@@ -262,7 +263,6 @@ public class MockPageContext extends PageContext {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
 	public Enumeration getAttributeNamesInScope(int scope) {
 		switch (scope) {
 			case PAGE_SCOPE:
@@ -288,6 +288,7 @@ public class MockPageContext extends PageContext {
 	}
 
 	@Override
+	@Deprecated
 	public ExpressionEvaluator getExpressionEvaluator() {
 		return new MockExpressionEvaluator(this);
 	}
@@ -298,6 +299,7 @@ public class MockPageContext extends PageContext {
 	}
 
 	@Override
+	@Deprecated
 	public VariableResolver getVariableResolver() {
 		return null;
 	}
diff --git a/spring-web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java b/spring-web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java
index ac50ac8d2e6..975d9537a30 100644
--- a/spring-web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java
+++ b/spring-web/src/test/java/org/springframework/remoting/jaxrpc/JaxRpcSupportTests.java
@@ -45,6 +45,7 @@ import org.springframework.util.ObjectUtils;
  * @author Juergen Hoeller
  * @since 18.12.2003
  */
+@Deprecated
 public class JaxRpcSupportTests extends TestCase {
 
 	public void testLocalJaxRpcServiceFactoryBeanWithServiceNameAndNamespace() throws Exception {
diff --git a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java
index ad49f664d11..a2c27162a25 100644
--- a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java
@@ -30,6 +30,7 @@ import org.springframework.web.context.support.StaticWebApplicationContext;
  * @author Juergen Hoeller
  * @since 02.08.2004
  */
+@Deprecated
 public class DelegatingVariableResolverTests extends TestCase {
 
 	public void testDelegatingVariableResolver() {
diff --git a/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java b/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java
index b3aa9beb689..29df40fbf33 100644
--- a/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/multipart/commons/CommonsMultipartResolverTests.java
@@ -16,6 +16,10 @@
 
 package org.springframework.web.multipart.commons;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -30,6 +34,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
@@ -41,9 +46,7 @@ import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.FileUpload;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import static org.junit.Assert.*;
 import org.junit.Test;
-
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.mock.web.test.MockFilterConfig;
 import org.springframework.mock.web.test.MockHttpServletRequest;
@@ -220,7 +223,7 @@ public class CommonsMultipartResolverTests {
 			MultipartHttpServletRequest request) throws UnsupportedEncodingException {
 
 		MultipartTestBean1 mtb1 = new MultipartTestBean1();
-		assertEquals(null, mtb1.getField1());
+		assertArrayEquals(null, mtb1.getField1());
 		assertEquals(null, mtb1.getField2());
 		ServletRequestDataBinder binder = new ServletRequestDataBinder(mtb1, "mybean");
 		binder.registerCustomEditor(byte[].class, new ByteArrayMultipartFileEditor());
@@ -234,7 +237,7 @@ public class CommonsMultipartResolverTests {
 		assertEquals(new String(file2.getBytes()), new String(mtb1.getField2()));
 
 		MultipartTestBean2 mtb2 = new MultipartTestBean2();
-		assertEquals(null, mtb2.getField1());
+		assertArrayEquals(null, mtb2.getField1());
 		assertEquals(null, mtb2.getField2());
 		binder = new ServletRequestDataBinder(mtb2, "mybean");
 		binder.registerCustomEditor(String.class, "field1", new StringMultipartFileEditor());
diff --git a/spring-web/src/test/java/org/springframework/web/util/ExpressionEvaluationUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/ExpressionEvaluationUtilsTests.java
index 80bf92165b3..8da5c1adb3a 100644
--- a/spring-web/src/test/java/org/springframework/web/util/ExpressionEvaluationUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/ExpressionEvaluationUtilsTests.java
@@ -38,6 +38,7 @@ import static org.junit.Assert.*;
  * @author Juergen Hoeller
  * @since 16.09.2003
  */
+@Deprecated
 public class ExpressionEvaluationUtilsTests {
 
 	@Test
diff --git a/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java b/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
index 29585bb05d5..f3ffc519c17 100644
--- a/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java
@@ -106,6 +106,7 @@ public class UriUtilsTests {
 	}
 
 	@Test
+	@Deprecated
 	public void encodeUri() throws UnsupportedEncodingException {
 		assertEquals("Invalid encoded URI", "http://www.ietf.org/rfc/rfc3986.txt",
 				UriUtils.encodeUri("http://www.ietf.org/rfc/rfc3986.txt", ENC));
@@ -134,6 +135,7 @@ public class UriUtilsTests {
 	}
 
 	@Test
+	@Deprecated
 	public void encodeHttpUrl() throws UnsupportedEncodingException {
 		assertEquals("Invalid encoded HTTP URL", "http://www.ietf.org/rfc/rfc3986.txt",
 				UriUtils.encodeHttpUrl("http://www.ietf.org/rfc/rfc3986.txt", ENC));
@@ -156,6 +158,7 @@ public class UriUtilsTests {
 	}
 
 	@Test(expected = IllegalArgumentException.class)
+	@Deprecated
 	public void encodeHttpUrlMail() throws UnsupportedEncodingException {
 		UriUtils.encodeHttpUrl("mailto:java-net@java.sun.com", ENC);
 	}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
index b588561321f..d6911ee72f5 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
@@ -20,7 +20,6 @@ import java.beans.PropertyEditorSupport;
 import java.util.StringTokenizer;
 
 import junit.framework.TestCase;
-import junit.framework.Assert;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.PropertyBatchUpdateException;
@@ -79,7 +78,7 @@ public abstract class AbstractBeanFactoryTests extends TestCase {
 	 */
 	public void testLifecycleCallbacks() {
 		LifecycleBean lb = (LifecycleBean) getBeanFactory().getBean("lifecycle");
-		Assert.assertEquals("lifecycle", lb.getBeanName());
+		assertEquals("lifecycle", lb.getBeanName());
 		// The dummy business method will throw an exception if the
 		// necessary callbacks weren't invoked in the right order.
 		lb.businessMethod();
@@ -327,4 +326,4 @@ public abstract class AbstractBeanFactoryTests extends TestCase {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java
index d683491a1f6..855f23af396 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 package org.springframework.beans.factory;
 
-import junit.framework.Assert;
-
 import org.springframework.beans.TestBean;
 
 /**
@@ -44,24 +42,24 @@ public abstract class AbstractListableBeanFactoryTests extends AbstractBeanFacto
 
 	protected final void assertCount(int count) {
 		String[] defnames = getListableBeanFactory().getBeanDefinitionNames();
-		Assert.assertTrue("We should have " + count + " beans, not " + defnames.length, defnames.length == count);
+		assertTrue("We should have " + count + " beans, not " + defnames.length, defnames.length == count);
 	}
 
 	public void assertTestBeanCount(int count) {
 		String[] defNames = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, false);
-		Assert.assertTrue("We should have " + count + " beans for class org.springframework.beans.TestBean, not " +
+		assertTrue("We should have " + count + " beans for class org.springframework.beans.TestBean, not " +
 				defNames.length, defNames.length == count);
 
 		int countIncludingFactoryBeans = count + 2;
 		String[] names = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, true);
-		Assert.assertTrue("We should have " + countIncludingFactoryBeans +
+		assertTrue("We should have " + countIncludingFactoryBeans +
 				" beans for class org.springframework.beans.TestBean, not " + names.length,
 				names.length == countIncludingFactoryBeans);
 	}
 
 	public void testGetDefinitionsForNoSuchClass() {
 		String[] defnames = getListableBeanFactory().getBeanNamesForType(String.class);
-		Assert.assertTrue("No string definitions", defnames.length == 0);
+		assertTrue("No string definitions", defnames.length == 0);
 	}
 
 	/**
@@ -69,18 +67,18 @@ public abstract class AbstractListableBeanFactoryTests extends AbstractBeanFacto
 	 * what type factories may return, and it may even change over time.)
 	 */
 	public void testGetCountForFactoryClass() {
-		Assert.assertTrue("Should have 2 factories, not " +
+		assertTrue("Should have 2 factories, not " +
 				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length,
 				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length == 2);
 
-		Assert.assertTrue("Should have 2 factories, not " +
+		assertTrue("Should have 2 factories, not " +
 				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length,
 				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length == 2);
 	}
 
 	public void testContainsBeanDefinition() {
-		Assert.assertTrue(getListableBeanFactory().containsBeanDefinition("rod"));
-		Assert.assertTrue(getListableBeanFactory().containsBeanDefinition("roderick"));
+		assertTrue(getListableBeanFactory().containsBeanDefinition("rod"));
+		assertTrue(getListableBeanFactory().containsBeanDefinition("roderick"));
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java
index f4a1eeae4ae..3f46ddd3a83 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java
@@ -20,6 +20,7 @@ import java.beans.PropertyEditorSupport;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
 import junit.framework.TestCase;
@@ -28,7 +29,6 @@ import org.springframework.beans.ITestBean;
 import org.springframework.beans.TestBean;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.beans.propertyeditors.StringArrayPropertyEditor;
-import org.springframework.core.CollectionFactory;
 import org.springframework.mock.web.portlet.MockPortletRequest;
 import org.springframework.validation.BindingResult;
 
@@ -166,7 +166,7 @@ public class PortletRequestDataBinderTests extends TestCase {
 
 	public void testBindingSet() {
 		TestBean bean = new TestBean();
-		Set set = CollectionFactory.createLinkedSetIfPossible(2);
+		Set set = new LinkedHashSet<>(2);
 		set.add(new TestBean("test1"));
 		set.add(new TestBean("test2"));
 		bean.setSomeSet(set);
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java
index 96080dd6c94..bad17962411 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java
@@ -52,6 +52,7 @@ import org.springframework.web.portlet.handler.PortletSessionRequiredException;
 /**
  * @author Mark Fisher
  */
+@Deprecated
 public class CommandControllerTests extends TestCase {
 
 	private static final String ERRORS_KEY = "errors";
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java
index 161475869f5..e51cb8d151a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java
@@ -19,7 +19,6 @@ package org.springframework.web.context;
 import java.beans.PropertyEditorSupport;
 import java.util.StringTokenizer;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
 import org.springframework.beans.BeansException;
@@ -87,7 +86,7 @@ public abstract class AbstractBeanFactoryTests extends TestCase {
 	 */
 	public void testLifecycleCallbacks() {
 		LifecycleBean lb = (LifecycleBean) getBeanFactory().getBean("lifecycle");
-		Assert.assertEquals("lifecycle", lb.getBeanName());
+		assertEquals("lifecycle", lb.getBeanName());
 		// The dummy business method will throw an exception if the
 		// necessary callbacks weren't invoked in the right order.
 		lb.businessMethod();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractListableBeanFactoryTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractListableBeanFactoryTests.java
index 6a2d204d68f..2b089f87482 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractListableBeanFactoryTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractListableBeanFactoryTests.java
@@ -1,7 +1,5 @@
 package org.springframework.web.context;
 
-import junit.framework.Assert;
-
 import org.springframework.beans.TestBean;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.FactoryBean;
@@ -31,24 +29,24 @@ public abstract class AbstractListableBeanFactoryTests extends AbstractBeanFacto
 
 	protected final void assertCount(int count) {
 		String[] defnames = getListableBeanFactory().getBeanDefinitionNames();
-		Assert.assertTrue("We should have " + count + " beans, not " + defnames.length, defnames.length == count);
+		assertTrue("We should have " + count + " beans, not " + defnames.length, defnames.length == count);
 	}
 
 	public void assertTestBeanCount(int count) {
 		String[] defNames = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, false);
-		Assert.assertTrue("We should have " + count + " beans for class org.springframework.beans.TestBean, not " +
+		assertTrue("We should have " + count + " beans for class org.springframework.beans.TestBean, not " +
 				defNames.length, defNames.length == count);
 
 		int countIncludingFactoryBeans = count + 2;
 		String[] names = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, true);
-		Assert.assertTrue("We should have " + countIncludingFactoryBeans +
+		assertTrue("We should have " + countIncludingFactoryBeans +
 				" beans for class org.springframework.beans.TestBean, not " + names.length,
 				names.length == countIncludingFactoryBeans);
 	}
 
 	public void testGetDefinitionsForNoSuchClass() {
 		String[] defnames = getListableBeanFactory().getBeanNamesForType(String.class);
-		Assert.assertTrue("No string definitions", defnames.length == 0);
+		assertTrue("No string definitions", defnames.length == 0);
 	}
 
 	/**
@@ -56,18 +54,18 @@ public abstract class AbstractListableBeanFactoryTests extends AbstractBeanFacto
 	 * what type factories may return, and it may even change over time.)
 	 */
 	public void testGetCountForFactoryClass() {
-		Assert.assertTrue("Should have 2 factories, not " +
+		assertTrue("Should have 2 factories, not " +
 				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length,
 				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length == 2);
 
-		Assert.assertTrue("Should have 2 factories, not " +
+		assertTrue("Should have 2 factories, not " +
 				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length,
 				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length == 2);
 	}
 
 	public void testContainsBeanDefinition() {
-		Assert.assertTrue(getListableBeanFactory().containsBeanDefinition("rod"));
-		Assert.assertTrue(getListableBeanFactory().containsBeanDefinition("roderick"));
+		assertTrue(getListableBeanFactory().containsBeanDefinition("rod"));
+		assertTrue(getListableBeanFactory().containsBeanDefinition("roderick"));
 	}
 
 }
\ No newline at end of file
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java
index 2bf2ee7edbc..9e0784f2519 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java
@@ -16,7 +16,10 @@
 
 package org.springframework.web.context.support;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -38,6 +41,7 @@ import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.support.ManagedMap;
 import org.springframework.beans.factory.support.ManagedSet;
 import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.io.Resource;
 import org.springframework.mock.web.test.MockServletContext;
 
@@ -51,6 +55,7 @@ import org.springframework.mock.web.test.MockServletContext;
 public class ServletContextSupportTests {
 
 	@Test
+	@Deprecated
 	public void testServletContextFactoryBean() {
 		MockServletContext sc = new MockServletContext();
 
@@ -155,6 +160,7 @@ public class ServletContextSupportTests {
 	}
 
 	@Test
+	@Deprecated
 	public void testServletContextPropertyPlaceholderConfigurer() {
 		MockServletContext sc = new MockServletContext();
 		sc.addInitParameter("key4", "mykey4");
@@ -168,7 +174,7 @@ public class ServletContextSupportTests {
 		pvs.add("spouse", new RuntimeBeanReference("${ref}"));
 		wac.registerSingleton("tb1", TestBean.class, pvs);
 
-		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class, null);
+		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
 		wac.getDefaultListableBeanFactory().registerBeanDefinition("tb2", bd);
 
 		pvs = new MutablePropertyValues();
@@ -185,6 +191,7 @@ public class ServletContextSupportTests {
 	}
 
 	@Test
+	@Deprecated
 	public void testServletContextPropertyPlaceholderConfigurerWithLocalOverriding() {
 		MockServletContext sc = new MockServletContext();
 		sc.addInitParameter("key4", "mykey4");
@@ -198,7 +205,7 @@ public class ServletContextSupportTests {
 		pvs.add("spouse", new RuntimeBeanReference("${ref}"));
 		wac.registerSingleton("tb1", TestBean.class, pvs);
 
-		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class, null);
+		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
 		wac.getDefaultListableBeanFactory().registerBeanDefinition("tb2", bd);
 
 		pvs = new MutablePropertyValues();
@@ -215,6 +222,7 @@ public class ServletContextSupportTests {
 	}
 
 	@Test
+	@Deprecated
 	public void testServletContextPropertyPlaceholderConfigurerWithContextOverride() {
 		MockServletContext sc = new MockServletContext();
 		sc.addInitParameter("key4", "mykey4");
@@ -228,7 +236,7 @@ public class ServletContextSupportTests {
 		pvs.add("spouse", new RuntimeBeanReference("${ref}"));
 		wac.registerSingleton("tb1", TestBean.class, pvs);
 
-		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class, null);
+		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
 		wac.getDefaultListableBeanFactory().registerBeanDefinition("tb2", bd);
 
 		pvs = new MutablePropertyValues();
@@ -246,6 +254,7 @@ public class ServletContextSupportTests {
 	}
 
 	@Test
+	@Deprecated
 	public void testServletContextPropertyPlaceholderConfigurerWithContextOverrideAndAttributes() {
 		MockServletContext sc = new MockServletContext();
 		sc.addInitParameter("key4", "mykey4");
@@ -260,7 +269,7 @@ public class ServletContextSupportTests {
 		pvs.add("spouse", new RuntimeBeanReference("${ref}"));
 		wac.registerSingleton("tb1", TestBean.class, pvs);
 
-		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class, null);
+		RootBeanDefinition bd = new RootBeanDefinition(TestBean.class);
 		wac.getDefaultListableBeanFactory().registerBeanDefinition("tb2", bd);
 
 		pvs = new MutablePropertyValues();
@@ -279,6 +288,7 @@ public class ServletContextSupportTests {
 	}
 
 	@Test
+	@Deprecated
 	public void testServletContextPropertyPlaceholderConfigurerWithAttributes() {
 		MockServletContext sc = new MockServletContext();
 		sc.addInitParameter("key4", "mykey4");
@@ -312,7 +322,9 @@ public class ServletContextSupportTests {
 		someMap.put("key2", "${age}name");
 		MutablePropertyValues innerPvs = new MutablePropertyValues();
 		innerPvs.add("touchy", "${os.name}");
-		someMap.put("key3", new RootBeanDefinition(TestBean.class, innerPvs));
+		RootBeanDefinition innerBd = new RootBeanDefinition(TestBean.class);
+		innerBd.setPropertyValues(innerPvs);
+		someMap.put("key3", innerBd);
 		MutablePropertyValues innerPvs2 = new MutablePropertyValues(innerPvs);
 		someMap.put("${key4}", new BeanDefinitionHolder(new ChildBeanDefinition("tb1", innerPvs2), "child"));
 		pvs.add("someMap", someMap);
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
index 635b8e0ba8c..287ea086eb4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
@@ -32,7 +32,6 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
 import org.springframework.beans.MutablePropertyValues;
@@ -144,7 +143,7 @@ public class DispatcherServletTests extends TestCase {
 		ComplexWebApplicationContext.TestApplicationListener listener =
 				(ComplexWebApplicationContext.TestApplicationListener) complexDispatcherServlet
 						.getWebApplicationContext().getBean("testListener");
-		Assert.assertEquals(1, listener.counter);
+		assertEquals(1, listener.counter);
 	}
 
 	public void testPublishEventsOff() throws Exception {
@@ -155,7 +154,7 @@ public class DispatcherServletTests extends TestCase {
 		ComplexWebApplicationContext.TestApplicationListener listener =
 				(ComplexWebApplicationContext.TestApplicationListener) complexDispatcherServlet
 						.getWebApplicationContext().getBean("testListener");
-		Assert.assertEquals(0, listener.counter);
+		assertEquals(0, listener.counter);
 	}
 
 	public void testFormRequest() throws Exception {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java
index 26b84eff653..d62174ab265 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java
@@ -46,6 +46,7 @@ import org.springframework.web.servlet.ModelAndView;
  * @author Rod Johnson
  * @author Juergen Hoeller
  */
+@Deprecated
 public class FormControllerTests extends TestCase {
 
 	public void testReferenceDataOnForm() throws Exception {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java
index 5249a82cdda..705ac4ea815 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java
@@ -40,6 +40,7 @@ import org.springframework.web.servlet.ModelAndView;
  * @author Juergen Hoeller
  * @since 29.04.2003
  */
+@Deprecated
 public class WizardFormControllerTests extends TestCase {
 
 	public void testNoDirtyPageChange() throws Exception {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolverTests.java
index 2384b320c01..62ac0171a6d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerExceptionResolverTests.java
@@ -43,6 +43,7 @@ import org.springframework.web.servlet.ModelAndView;
  * @author Arjen Poutsma
  * @author Juergen Hoeller
  */
+@Deprecated
 public class AnnotationMethodHandlerExceptionResolverTests {
 
 	private AnnotationMethodHandlerExceptionResolver exceptionResolver;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/RequestSpecificMappingInfoComparatorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/RequestSpecificMappingInfoComparatorTests.java
index e85d4aafa5e..1b941da624b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/RequestSpecificMappingInfoComparatorTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/RequestSpecificMappingInfoComparatorTests.java
@@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 /**
  * @author Arjen Poutsma
  */
+@Deprecated
 public class RequestSpecificMappingInfoComparatorTests {
 
 	private AnnotationMethodHandlerAdapter.RequestSpecificMappingInfoComparator comparator;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
index 07d68187be2..05e0f3c2a51 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
@@ -30,9 +30,11 @@ import java.security.Principal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
@@ -1517,7 +1519,7 @@ public class ServletAnnotationControllerTests {
 		request.setCookies(new Cookie("date", "2008-11-18"));
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		servlet.service(request, response);
-		assertEquals("test-108", response.getContentAsString());
+		assertEquals("test-2008", response.getContentAsString());
 	}
 
 	@Test
@@ -3052,8 +3054,10 @@ public class ServletAnnotationControllerTests {
 
 		@RequestMapping(method = RequestMethod.GET)
 		public void handle(@CookieValue("date") Date date, Writer writer) throws IOException {
-			assertEquals("Invalid path variable value", new Date(108, 10, 18), date);
-			writer.write("test-" + date.getYear());
+			assertEquals("Invalid path variable value", new GregorianCalendar(2008, 10, 18).getTime(), date);
+			Calendar c = new GregorianCalendar();
+			c.setTime(date);
+			writer.write("test-" + c.get(Calendar.YEAR));
 		}
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtilsTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtilsTests.java
index 9bff0224218..c0c7fce7588 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtilsTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationMappingUtilsTests.java
@@ -22,7 +22,10 @@ import org.junit.Test;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-/** @author Arjen Poutsma */
+/**
+ * @author Arjen Poutsma
+ */
+@Deprecated
 public class ServletAnnotationMappingUtilsTests {
 
 	@Test
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java
index bd2ac2fccf8..b48a1465011 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7766Tests.java
@@ -29,6 +29,7 @@ import org.springframework.web.bind.support.ConfigurableWebBindingInitializer;
 public class Spr7766Tests {
 
 	@Test
+	@Deprecated
 	public void test() throws Exception {
 		AnnotationMethodHandlerAdapter adapter = new AnnotationMethodHandlerAdapter();
 		ConfigurableWebBindingInitializer binder = new ConfigurableWebBindingInitializer();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java
index 555dbd89b66..c963438df2c 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/Spr7839Tests.java
@@ -33,6 +33,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.support.ConfigurableWebBindingInitializer;
 
+@Deprecated
 public class Spr7839Tests {
 
 	AnnotationMethodHandlerAdapter adapter = new AnnotationMethodHandlerAdapter();
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/UriTemplateServletAnnotationControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/UriTemplateServletAnnotationControllerTests.java
index d13a82607b2..dcd2e6ec3db 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/UriTemplateServletAnnotationControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/UriTemplateServletAnnotationControllerTests.java
@@ -20,6 +20,8 @@ import java.io.IOException;
 import java.io.Writer;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.GregorianCalendar;
+
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
 
@@ -486,7 +488,7 @@ public class UriTemplateServletAnnotationControllerTests {
 		public void handle(@PathVariable("hotel") String hotel, @PathVariable Date date, Writer writer)
 				throws IOException {
 			assertEquals("Invalid path variable value", "42", hotel);
-			assertEquals("Invalid path variable value", new Date(108, 10, 18), date);
+			assertEquals("Invalid path variable value", new GregorianCalendar(2008, 10, 18).getTime(), date);
 			writer.write("test-" + hotel);
 		}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/BuyForm.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/BuyForm.java
index 3f42bdd83af..00f6ea145cb 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/BuyForm.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/mapping/BuyForm.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import org.springframework.web.servlet.mvc.SimpleFormController;
 /**
  * @author Rob Harrop
  */
+@Deprecated
 public class BuyForm extends SimpleFormController {
 
 }
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java
index b97f1c034aa..228ead8c9ba 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.mvc.method.annotation;
 
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertNotNull;
 
 import javax.servlet.ServletException;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java
index 43f3d5d5cc1..ff477a97f4b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java
@@ -27,11 +27,11 @@ import org.apache.velocity.Template;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.exception.MethodInvocationException;
 import org.hamcrest.Description;
+import org.hamcrest.TypeSafeMatcher;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.internal.matchers.TypeSafeMatcher;
 import org.junit.rules.ExpectedException;
 import org.springframework.beans.TestBean;
 import org.springframework.mock.web.test.MockHttpServletRequest;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java
index 43cbba5a779..c760d74441d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/xslt/TestXsltViewTests.java
@@ -52,6 +52,7 @@ import org.springframework.web.servlet.ModelAndView;
  * @author Juergen Hoeller
  * @since 11.03.2005
  */
+@Deprecated
 public class TestXsltViewTests extends TestCase {
 
 	private TestXsltView view;

From 57d68b070e2bd060befefe0ecc1a6aad9c581acd Mon Sep 17 00:00:00 2001
From: Phillip Webb 
Date: Mon, 31 Dec 2012 17:15:34 -0800
Subject: [PATCH 16/34] Expose Gradle buildSrc for IDE support

Create 'spring-build-src' Gradle module that exposes the buildSrc
folder as an IDE project.
---
 build.gradle    | 12 ++++++++++++
 settings.gradle |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/build.gradle b/build.gradle
index 82f21df72db..f5dc92e95a6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -171,6 +171,18 @@ configure(allprojects - project(":spring-build-junit")) {
 	test.systemProperties.put("testGroups", properties.get("testGroups"))
 }
 
+project("spring-build-src") {
+	description = "Exposes gradle buildSrc for IDE support"
+	apply plugin: "groovy"
+
+	dependencies {
+		compile gradleApi()
+		groovy localGroovy()
+	}
+
+	configurations.archives.artifacts.clear()
+}
+
 project("spring-build-junit") {
 	description = "Build-time JUnit dependencies and utilities"
 
diff --git a/settings.gradle b/settings.gradle
index 8d4e147bccb..7d37e04fbb6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,3 +23,7 @@ include "spring-webmvc"
 include "spring-webmvc-portlet"
 include "spring-webmvc-tiles3"
 include "spring-build-junit"
+
+// Exposes gradle buildSrc for IDE support
+include "buildSrc"
+rootProject.children.find{ it.name == "buildSrc" }.name = "spring-build-src"

From 290aa5d64730e485fc9930e9a2509d14b05fad67 Mon Sep 17 00:00:00 2001
From: Phillip Webb 
Date: Tue, 1 Jan 2013 17:30:28 -0800
Subject: [PATCH 17/34] Develop a gradle plugin to add test dependencies

Develop a gradle plugin to automatically update testCompile dependencies
to include the test source sets of project dependencies.

Allows the gradle build to more closely mirror the way that tests run
inside eclipse.
---
 build.gradle                                  |  1 +
 .../TestSourceSetDependenciesPlugin.groovy    | 51 +++++++++++++++++++
 .../test-source-set-dependencies.properties   |  1 +
 3 files changed, 53 insertions(+)
 create mode 100644 buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy
 create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/test-source-set-dependencies.properties

diff --git a/build.gradle b/build.gradle
index f5dc92e95a6..19d2a211603 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,6 +28,7 @@ configure(allprojects) {
 	apply plugin: "java"
 	apply plugin: "propdeps-eclipse"
 	apply plugin: "propdeps-idea"
+	apply plugin: "test-source-set-dependencies"
 	apply from: "${gradleScriptDir}/ide.gradle"
 
 	group = "org.springframework"
diff --git a/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy b/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy
new file mode 100644
index 00000000000..1e5cffcc7b2
--- /dev/null
+++ b/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2002-2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.build.gradle
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.ProjectDependency;
+
+
+/**
+ * Gradle plugin that automatically updates testCompile dependencies to include
+ * the test source sets of project dependencies.
+ *
+ * @author Phillip Webb
+ */
+class TestSourceSetDependenciesPlugin implements Plugin {
+
+	@Override
+	public void apply(Project project) {
+		project.afterEvaluate {
+			Set projectDependencies = new LinkedHashSet<>()
+			for(def configurationName in ["compile", "optional", "provided"]) {
+				Configuration configuration = project.getConfigurations().findByName(configurationName)
+				if(configuration) {
+					projectDependencies.addAll(
+						configuration.dependencies.findAll { it instanceof ProjectDependency }
+					)
+				}
+			}
+			projectDependencies.each {
+				project.dependencies.add("testCompile", it.dependencyProject.sourceSets.test.output)
+			}
+		}
+	}
+
+}
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/test-source-set-dependencies.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/test-source-set-dependencies.properties
new file mode 100644
index 00000000000..f5df417ad20
--- /dev/null
+++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/test-source-set-dependencies.properties
@@ -0,0 +1 @@
+implementation-class=org.springframework.build.gradle.TestSourceSetDependenciesPlugin

From db2b00a2a5c05d398b3d08071163e8fbeea25baf Mon Sep 17 00:00:00 2001
From: Phillip Webb 
Date: Tue, 1 Jan 2013 17:38:06 -0800
Subject: [PATCH 18/34] Relocate MergePlugin package

Relocate the MergePlugin from org.springframework.build.gradle.merge
to org.springframework.build.gradle.
---
 .../springframework/build/gradle/{merge => }/MergePlugin.groovy | 2 +-
 .../src/main/resources/META-INF/gradle-plugins/merge.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename buildSrc/src/main/groovy/org/springframework/build/gradle/{merge => }/MergePlugin.groovy (99%)

diff --git a/buildSrc/src/main/groovy/org/springframework/build/gradle/merge/MergePlugin.groovy b/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
similarity index 99%
rename from buildSrc/src/main/groovy/org/springframework/build/gradle/merge/MergePlugin.groovy
rename to buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
index ffe4f873420..097e65ab93c 100644
--- a/buildSrc/src/main/groovy/org/springframework/build/gradle/merge/MergePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.build.gradle.merge
+package org.springframework.build.gradle
 
 import org.gradle.api.*
 import org.gradle.api.artifacts.Configuration
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/merge.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/merge.properties
index 5bfccb3d9b4..9cef804165a 100644
--- a/buildSrc/src/main/resources/META-INF/gradle-plugins/merge.properties
+++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/merge.properties
@@ -1 +1 @@
-implementation-class=org.springframework.build.gradle.merge.MergePlugin
+implementation-class=org.springframework.build.gradle.MergePlugin

From 65fb26f847a2249792fa8024c04980fc7a49cd5c Mon Sep 17 00:00:00 2001
From: Phillip Webb 
Date: Tue, 1 Jan 2013 19:41:55 -0800
Subject: [PATCH 19/34] Move spring-build-junit into spring-core

Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201.
---
 build.gradle                                  | 31 +++----------------
 settings.gradle                               |  1 -
 .../dynamic/RefreshableTargetSourceTests.java |  4 +--
 .../beans/BeanWrapperTests.java               |  4 +--
 .../DefaultListableBeanFactoryTests.java      |  4 +--
 .../scheduling/quartz/QuartzSupportTests.java |  4 +--
 .../AspectJAutoProxyCreatorTests.java         |  4 +--
 .../AnnotationProcessorPerformanceTests.java  |  4 +--
 .../ApplicationContextExpressionTests.java    |  4 +--
 .../annotation/EnableSchedulingTests.java     |  4 +--
 .../GenericConversionServiceTests.java        |  4 +--
 .../org/springframework/tests}/Assume.java    |  9 +++---
 .../springframework/tests}/JavaVersion.java   |  4 +--
 .../tests/JavaVersionTests.java               |  6 ++--
 .../org/springframework/tests}/Matchers.java  |  2 +-
 .../test/mockito => tests}/MockitoUtils.java  |  4 +--
 .../org/springframework/tests}/TestGroup.java |  4 +--
 .../springframework/tests/TestGroupTests.java |  6 ++--
 .../springframework/tests/package-info.java   | 22 +++++++++++++
 .../xml/AbstractStaxXMLReaderTestCase.java    |  4 +--
 .../expression/spel/PerformanceTests.java     |  4 +--
 .../jdbc/core/JdbcTemplateTests.java          |  2 +-
 .../jdbc/core/simple/SimpleJdbcCallTests.java |  2 +-
 .../web/bind/ServletRequestUtilsTests.java    |  4 +--
 .../bind/PortletRequestUtilsTests.java        |  4 +--
 ...ansactionalAnnotationIntegrationTests.java |  4 +--
 26 files changed, 75 insertions(+), 74 deletions(-)
 rename {spring-build-junit/src/main/java/org/springframework/build/junit => spring-core/src/test/java/org/springframework/tests}/Assume.java (91%)
 rename {spring-build-junit/src/main/java/org/springframework/build/junit => spring-core/src/test/java/org/springframework/tests}/JavaVersion.java (95%)
 rename spring-build-junit/src/test/java/org/springframework/build/junit/JavaVersionTest.java => spring-core/src/test/java/org/springframework/tests/JavaVersionTests.java (90%)
 rename {spring-jdbc/src/test/java/org/springframework/build/test/hamcrest => spring-core/src/test/java/org/springframework/tests}/Matchers.java (97%)
 rename spring-core/src/test/java/org/springframework/{build/test/mockito => tests}/MockitoUtils.java (97%)
 rename {spring-build-junit/src/main/java/org/springframework/build/junit => spring-core/src/test/java/org/springframework/tests}/TestGroup.java (94%)
 rename spring-build-junit/src/test/java/org/springframework/build/junit/TestGroupTest.java => spring-core/src/test/java/org/springframework/tests/TestGroupTests.java (94%)
 create mode 100644 spring-core/src/test/java/org/springframework/tests/package-info.java

diff --git a/build.gradle b/build.gradle
index 19d2a211603..b04396bdc2a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -111,7 +111,7 @@ configure(allprojects.findAll{it.name in ["spring", "spring-jms", "spring-orm",
 	}
 }
 
-configure(subprojects - project(":spring-build-junit")) { subproject ->
+configure(subprojects) { subproject ->
 	apply plugin: "merge"
 	apply from: "${gradleScriptDir}/publish-maven.gradle"
 
@@ -160,15 +160,11 @@ configure(subprojects - project(":spring-build-junit")) { subproject ->
 	}
 }
 
-configure(allprojects - project(":spring-build-junit")) {
+configure(allprojects) {
 	dependencies {
-		testCompile(project(":spring-build-junit"))
-	}
-
-	eclipse.classpath.file.whenMerged { classpath ->
-		classpath.entries.find{it.path == "/spring-build-junit"}.exported = false
+		testCompile("junit:junit:${junitVersion}")
+		testCompile("org.hamcrest:hamcrest-all:1.3")
 	}
-
 	test.systemProperties.put("testGroups", properties.get("testGroups"))
 }
 
@@ -184,23 +180,6 @@ project("spring-build-src") {
 	configurations.archives.artifacts.clear()
 }
 
-project("spring-build-junit") {
-	description = "Build-time JUnit dependencies and utilities"
-
-	// NOTE: This is an internal project and is not published.
-
-	dependencies {
-		compile("commons-logging:commons-logging:1.1.1")
-		compile("junit:junit:${junitVersion}")
-		compile("org.hamcrest:hamcrest-all:1.3")
-		compile("org.easymock:easymock:${easymockVersion}")
-	}
-
-	// Don't actually generate any artifacts
-	configurations.archives.artifacts.clear()
-}
-
-
 project("spring-core") {
 	description = "Spring Core"
 
@@ -549,7 +528,6 @@ project("spring-orm") {
 		testCompile("org.eclipse.persistence:org.eclipse.persistence.asm:1.0.1")
 		testCompile("org.eclipse.persistence:org.eclipse.persistence.antlr:1.0.1")
 		testCompile("hsqldb:hsqldb:${hsqldbVersion}")
-		testCompile(project(":spring-web").sourceSets.test.output)
 		compile(project(":spring-core"))
 		compile(project(":spring-beans"))
 		optional(project(":spring-aop"))
@@ -799,6 +777,7 @@ configure(rootProject) {
 
 	dependencies { // for integration tests
 		testCompile(project(":spring-core"))
+		testCompile(project(":spring-core").sourceSets.test.output)
 		testCompile(project(":spring-beans"))
 		testCompile(project(":spring-aop"))
 		testCompile(project(":spring-expression"))
diff --git a/settings.gradle b/settings.gradle
index 7d37e04fbb6..8c99e5a179b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,7 +22,6 @@ include "spring-web"
 include "spring-webmvc"
 include "spring-webmvc-portlet"
 include "spring-webmvc-tiles3"
-include "spring-build-junit"
 
 // Exposes gradle buildSrc for IDE support
 include "buildSrc"
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java
index c5ac12d129e..9732cfa4d98 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java
@@ -19,8 +19,8 @@ package org.springframework.aop.target.dynamic;
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.junit.TestGroup;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 
 /**
  * @author Rob Harrop
diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
index 9ea8c569e7e..29e282c0a27 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
@@ -49,8 +49,8 @@ import org.springframework.beans.propertyeditors.CustomNumberEditor;
 import org.springframework.beans.propertyeditors.StringArrayPropertyEditor;
 import org.springframework.beans.propertyeditors.StringTrimmerEditor;
 import org.springframework.beans.support.DerivedFromProtectedBaseBean;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.junit.TestGroup;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.support.DefaultConversionService;
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
index d3710f0c188..0e474fadaed 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
@@ -72,8 +72,8 @@ import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.ConstructorDependenciesBean;
 import org.springframework.beans.factory.xml.DependenciesBean;
 import org.springframework.beans.propertyeditors.CustomNumberEditor;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.junit.TestGroup;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.support.DefaultConversionService;
diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
index 4d2a5690cb3..dfe6d48aa70 100644
--- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
+++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
@@ -56,8 +56,8 @@ import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.support.StaticListableBeanFactory;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.junit.TestGroup;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.core.io.FileSystemResourceLoader;
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
index 2dfa414c65c..e26835163f3 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
@@ -51,8 +51,8 @@ import org.springframework.beans.factory.config.MethodInvokingFactoryBean;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.junit.TestGroup;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java
index 71542305057..d35b5396fd3 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java
@@ -31,8 +31,8 @@ import org.springframework.beans.factory.annotation.Required;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.junit.TestGroup;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.util.StopWatch;
 
diff --git a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
index b49857d8cbb..3384916c081 100644
--- a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
+++ b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
@@ -38,8 +38,8 @@ import org.springframework.beans.factory.support.AutowireCandidateQualifier;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
 import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.junit.TestGroup;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.util.SerializationTestUtils;
diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java
index d4be14d47b6..60f96bdb175 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java
@@ -22,8 +22,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.Before;
 import org.junit.Test;
 
-import org.springframework.build.junit.Assume;
-import org.springframework.build.junit.TestGroup;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
index fadd6933a78..01dd03c7703 100644
--- a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
+++ b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java
@@ -35,8 +35,6 @@ import java.util.UUID;
 
 import org.junit.Test;
 
-import org.springframework.build.junit.Assume;
-import org.springframework.build.junit.TestGroup;
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.ConverterNotFoundException;
 import org.springframework.core.convert.TypeDescriptor;
@@ -46,6 +44,8 @@ import org.springframework.core.convert.converter.ConverterFactory;
 import org.springframework.core.convert.converter.GenericConverter;
 import org.springframework.core.io.DescriptiveResource;
 import org.springframework.core.io.Resource;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 import org.springframework.util.StopWatch;
 import org.springframework.util.StringUtils;
 
diff --git a/spring-build-junit/src/main/java/org/springframework/build/junit/Assume.java b/spring-core/src/test/java/org/springframework/tests/Assume.java
similarity index 91%
rename from spring-build-junit/src/main/java/org/springframework/build/junit/Assume.java
rename to spring-core/src/test/java/org/springframework/tests/Assume.java
index 7b916d0b59c..801cd93ad79 100644
--- a/spring-build-junit/src/main/java/org/springframework/build/junit/Assume.java
+++ b/spring-core/src/test/java/org/springframework/tests/Assume.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.build.junit;
+package org.springframework.tests;
 
 import static org.junit.Assume.assumeFalse;
 
@@ -24,8 +24,9 @@ import org.apache.commons.logging.Log;
 import org.junit.internal.AssumptionViolatedException;
 
 /**
- * Provides utility methods that allow JUnit tests to {@link Assume} certain conditions
- * hold {@code true}. If the assumption fails, it means the test should be skipped.
+ * Provides utility methods that allow JUnit tests to {@link org.junit.Assume} certain
+ * conditions hold {@code true}. If the assumption fails, it means the test should be
+ * skipped.
  *
  * 
For example, if a set of tests require at least JDK 1.7 it can use
  * {@code Assume#atLeast(JdkVersion.JAVA_17)} as shown below:
diff --git a/spring-build-junit/src/main/java/org/springframework/build/junit/JavaVersion.java b/spring-core/src/test/java/org/springframework/tests/JavaVersion.java
similarity index 95%
rename from spring-build-junit/src/main/java/org/springframework/build/junit/JavaVersion.java
rename to spring-core/src/test/java/org/springframework/tests/JavaVersion.java
index db9fee370f0..b36319b2c4e 100644
--- a/spring-build-junit/src/main/java/org/springframework/build/junit/JavaVersion.java
+++ b/spring-core/src/test/java/org/springframework/tests/JavaVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.build.junit;
+package org.springframework.tests;
 
 /**
  * Enumeration of known JDK versions.
diff --git a/spring-build-junit/src/test/java/org/springframework/build/junit/JavaVersionTest.java b/spring-core/src/test/java/org/springframework/tests/JavaVersionTests.java
similarity index 90%
rename from spring-build-junit/src/test/java/org/springframework/build/junit/JavaVersionTest.java
rename to spring-core/src/test/java/org/springframework/tests/JavaVersionTests.java
index 1600d4ca195..82b51e0014a 100644
--- a/spring-build-junit/src/test/java/org/springframework/build/junit/JavaVersionTest.java
+++ b/spring-core/src/test/java/org/springframework/tests/JavaVersionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.build.junit;
+package org.springframework.tests;
 
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.*;
@@ -26,7 +26,7 @@ import org.junit.Test;
  *
  * @author Phillip Webb
  */
-public class JavaVersionTest {
+public class JavaVersionTests {
 
 	@Test
 	public void runningVersion() {
diff --git a/spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java b/spring-core/src/test/java/org/springframework/tests/Matchers.java
similarity index 97%
rename from spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java
rename to spring-core/src/test/java/org/springframework/tests/Matchers.java
index 7bb3744d60a..826bd1c7324 100644
--- a/spring-jdbc/src/test/java/org/springframework/build/test/hamcrest/Matchers.java
+++ b/spring-core/src/test/java/org/springframework/tests/Matchers.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.build.test.hamcrest;
+package org.springframework.tests;
 
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
diff --git a/spring-core/src/test/java/org/springframework/build/test/mockito/MockitoUtils.java b/spring-core/src/test/java/org/springframework/tests/MockitoUtils.java
similarity index 97%
rename from spring-core/src/test/java/org/springframework/build/test/mockito/MockitoUtils.java
rename to spring-core/src/test/java/org/springframework/tests/MockitoUtils.java
index 63d45249872..0fb20f30103 100644
--- a/spring-core/src/test/java/org/springframework/build/test/mockito/MockitoUtils.java
+++ b/spring-core/src/test/java/org/springframework/tests/MockitoUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.build.test.mockito;
+package org.springframework.tests;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
diff --git a/spring-build-junit/src/main/java/org/springframework/build/junit/TestGroup.java b/spring-core/src/test/java/org/springframework/tests/TestGroup.java
similarity index 94%
rename from spring-build-junit/src/main/java/org/springframework/build/junit/TestGroup.java
rename to spring-core/src/test/java/org/springframework/tests/TestGroup.java
index 3be8b83514b..638c5b861b5 100644
--- a/spring-build-junit/src/main/java/org/springframework/build/junit/TestGroup.java
+++ b/spring-core/src/test/java/org/springframework/tests/TestGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.build.junit;
+package org.springframework.tests;
 
 import java.util.Collections;
 import java.util.EnumSet;
diff --git a/spring-build-junit/src/test/java/org/springframework/build/junit/TestGroupTest.java b/spring-core/src/test/java/org/springframework/tests/TestGroupTests.java
similarity index 94%
rename from spring-build-junit/src/test/java/org/springframework/build/junit/TestGroupTest.java
rename to spring-core/src/test/java/org/springframework/tests/TestGroupTests.java
index 2b30f299310..2b4860fd728 100644
--- a/spring-build-junit/src/test/java/org/springframework/build/junit/TestGroupTest.java
+++ b/spring-core/src/test/java/org/springframework/tests/TestGroupTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.build.junit;
+package org.springframework.tests;
 
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
@@ -32,7 +32,7 @@ import org.junit.rules.ExpectedException;
  *
  * @author Phillip Webb
  */
-public class TestGroupTest {
+public class TestGroupTests {
 
 	@Rule
 	public ExpectedException thrown = ExpectedException.none();
diff --git a/spring-core/src/test/java/org/springframework/tests/package-info.java b/spring-core/src/test/java/org/springframework/tests/package-info.java
new file mode 100644
index 00000000000..545c413c984
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/tests/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Shared utilities that are used internally throughout the test suite but are not
+ * published. This package should not be confused with {@code org.springframework.test}
+ * which contains published code from the 'spring-test' module.
+ */
+package org.springframework.tests;
diff --git a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java
index fab4424ebe6..0c3b9f0e49d 100644
--- a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java
+++ b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java
@@ -31,10 +31,10 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-import org.springframework.build.test.mockito.MockitoUtils;
-import org.springframework.build.test.mockito.MockitoUtils.InvocationArgumentsAdapter;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
+import org.springframework.tests.MockitoUtils;
+import org.springframework.tests.MockitoUtils.InvocationArgumentsAdapter;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java
index 7262d63b6d1..740f33d4125 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/PerformanceTests.java
@@ -20,8 +20,8 @@ import static org.junit.Assert.fail;
 
 import org.junit.Test;
 
-import org.springframework.build.junit.Assume;
-import org.springframework.build.junit.TestGroup;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.Expression;
 import org.springframework.expression.ExpressionParser;
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
index e338ef8805a..3c4e1bc73ae 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java
@@ -34,7 +34,7 @@ import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.springframework.build.test.hamcrest.Matchers.exceptionCause;
+import static org.springframework.tests.Matchers.exceptionCause;
 
 import java.sql.CallableStatement;
 import java.sql.Connection;
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java
index f858444dbbb..9779c29d65d 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/SimpleJdbcCallTests.java
@@ -22,7 +22,7 @@ import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
-import static org.springframework.build.test.hamcrest.Matchers.exceptionCause;
+import static org.springframework.tests.Matchers.exceptionCause;
 
 import java.sql.CallableStatement;
 import java.sql.Connection;
diff --git a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java
index cba2d487f23..ada52ec33c2 100644
--- a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestUtilsTests.java
@@ -19,9 +19,9 @@ package org.springframework.web.bind;
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.junit.TestGroup;
 import org.springframework.mock.web.test.MockHttpServletRequest;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 import org.springframework.util.StopWatch;
 
 /**
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java
index c903e01a663..8092d835b32 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java
@@ -19,8 +19,8 @@ package org.springframework.web.portlet.bind;
 import junit.framework.TestCase;
 
 import org.junit.Test;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.junit.TestGroup;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 import org.springframework.mock.web.portlet.MockPortletRequest;
 import org.springframework.util.StopWatch;
 
diff --git a/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java b/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java
index b2fbd959d26..fae32ac8f52 100644
--- a/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java
+++ b/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java
@@ -23,14 +23,14 @@ import org.junit.Test;
 
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.junit.TestGroup;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.stereotype.Repository;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 import org.springframework.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;

From c892b8185270daec50f84fcf4cefd88e74b8e195 Mon Sep 17 00:00:00 2001
From: Phillip Webb 
Date: Tue, 1 Jan 2013 20:42:36 -0800
Subject: [PATCH 20/34] Exclude spring-build-src from maven publish

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b04396bdc2a..071fdc3d61b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -111,7 +111,7 @@ configure(allprojects.findAll{it.name in ["spring", "spring-jms", "spring-orm",
 	}
 }
 
-configure(subprojects) { subproject ->
+configure(subprojects - project(":spring-build-src")) { subproject ->
 	apply plugin: "merge"
 	apply from: "${gradleScriptDir}/publish-maven.gradle"
 

From 0b2c3050727be0774e11519024284389cfb680fa Mon Sep 17 00:00:00 2001
From: Phillip Webb 
Date: Wed, 2 Jan 2013 11:51:10 -0800
Subject: [PATCH 21/34] Recursively add test dependencies

Update TestSourceSetDependenciesPlugin to recursively search project
dependencies when adding test source sets.
---
 .../TestSourceSetDependenciesPlugin.groovy    | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy b/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy
index 1e5cffcc7b2..363c66c00f4 100644
--- a/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,18 +34,24 @@ class TestSourceSetDependenciesPlugin implements Plugin {
 	public void apply(Project project) {
 		project.afterEvaluate {
 			Set projectDependencies = new LinkedHashSet<>()
-			for(def configurationName in ["compile", "optional", "provided"]) {
-				Configuration configuration = project.getConfigurations().findByName(configurationName)
-				if(configuration) {
-					projectDependencies.addAll(
-						configuration.dependencies.findAll { it instanceof ProjectDependency }
-					)
-				}
-			}
+			collectProjectDependencies(projectDependencies, project)
 			projectDependencies.each {
 				project.dependencies.add("testCompile", it.dependencyProject.sourceSets.test.output)
 			}
 		}
 	}
 
+	private void collectProjectDependencies(Set projectDependencies,
+			Project project) {
+		for(def configurationName in ["compile", "optional", "provided"]) {
+			Configuration configuration = project.getConfigurations().findByName(configurationName)
+			if(configuration) {
+				configuration.dependencies.findAll { it instanceof ProjectDependency }.each {
+					projectDependencies.add(it)
+					collectProjectDependencies(projectDependencies, it.dependencyProject)
+				}
+			}
+		}
+	}
+
 }

From a2d80c6094f17a918c63122e01a5350166b272bc Mon Sep 17 00:00:00 2001
From: Chris Beams 
Date: Thu, 3 Jan 2013 12:12:08 +0100
Subject: [PATCH 22/34] Polish build.gradle

 - Consolidate shared test systemProperty declarations
 - Consolidate easymock dependency declarations
---
 build.gradle | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/build.gradle b/build.gradle
index 071fdc3d61b..2e2daffb0c3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 	}
 }
 
-configure(allprojects) {
+configure(allprojects) { project ->
 	ext.aspectjVersion  = "1.7.1"
 	ext.easymockVersion = "2.5.2"
 	ext.hsqldbVersion   = "1.8.0.10"
@@ -65,7 +65,10 @@ configure(allprojects) {
 
 	sourceSets.test.resources.srcDirs = ["src/test/resources", "src/test/java"]
 
-	test.systemProperty("java.awt.headless", "true")
+	test {
+		systemProperty("java.awt.headless", "true")
+		systemProperty("testGroups", properties.get("testGroups"))
+	}
 
 	repositories {
 		maven { url "http://repo.springsource.org/libs-release" }
@@ -76,6 +79,13 @@ configure(allprojects) {
 		testCompile("junit:junit:${junitVersion}")
 		testCompile("org.hamcrest:hamcrest-all:1.3")
 		testCompile("org.mockito:mockito-core:1.9.5")
+		if (project.name in ["spring", "spring-jms", "spring-orm",
+				"spring-orm-hibernate4", "spring-oxm", "spring-struts",
+				"spring-test", "spring-test-mvc", "spring-tx", "spring-web",
+				"spring-webmvc", "spring-webmvc-portlet", "spring-webmvc-tiles3"]) {
+			testCompile("org.easymock:easymock:${easymockVersion}")
+			testCompile "org.easymock:easymockclassextension:${easymockVersion}"
+		}
 	}
 
 	ext.javadocLinks = [
@@ -101,16 +111,6 @@ configure(allprojects) {
 	] as String[]
 }
 
-configure(allprojects.findAll{it.name in ["spring", "spring-jms", "spring-orm",
-		"spring-orm-hibernate4", "spring-oxm", "spring-struts", "spring-test",
-		"spring-test-mvc", "spring-tx", "spring-web", "spring-webmvc",
-		"spring-webmvc-portlet", "spring-webmvc-tiles3"]}) {
-	dependencies {
-		testCompile("org.easymock:easymock:${easymockVersion}")
-		testCompile "org.easymock:easymockclassextension:${easymockVersion}"
-	}
-}
-
 configure(subprojects - project(":spring-build-src")) { subproject ->
 	apply plugin: "merge"
 	apply from: "${gradleScriptDir}/publish-maven.gradle"
@@ -160,14 +160,6 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
 	}
 }
 
-configure(allprojects) {
-	dependencies {
-		testCompile("junit:junit:${junitVersion}")
-		testCompile("org.hamcrest:hamcrest-all:1.3")
-	}
-	test.systemProperties.put("testGroups", properties.get("testGroups"))
-}
-
 project("spring-build-src") {
 	description = "Exposes gradle buildSrc for IDE support"
 	apply plugin: "groovy"

From a6eaf871f1637a29f89effb8d4ecd7f1af4b4310 Mon Sep 17 00:00:00 2001
From: Chris Beams 
Date: Thu, 3 Jan 2013 11:10:16 +0100
Subject: [PATCH 23/34] Fix Eclipse compilation error in Gradle plugin

Prior to this commit, the following compilation error presented itself
when importing buildSrc ('spring-build-src') into Eclipse:

    Groovy:missing type for constructor call @ line 36, column 49.

This commit replaces the use of the diamond operator with typical
generics syntax in order to work around the problem. It is assumed that
the underlying problem is to do with the Groovy compiler in use. This
change ensures that any contributor / committer importing
spring-framework into Eclipse has a straightforward experience without
being required to tweak Groovy settings.

If selection of the correct Groovy compilation settings can be made
automatic, then we should of course feel free to use Java 7-style syntax
there in the future.

Note that this was *not* a problem when importing buildSrc into IDEA 12.
---
 .../build/gradle/TestSourceSetDependenciesPlugin.groovy         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy b/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy
index 363c66c00f4..e57b04dec22 100644
--- a/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy
@@ -33,7 +33,7 @@ class TestSourceSetDependenciesPlugin implements Plugin {
 	@Override
 	public void apply(Project project) {
 		project.afterEvaluate {
-			Set projectDependencies = new LinkedHashSet<>()
+			Set projectDependencies = new LinkedHashSet()
 			collectProjectDependencies(projectDependencies, project)
 			projectDependencies.each {
 				project.dependencies.add("testCompile", it.dependencyProject.sourceSets.test.output)

From dcda78bad6abed9f0738dbf77a06d2acfbf036a8 Mon Sep 17 00:00:00 2001
From: Chris Beams 
Date: Thu, 3 Jan 2013 11:23:41 +0100
Subject: [PATCH 24/34] Skip creation of IDEA metadata for spring-aspects

See diff for details
---
 import-into-idea.md           | 4 ++--
 spring-aspects/aspects.gradle | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/import-into-idea.md b/import-into-idea.md
index 4bbac88504a..a2f752e7261 100644
--- a/import-into-idea.md
+++ b/import-into-idea.md
@@ -13,8 +13,8 @@ _Within your locally cloned spring-framework working directory:_
 ## Known issues
 
 1. `spring-aspects` does not compile out of the box due to references to aspect types unknown to IDEA.
-See http://youtrack.jetbrains.com/issue/IDEA-64446 for details. In the meantime, you may want to
-exclude `spring-aspects` from the overall project to avoid compilation errors.
+See http://youtrack.jetbrains.com/issue/IDEA-64446 for details. In the meantime, the 'spring-aspects'
+module has been excluded from the overall project to avoid compilation errors.
 2. While all JUnit tests pass from the command line with Gradle, many will fail when run from IDEA.
 Resolving this is a work in progress. If attempting to run all JUnit tests from within IDEA, you will
 likely need to set the following VM options to avoid out of memory errors:
diff --git a/spring-aspects/aspects.gradle b/spring-aspects/aspects.gradle
index 34cadf35380..0432414467b 100644
--- a/spring-aspects/aspects.gradle
+++ b/spring-aspects/aspects.gradle
@@ -8,6 +8,10 @@ configurations {
 	ajInpath
 }
 
+// exclude spring-aspects as a module within IDEA until IDEA-64446 is resolved
+tasks.getByName("idea").onlyIf { false }
+tasks.getByName("ideaModule").onlyIf { false }
+
 task compileJava(overwrite: true)  {
 	dependsOn JavaPlugin.PROCESS_RESOURCES_TASK_NAME
 	dependsOn configurations.ajc.getTaskDependencyFromProjectDependency(true, "compileJava")

From 830d73b4a7cc046d80068318389891562ed47076 Mon Sep 17 00:00:00 2001
From: Chris Beams 
Date: Thu, 3 Jan 2013 11:26:16 +0100
Subject: [PATCH 25/34] Eliminate EBR dependencies and repository config

Swap the following EBR-specific dependencies for their equivalents at
Maven Central:

 - atinject-tck
 - jaxb
 - xmlbeans

Remove the /ebr-maven-external repository from the build script entirely
such that all dependencies are now resolved against a single repository:

    http://repo.springsource.org/libs-release
---
 build.gradle          | 3 +--
 spring-oxm/oxm.gradle | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2e2daffb0c3..84c2ce62862 100644
--- a/build.gradle
+++ b/build.gradle
@@ -72,7 +72,6 @@ configure(allprojects) { project ->
 
 	repositories {
 		maven { url "http://repo.springsource.org/libs-release" }
-		maven { url "http://repo.springsource.org/ebr-maven-external" }
 	}
 
 	dependencies {
@@ -332,7 +331,7 @@ project("spring-context") {
 		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 		optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
 		testCompile("commons-dbcp:commons-dbcp:1.2.2")
-		testCompile("javax.inject:com.springsource.org.atinject.tck:1.0.0")
+		testCompile("javax.inject:javax.inject-tck:1")
 	}
 
 	test {
diff --git a/spring-oxm/oxm.gradle b/spring-oxm/oxm.gradle
index 9eef5484273..0b8aee62e9d 100644
--- a/spring-oxm/oxm.gradle
+++ b/spring-oxm/oxm.gradle
@@ -7,8 +7,8 @@ configurations {
 dependencies {
 	castor "org.codehaus.castor:castor-anttasks:1.2"
 	castor "velocity:velocity:1.5"
-	xjc "com.sun.xml:com.springsource.com.sun.tools.xjc:2.1.7"
-	xmlbeans "org.apache.xmlbeans:com.springsource.org.apache.xmlbeans:2.4.0"
+	xjc "com.sun.xml.bind:jaxb-xjc:2.1.7"
+	xmlbeans "org.apache.xmlbeans:xmlbeans:2.4.0"
 	jibx "org.jibx:jibx-bind:1.2.3"
 	jibx "bcel:bcel:5.1"
 }

From 68e3b7773cbce0e1a834945f655e640d82cf7651 Mon Sep 17 00:00:00 2001
From: Chris Beams 
Date: Thu, 3 Jan 2013 12:14:17 +0100
Subject: [PATCH 26/34] Segregate add'l long-running and performance tests

 - Add TestGroup#LONG_RUNNING to distinguish from #PERFORMANCE, the
   former being tests that simply take a long time vs the latter being
   tests that are actually dependent on certain actions happening within
   a given time window and are thefore CPU-dependent.

Issue: SPR-9984
---
 .../AnnotationAsyncExecutionAspectTests.java  | 13 +++++---
 .../factory/ConcurrentBeanFactoryTests.java   | 15 ++++++---
 .../support/BeanFactoryGenericsTests.java     |  6 +++-
 .../beans/support/PagedListHolderTests.java   | 16 +++++++--
 .../cache/ehcache/EhCacheCacheTests.java      |  6 +++-
 .../scheduling/quartz/QuartzSupportTests.java | 30 ++++++++++++++---
 .../aop/aspectj/DeclareParentsTests.java      | 10 ++++--
 .../DefaultLifecycleProcessorTests.java       | 15 +++++++--
 .../annotation/AsyncExecutionTests.java       |  9 ++++-
 ...duledAnnotationBeanPostProcessorTests.java |  7 ++--
 .../ScheduledExecutorFactoryBeanTests.java    | 23 +++++++------
 .../groovy/GroovyScriptFactoryTests.java      | 12 ++++++-
 .../jruby/JRubyScriptFactoryTests.java        | 33 ++++++++++++++++---
 .../ScriptFactoryPostProcessorTests.java      | 26 +++++++++++++--
 .../type/CachingMetadataReaderLeakTest.java   |  6 +++-
 .../org/springframework/tests/TestGroup.java  | 13 +++++++-
 .../config/JdbcNamespaceIntegrationTests.java | 17 ++++++----
 .../DataSourceTransactionManagerTests.java    |  6 +++-
 .../EmbeddedDatabaseBuilderTests.java         | 12 ++++---
 19 files changed, 217 insertions(+), 58 deletions(-)

diff --git a/spring-aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspectTests.java b/spring-aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspectTests.java
index 6bfe60205ea..b95ee6b8078 100644
--- a/spring-aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspectTests.java
+++ b/spring-aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspectTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,10 +29,11 @@ import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.AsyncResult;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.Matchers.startsWith;
-
+import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.*;
 
 /**
@@ -54,6 +55,8 @@ public class AnnotationAsyncExecutionAspectTests {
 
 	@Test
 	public void asyncMethodGetsRoutedAsynchronously() {
+		Assume.group(TestGroup.PERFORMANCE);
+
 		ClassWithoutAsyncAnnotation obj = new ClassWithoutAsyncAnnotation();
 		obj.incrementAsync();
 		executor.waitForCompletion();
@@ -84,6 +87,8 @@ public class AnnotationAsyncExecutionAspectTests {
 
 	@Test
 	public void voidMethodInAsyncClassGetsRoutedAsynchronously() {
+		Assume.group(TestGroup.PERFORMANCE);
+
 		ClassWithAsyncAnnotation obj = new ClassWithAsyncAnnotation();
 		obj.increment();
 		executor.waitForCompletion();
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
index 96eeb3b01f8..aae1e1073a1 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,6 @@
 
 package org.springframework.beans.factory;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import static test.util.TestResourceUtils.qualifiedResource;
-
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -31,14 +27,21 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.beans.PropertyEditorRegistrar;
 import org.springframework.beans.PropertyEditorRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.core.io.Resource;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
+
+import static org.junit.Assert.*;
+import static test.util.TestResourceUtils.*;
 
 /**
  * @author Guillaume Poirier
@@ -72,6 +75,8 @@ public final class ConcurrentBeanFactoryTests {
 
 	@Before
 	public void setUp() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
+
 		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(factory).loadBeanDefinitions(CONTEXT);
 		factory.addPropertyEditorRegistrar(new PropertyEditorRegistrar() {
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
index b3516282d43..655a5a0e0fa 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,6 +44,8 @@ import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.beans.propertyeditors.CustomNumberEditor;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.UrlResource;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 
 import test.beans.GenericBean;
 import test.beans.GenericIntegerBean;
@@ -641,6 +643,8 @@ public class BeanFactoryGenericsTests {
 
 	@Test
 	public void testSetBean() throws Exception {
+		Assume.group(TestGroup.LONG_RUNNING);
+
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
 				new ClassPathResource("genericBeanTests.xml", getClass()));
diff --git a/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
index ef036076581..481466d4281 100644
--- a/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,18 +18,28 @@ package org.springframework.beans.support;
 
 import java.util.ArrayList;
 import java.util.List;
-import junit.framework.TestCase;
+
+import org.junit.Test;
+
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
+
+import static org.junit.Assert.*;
 
 import test.beans.TestBean;
 
 /**
  * @author Juergen Hoeller
  * @author Jean-Pierre PAWLAK
+ * @author Chris Beams
  * @since 20.05.2003
  */
-public class PagedListHolderTests extends TestCase {
+public class PagedListHolderTests {
 
+	@Test
 	public void testPagedListHolder() {
+		Assume.group(TestGroup.LONG_RUNNING);
+
 		TestBean tb1 = new TestBean();
 		tb1.setName("eva");
 		tb1.setAge(25);
diff --git a/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTests.java b/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTests.java
index 5cb15498324..63fd1546a5d 100644
--- a/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTests.java
+++ b/spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2012 the original author or authors.
+ * Copyright 2010-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,13 @@ import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Ehcache;
 import net.sf.ehcache.Element;
 import net.sf.ehcache.config.CacheConfiguration;
+
 import org.junit.Before;
 import org.junit.Test;
 
 import org.springframework.cache.Cache;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 
 import static org.junit.Assert.*;
 
@@ -95,6 +98,7 @@ public class EhCacheCacheTests {
 
 	@Test
 	public void testExpiredElements() throws Exception {
+		Assume.group(TestGroup.LONG_RUNNING);
 		String key = "brancusi";
 		String value = "constantin";
 		Element brancusi = new Element(key, value);
diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
index dfe6d48aa70..79c1dfba7f7 100644
--- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
+++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@ import java.util.Map;
 
 import javax.sql.DataSource;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.quartz.CronTrigger;
 import org.quartz.Job;
@@ -382,15 +383,19 @@ public class QuartzSupportTests {
 		verify(scheduler).shutdown(false);
 	}
 
-	/*public void testMethodInvocationWithConcurrency() throws Exception {
+	@Ignore @Test
+	public void testMethodInvocationWithConcurrency() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
 		methodInvokingConcurrency(true);
-	}*/
+	}
 
 	// We can't test both since Quartz somehow seems to keep things in memory
 	// enable both and one of them will fail (order doesn't matter).
-	/*public void testMethodInvocationWithoutConcurrency() throws Exception {
+	@Ignore @Test
+	public void testMethodInvocationWithoutConcurrency() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
 		methodInvokingConcurrency(false);
-	}*/
+	}
 
 	private void methodInvokingConcurrency(boolean concurrent) throws Exception {
 		// Test the concurrency flag.
@@ -637,6 +642,8 @@ public class QuartzSupportTests {
 
 	@Test
 	public void testSchedulerWithTaskExecutor() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
+
 		CountingTaskExecutor taskExecutor = new CountingTaskExecutor();
 		DummyJob.count = 0;
 
@@ -668,6 +675,8 @@ public class QuartzSupportTests {
 
 	@Test
 	public void testSchedulerWithRunnable() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
+
 		DummyRunnable.count = 0;
 
 		JobDetail jobDetail = new JobDetailBean();
@@ -696,6 +705,8 @@ public class QuartzSupportTests {
 
 	@Test
 	public void testSchedulerWithQuartzJobBean() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
+
 		DummyJob.param = 0;
 		DummyJob.count = 0;
 
@@ -727,6 +738,8 @@ public class QuartzSupportTests {
 
 	@Test
 	public void testSchedulerWithSpringBeanJobFactory() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
+
 		DummyJob.param = 0;
 		DummyJob.count = 0;
 
@@ -760,6 +773,7 @@ public class QuartzSupportTests {
 
 	@Test
 	public void testSchedulerWithSpringBeanJobFactoryAndParamMismatchNotIgnored() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
 		DummyJob.param = 0;
 		DummyJob.count = 0;
 
@@ -794,6 +808,8 @@ public class QuartzSupportTests {
 
 	@Test
 	public void testSchedulerWithSpringBeanJobFactoryAndRunnable() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
+
 		DummyRunnable.param = 0;
 		DummyRunnable.count = 0;
 
@@ -826,6 +842,7 @@ public class QuartzSupportTests {
 
 	@Test
 	public void testSchedulerWithSpringBeanJobFactoryAndQuartzJobBean() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
 		DummyJobBean.param = 0;
 		DummyJobBean.count = 0;
 
@@ -858,6 +875,7 @@ public class QuartzSupportTests {
 
 	@Test
 	public void testSchedulerWithSpringBeanJobFactoryAndJobSchedulingData() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
 		DummyJob.param = 0;
 		DummyJob.count = 0;
 
@@ -896,6 +914,7 @@ public class QuartzSupportTests {
 
 	@Test
 	public void testWithTwoAnonymousMethodInvokingJobDetailFactoryBeans() throws InterruptedException {
+		Assume.group(TestGroup.PERFORMANCE);
 		ClassPathXmlApplicationContext ctx =
 				new ClassPathXmlApplicationContext("/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml");
 		Thread.sleep(3000);
@@ -915,6 +934,7 @@ public class QuartzSupportTests {
 
 	@Test
 	public void testSchedulerAccessorBean() throws InterruptedException {
+		Assume.group(TestGroup.PERFORMANCE);
 		ClassPathXmlApplicationContext ctx =
 				new ClassPathXmlApplicationContext("/org/springframework/scheduling/quartz/schedulerAccessorBean.xml");
 		Thread.sleep(3000);
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
index 59a3136fdce..059aae0b0f6 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 package org.springframework.aop.aspectj;
 
-import static org.junit.Assert.*;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.aop.framework.Advised;
@@ -26,9 +24,13 @@ import org.springframework.beans.ITestBean;
 import org.springframework.beans.TestBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 
 import test.mixin.Lockable;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rod Johnson
  * @author Chris Beams
@@ -63,6 +65,8 @@ public final class DeclareParentsTests {
 	// on the introduction, in which case this would not be a problem.
 	@Test
 	public void testLockingWorks() {
+		Assume.group(TestGroup.LONG_RUNNING);
+
 		Object introductionObject = ctx.getBean("introduction");
 		assertFalse("Introduction should not be proxied", AopUtils.isAopProxy(introductionObject));
 
diff --git a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java
index 4f4e8860e13..86c960f82f6 100644
--- a/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/DefaultLifecycleProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ package org.springframework.context.support;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.junit.Test;
-
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -27,6 +26,8 @@ import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.Lifecycle;
 import org.springframework.context.LifecycleProcessor;
 import org.springframework.context.SmartLifecycle;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 
 import static org.junit.Assert.*;
 
@@ -251,6 +252,8 @@ public class DefaultLifecycleProcessorTests {
 
 	@Test
 	public void smartLifecycleGroupShutdown() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
+
 		CopyOnWriteArrayList stoppedBeans = new CopyOnWriteArrayList();
 		TestSmartLifecycleBean bean1 = TestSmartLifecycleBean.forShutdownTests(1, 300, stoppedBeans);
 		TestSmartLifecycleBean bean2 = TestSmartLifecycleBean.forShutdownTests(3, 100, stoppedBeans);
@@ -280,6 +283,8 @@ public class DefaultLifecycleProcessorTests {
 
 	@Test
 	public void singleSmartLifecycleShutdown() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
+
 		CopyOnWriteArrayList stoppedBeans = new CopyOnWriteArrayList();
 		TestSmartLifecycleBean bean = TestSmartLifecycleBean.forShutdownTests(99, 300, stoppedBeans);
 		StaticApplicationContext context = new StaticApplicationContext();
@@ -386,6 +391,8 @@ public class DefaultLifecycleProcessorTests {
 
 	@Test
 	public void dependentShutdownFirstEvenIfItsPhaseIsLower() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
+
 		CopyOnWriteArrayList stoppedBeans = new CopyOnWriteArrayList();
 		TestSmartLifecycleBean beanMin = TestSmartLifecycleBean.forShutdownTests(Integer.MIN_VALUE, 100, stoppedBeans);
 		TestSmartLifecycleBean bean1 = TestSmartLifecycleBean.forShutdownTests(1, 200, stoppedBeans);
@@ -458,6 +465,8 @@ public class DefaultLifecycleProcessorTests {
 
 	@Test
 	public void dependentShutdownFirstAndIsSmartLifecycle() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
+
 		CopyOnWriteArrayList stoppedBeans = new CopyOnWriteArrayList();
 		TestSmartLifecycleBean beanMin = TestSmartLifecycleBean.forShutdownTests(Integer.MIN_VALUE, 400, stoppedBeans);
 		TestSmartLifecycleBean beanNegative = TestSmartLifecycleBean.forShutdownTests(-99, 100, stoppedBeans);
@@ -521,6 +530,8 @@ public class DefaultLifecycleProcessorTests {
 
 	@Test
 	public void dependentShutdownFirstButNotSmartLifecycle() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
+
 		CopyOnWriteArrayList stoppedBeans = new CopyOnWriteArrayList();
 		TestSmartLifecycleBean bean1 = TestSmartLifecycleBean.forShutdownTests(1, 200, stoppedBeans);
 		TestLifecycleBean simpleBean = TestLifecycleBean.forShutdownTests(stoppedBeans);
diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java
index a0985345de8..f679713eb96 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncExecutionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.concurrent.Future;
 
+import org.junit.Before;
 import org.junit.Test;
 
 import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
@@ -28,6 +29,8 @@ import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 
 import static org.junit.Assert.*;
 
@@ -43,6 +46,10 @@ public class AsyncExecutionTests {
 
 	private static int listenerConstructed = 0;
 
+	@Before
+	public void setUp() {
+		Assume.group(TestGroup.PERFORMANCE);
+	}
 
 	@Test
 	public void asyncMethods() throws Exception {
diff --git a/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
index 4bde3261190..e100da3d47d 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@ import java.util.List;
 import java.util.Properties;
 
 import org.junit.Test;
-
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -37,6 +36,8 @@ import org.springframework.scheduling.config.CronTask;
 import org.springframework.scheduling.config.IntervalTask;
 import org.springframework.scheduling.config.ScheduledTaskRegistrar;
 import org.springframework.scheduling.support.ScheduledMethodRunnable;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 
 import static org.junit.Assert.*;
 
@@ -130,6 +131,8 @@ public class ScheduledAnnotationBeanPostProcessorTests {
 
 	@Test
 	public void cronTask() throws InterruptedException {
+		Assume.group(TestGroup.LONG_RUNNING);
+
 		StaticApplicationContext context = new StaticApplicationContext();
 		BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class);
 		BeanDefinition targetDefinition = new RootBeanDefinition(
diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
index ee40acf24ad..4f5b69735ec 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,6 @@
 
 package org.springframework.scheduling.concurrent;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import static org.mockito.BDDMockito.willThrow;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
@@ -32,6 +23,12 @@ import java.util.concurrent.ThreadFactory;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.core.task.NoOpRunnable;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
+
+import static org.junit.Assert.*;
+import static org.mockito.BDDMockito.*;
+import static org.mockito.Mockito.*;
 
 /**
  * @author Rick Evans
@@ -97,6 +94,8 @@ public class ScheduledExecutorFactoryBeanTests {
 
 	@Test
 	public void testOneTimeExecutionIsSetUpAndFiresCorrectly() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
+
 		Runnable runnable = mock(Runnable.class);
 
 		ScheduledExecutorFactoryBean factory = new ScheduledExecutorFactoryBean();
@@ -112,6 +111,8 @@ public class ScheduledExecutorFactoryBeanTests {
 
 	@Test
 	public void testFixedRepeatedExecutionIsSetUpAndFiresCorrectly() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
+
 		Runnable runnable = mock(Runnable.class);
 
 		ScheduledExecutorTask task = new ScheduledExecutorTask(runnable);
@@ -129,6 +130,8 @@ public class ScheduledExecutorFactoryBeanTests {
 
 	@Test
 	public void testFixedRepeatedExecutionIsSetUpAndFiresCorrectlyAfterException() throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
+
 		Runnable runnable = mock(Runnable.class);
 		willThrow(new IllegalStateException()).given(runnable).run();
 
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
index 86214124a8e..c98d2be9fb0 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@ import java.io.FileNotFoundException;
 import java.util.Arrays;
 import java.util.Map;
 
+import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.aop.support.AopUtils;
@@ -53,6 +54,8 @@ import org.springframework.scripting.ScriptCompilationException;
 import org.springframework.scripting.ScriptSource;
 import org.springframework.scripting.support.ScriptFactoryPostProcessor;
 import org.springframework.stereotype.Component;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 
 /**
  * @author Rob Harrop
@@ -64,6 +67,11 @@ import org.springframework.stereotype.Component;
  */
 public class GroovyScriptFactoryTests {
 
+	@Before
+	public void setUp() {
+		Assume.group(TestGroup.LONG_RUNNING);
+	}
+
 	@Test
 	public void testStaticScript() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovyContext.xml", getClass());
@@ -396,6 +404,8 @@ public class GroovyScriptFactoryTests {
 
 	@Test
 	public void testAnonymousScriptDetected() throws Exception {
+		Assume.group(TestGroup.LONG_RUNNING);
+
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("groovy-with-xsd.xml", getClass());
 		Map beans = ctx.getBeansOfType(Messenger.class);
 		assertEquals(4, beans.size());
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
index dd338997f0f..102df4b7d65 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ package org.springframework.scripting.jruby;
 
 import java.util.Map;
 
-import junit.framework.TestCase;
-
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.target.dynamic.Refreshable;
 import org.springframework.beans.TestBean;
@@ -31,13 +31,18 @@ import org.springframework.scripting.ConfigurableMessenger;
 import org.springframework.scripting.Messenger;
 import org.springframework.scripting.ScriptCompilationException;
 import org.springframework.scripting.TestBeanAwareMessenger;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
+
+import static org.junit.Assert.*;
 
 /**
  * @author Rob Harrop
  * @author Rick Evans
  * @author Juergen Hoeller
+ * @author Chris Beams
  */
-public class JRubyScriptFactoryTests extends TestCase {
+public class JRubyScriptFactoryTests {
 
 	private static final String RUBY_SCRIPT_SOURCE_LOCATOR =
 			"inline:require 'java'\n" +
@@ -45,7 +50,12 @@ public class JRubyScriptFactoryTests extends TestCase {
 					"end\n" +
 					"RubyBar.new";
 
+	@Before
+	public void setUp() {
+		Assume.group(TestGroup.LONG_RUNNING);
+	}
 
+	@Test
 	public void testStaticScript() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("jrubyContext.xml", getClass());
 		Calculator calc = (Calculator) ctx.getBean("calculator");
@@ -64,6 +74,7 @@ public class JRubyScriptFactoryTests extends TestCase {
 		assertEquals("Message is incorrect", desiredMessage, messenger.getMessage());
 	}
 
+	@Test
 	public void testNonStaticScript() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("jrubyRefreshableContext.xml", getClass());
 		Messenger messenger = (Messenger) ctx.getBean("messenger");
@@ -81,6 +92,7 @@ public class JRubyScriptFactoryTests extends TestCase {
 		assertEquals("Incorrect refresh count", 2, refreshable.getRefreshCount());
 	}
 
+	@Test
 	public void testScriptCompilationException() throws Exception {
 		try {
 			new ClassPathXmlApplicationContext("jrubyBrokenContext.xml", getClass());
@@ -91,6 +103,7 @@ public class JRubyScriptFactoryTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testCtorWithNullScriptSourceLocator() throws Exception {
 		try {
 			new JRubyScriptFactory(null, new Class[]{Messenger.class});
@@ -100,6 +113,7 @@ public class JRubyScriptFactoryTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testCtorWithEmptyScriptSourceLocator() throws Exception {
 		try {
 			new JRubyScriptFactory("", new Class[]{Messenger.class});
@@ -109,6 +123,7 @@ public class JRubyScriptFactoryTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testCtorWithWhitespacedScriptSourceLocator() throws Exception {
 		try {
 			new JRubyScriptFactory("\n   ", new Class[]{Messenger.class});
@@ -118,6 +133,7 @@ public class JRubyScriptFactoryTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testCtorWithNullScriptInterfacesArray() throws Exception {
 		try {
 			new JRubyScriptFactory(RUBY_SCRIPT_SOURCE_LOCATOR, null);
@@ -127,6 +143,7 @@ public class JRubyScriptFactoryTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testCtorWithEmptyScriptInterfacesArray() throws Exception {
 		try {
 			new JRubyScriptFactory(RUBY_SCRIPT_SOURCE_LOCATOR, new Class[]{});
@@ -136,6 +153,7 @@ public class JRubyScriptFactoryTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testResourceScriptFromTag() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("jruby-with-xsd.xml", getClass());
 		TestBean testBean = (TestBean) ctx.getBean("testBean");
@@ -151,6 +169,7 @@ public class JRubyScriptFactoryTests extends TestCase {
 		assertEquals(testBean, messengerByName.getTestBean());
 	}
 
+	@Test
 	public void testPrototypeScriptFromTag() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("jruby-with-xsd.xml", getClass());
 		ConfigurableMessenger messenger = (ConfigurableMessenger) ctx.getBean("messengerPrototype");
@@ -166,6 +185,7 @@ public class JRubyScriptFactoryTests extends TestCase {
 		assertEquals("Byebye World!", messenger2.getMessage());
 	}
 
+	@Test
 	public void testInlineScriptFromTag() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("jruby-with-xsd.xml", getClass());
 		Calculator calculator = (Calculator) ctx.getBean("calculator");
@@ -173,6 +193,7 @@ public class JRubyScriptFactoryTests extends TestCase {
 		assertFalse(calculator instanceof Refreshable);
 	}
 
+	@Test
 	public void testRefreshableFromTag() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("jruby-with-xsd.xml", getClass());
 		Messenger messenger = (Messenger) ctx.getBean("refreshableMessenger");
@@ -190,6 +211,7 @@ public class JRubyScriptFactoryTests extends TestCase {
 		assertEquals(0, calc.add(2, -2));
 	}
 
+	@Test
 	public void testWithComplexArg() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("jrubyContext.xml", getClass());
 		Printer printer = (Printer) ctx.getBean("printer");
@@ -198,6 +220,7 @@ public class JRubyScriptFactoryTests extends TestCase {
 		assertEquals(1, printable.count);
 	}
 
+	@Test
 	public void testWithPrimitiveArgsInReturnTypeAndParameters() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("jrubyContextForPrimitives.xml", getClass());
 		PrimitiveAdder adder = (PrimitiveAdder) ctx.getBean("adder");
@@ -211,6 +234,7 @@ public class JRubyScriptFactoryTests extends TestCase {
 		assertEquals('c', adder.echo('c'));
 	}
 
+	@Test
 	public void testWithWrapperArgsInReturnTypeAndParameters() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("jrubyContextForWrappers.xml", getClass());
 		WrapperAdder adder = (WrapperAdder) ctx.getBean("adder");
@@ -266,6 +290,7 @@ public class JRubyScriptFactoryTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testAOP() throws Exception {
 		ApplicationContext ctx = new ClassPathXmlApplicationContext("jruby-aop.xml", getClass());
 		Messenger messenger = (Messenger) ctx.getBean("messenger");
diff --git a/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java b/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
index 17272b825a6..d561ac7e7eb 100644
--- a/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/support/ScriptFactoryPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,9 @@
 package org.springframework.scripting.support;
 
 import static org.mockito.Mockito.mock;
-import junit.framework.TestCase;
+
+import org.junit.Before;
+import org.junit.Test;
 
 import org.springframework.beans.FatalBeanException;
 import org.springframework.beans.factory.BeanFactory;
@@ -28,12 +30,17 @@ import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.scripting.Messenger;
 import org.springframework.scripting.ScriptCompilationException;
 import org.springframework.scripting.groovy.GroovyScriptFactory;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
+
+import static org.junit.Assert.*;
 
 /**
  * @author Rick Evans
  * @author Juergen Hoeller
+ * @author Chris Beams
  */
-public class ScriptFactoryPostProcessorTests extends TestCase {
+public class ScriptFactoryPostProcessorTests {
 
 	private static final String MESSAGE_TEXT = "Bingo";
 
@@ -69,11 +76,17 @@ public class ScriptFactoryPostProcessorTests extends TestCase {
 			"  }\n" +
 			"}";
 
+	@Before
+	public void setUp() {
+		Assume.group(TestGroup.PERFORMANCE);
+	}
 
+	@Test
 	public void testDoesNothingWhenPostProcessingNonScriptFactoryTypeBeforeInstantiation() throws Exception {
 		assertNull(new ScriptFactoryPostProcessor().postProcessBeforeInstantiation(getClass(), "a.bean"));
 	}
 
+	@Test
 	public void testThrowsExceptionIfGivenNonAbstractBeanFactoryImplementation() throws Exception {
 		try {
 			new ScriptFactoryPostProcessor().setBeanFactory(mock(BeanFactory.class));
@@ -83,6 +96,7 @@ public class ScriptFactoryPostProcessorTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testChangeScriptWithRefreshableBeanFunctionality() throws Exception {
 		BeanDefinition processorBeanDefinition = createScriptFactoryPostProcessor(true);
 		BeanDefinition scriptedBeanDefinition = createScriptedGroovyBean();
@@ -103,6 +117,7 @@ public class ScriptFactoryPostProcessorTests extends TestCase {
 		assertEquals(EXPECTED_CHANGED_MESSAGE_TEXT, refreshedMessenger.getMessage());
 	}
 
+	@Test
 	public void testChangeScriptWithNoRefreshableBeanFunctionality() throws Exception {
 		BeanDefinition processorBeanDefinition = createScriptFactoryPostProcessor(false);
 		BeanDefinition scriptedBeanDefinition = createScriptedGroovyBean();
@@ -123,6 +138,7 @@ public class ScriptFactoryPostProcessorTests extends TestCase {
 				MESSAGE_TEXT, refreshedMessenger.getMessage());
 	}
 
+	@Test
 	public void testRefreshedScriptReferencePropagatesToCollaborators() throws Exception {
 		BeanDefinition processorBeanDefinition = createScriptFactoryPostProcessor(true);
 		BeanDefinition scriptedBeanDefinition = createScriptedGroovyBean();
@@ -150,6 +166,7 @@ public class ScriptFactoryPostProcessorTests extends TestCase {
 		assertEquals(EXPECTED_CHANGED_MESSAGE_TEXT, collaborator.getMessage());
 	}
 
+	@Test
 	public void testReferencesAcrossAContainerHierarchy() throws Exception {
 		GenericApplicationContext businessContext = new GenericApplicationContext();
 		businessContext.registerBeanDefinition("messenger", BeanDefinitionBuilder.rootBeanDefinition(StubMessenger.class).getBeanDefinition());
@@ -165,11 +182,13 @@ public class ScriptFactoryPostProcessorTests extends TestCase {
 		presentationCtx.refresh();
 	}
 
+	@Test
 	public void testScriptHavingAReferenceToAnotherBean() throws Exception {
 		// just tests that the (singleton) script-backed bean is able to be instantiated with references to its collaborators
 		new ClassPathXmlApplicationContext("org/springframework/scripting/support/groovyReferences.xml");
 	}
 
+	@Test
 	public void testForRefreshedScriptHavingErrorPickedUpOnFirstCall() throws Exception {
 		BeanDefinition processorBeanDefinition = createScriptFactoryPostProcessor(true);
 		BeanDefinition scriptedBeanDefinition = createScriptedGroovyBean();
@@ -200,6 +219,7 @@ public class ScriptFactoryPostProcessorTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testPrototypeScriptedBean() throws Exception {
 		GenericApplicationContext ctx = new GenericApplicationContext();
 		ctx.registerBeanDefinition("messenger", BeanDefinitionBuilder.rootBeanDefinition(StubMessenger.class).getBeanDefinition());
diff --git a/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java b/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java
index 963b0d961ac..db0b50242d1 100644
--- a/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java
+++ b/spring-core/src/test/java/org/springframework/core/type/CachingMetadataReaderLeakTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,8 @@ import org.springframework.core.io.UrlResource;
 import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
 import org.springframework.core.type.classreading.MetadataReader;
 import org.springframework.core.type.classreading.MetadataReaderFactory;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 
 /**
  * Unit test checking the behaviour of {@link CachingMetadataReaderFactory under load.
@@ -47,6 +49,8 @@ public class CachingMetadataReaderLeakTest {
 
 	@Test
 	public void testSignificantLoad() throws Exception {
+		Assume.group(TestGroup.LONG_RUNNING);
+
 		// the biggest public class in the JDK (>60k)
 		URL url = getClass().getResource("/java/awt/Component.class");
 		assertThat(url, notNullValue());
diff --git a/spring-core/src/test/java/org/springframework/tests/TestGroup.java b/spring-core/src/test/java/org/springframework/tests/TestGroup.java
index 638c5b861b5..dcc376eea49 100644
--- a/spring-core/src/test/java/org/springframework/tests/TestGroup.java
+++ b/spring-core/src/test/java/org/springframework/tests/TestGroup.java
@@ -26,12 +26,23 @@ import java.util.Set;
  *
  * @see Assume#group(TestGroup)
  * @author Phillip Webb
+ * @author Chris Beams
  */
 public enum TestGroup {
 
 
 	/**
-	 * Performance related tests that may take a considerable time to run.
+	 * Tests that take a considerable amount of time to run. Any test lasting longer than
+	 * 500ms should be considered a candidate in order to avoid making the overall test
+	 * suite too slow to run during the normal development cycle.
+	 */
+	LONG_RUNNING,
+
+	/**
+	 * Performance-related tests that may fail unpredictably based on CPU profile and load.
+	 * Any test using {@link Thread#sleep}, {@link Object#wait}, Spring's
+	 * {@code StopWatch}, etc. should be considered a candidate as their successful
+	 * execution is likely to be based on events occurring within a given time window.
 	 */
 	PERFORMANCE;
 
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/config/JdbcNamespaceIntegrationTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/config/JdbcNamespaceIntegrationTests.java
index 0238a203bca..c789afa3cd1 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/config/JdbcNamespaceIntegrationTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/config/JdbcNamespaceIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,6 @@
 
 package org.springframework.jdbc.config;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
 import javax.sql.DataSource;
 
 import org.junit.Rule;
@@ -37,10 +32,16 @@ import org.springframework.jdbc.BadSqlGrammarException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseFactoryBean;
 import org.springframework.jdbc.datasource.init.DataSourceInitializer;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
 
 /**
  * @author Dave Syer
  * @author Juergen Hoeller
+ * @author Chris Beams
  */
 public class JdbcNamespaceIntegrationTests {
 
@@ -49,6 +50,8 @@ public class JdbcNamespaceIntegrationTests {
 
 	@Test
 	public void testCreateEmbeddedDatabase() throws Exception {
+		Assume.group(TestGroup.LONG_RUNNING);
+
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"org/springframework/jdbc/config/jdbc-config.xml");
 		assertCorrectSetup(context, "dataSource", "h2DataSource", "derbyDataSource");
@@ -58,6 +61,8 @@ public class JdbcNamespaceIntegrationTests {
 	@Test
 	public void testCreateEmbeddedDatabaseAgain() throws Exception {
 		// If Derby isn't cleaned up properly this will fail...
+		Assume.group(TestGroup.LONG_RUNNING);
+
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
 				"org/springframework/jdbc/config/jdbc-config.xml");
 		assertCorrectSetup(context, "derbyDataSource");
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java
index 4d3a05c2bf8..c02dcbf02de 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/DataSourceTransactionManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,8 @@ import org.mockito.InOrder;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.jdbc.UncategorizedSQLException;
 import org.springframework.jdbc.support.nativejdbc.SimpleNativeJdbcExtractor;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
 import org.springframework.transaction.CannotCreateTransactionException;
 import org.springframework.transaction.IllegalTransactionStateException;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -845,6 +847,8 @@ public class DataSourceTransactionManagerTests  {
 	}
 
 	private void doTestTransactionWithTimeout(int timeout) throws Exception {
+		Assume.group(TestGroup.PERFORMANCE);
+
 		PreparedStatement ps = mock(PreparedStatement.class);
 		given(con.getAutoCommit()).willReturn(true);
 		given(con.prepareStatement("some SQL statement")).willReturn(ps);
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilderTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilderTests.java
index 4aa55573624..8ad40961bf8 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilderTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,15 @@
 
 package org.springframework.jdbc.datasource.embedded;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
-
 import org.springframework.core.io.ClassRelativeResourceLoader;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.init.CannotReadScriptException;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
+
+import static org.junit.Assert.*;
 
 /**
  * @author Keith Donald
@@ -59,6 +61,8 @@ public class EmbeddedDatabaseBuilderTests {
 
 	@Test
 	public void testBuildDerby() {
+		Assume.group(TestGroup.LONG_RUNNING);
+
 		EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder(new ClassRelativeResourceLoader(getClass()));
 		EmbeddedDatabase db = builder.setType(EmbeddedDatabaseType.DERBY).addScript("db-schema-derby.sql").addScript("db-test-data.sql").build();
 		assertDatabaseCreatedAndShutdown(db);
@@ -81,4 +85,4 @@ public class EmbeddedDatabaseBuilderTests {
 		db.shutdown();
 	}
 
-}
\ No newline at end of file
+}

From 44a7e77e6dfc18cb83b1abf52c892b52484fdfe0 Mon Sep 17 00:00:00 2001
From: Chris Beams 
Date: Thu, 3 Jan 2013 14:06:02 +0100
Subject: [PATCH 27/34] Polish support for topic branch-specific versions

Issue: SPR-10124
---
 build.gradle | 62 ++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 48 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index a0882a2fe0a..1f1d23e2c62 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,6 +9,9 @@ buildscript {
 }
 
 configure(allprojects) {
+	group = "org.springframework"
+	version = qualifyVersionIfNecessary(version)
+
 	ext.aspectjVersion  = "1.7.1"
 	ext.easymockVersion = "2.5.2"
 	ext.hsqldbVersion   = "1.8.0.10"
@@ -16,26 +19,41 @@ configure(allprojects) {
 	ext.slf4jVersion    = "1.6.1"
 	ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
 
-	if (rootProject.hasProperty("VERSION_QUALIFIER")) {
-		def qualifier = rootProject.getProperty("VERSION_QUALIFIER")
-		if (qualifier.startsWith("SPR-")) { // topic branch, e.g. SPR-1234
-			// replace 3.2.0.BUILD-SNAPSHOT for 3.2.0.SPR-1234-SNAPSHOT
-			version = version.replace('BUILD', qualifier)
-		}
-	}
-
 	apply plugin: "propdeps"
 	apply plugin: "java"
 	apply plugin: "propdeps-eclipse"
 	apply plugin: "propdeps-idea"
 	apply from: "${gradleScriptDir}/ide.gradle"
 
-	group = "org.springframework"
-
-	sourceCompatibility=1.5
-	targetCompatibility=1.5
-
-	[compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:none"]
+	compileJava {
+		sourceCompatibility=1.5
+		targetCompatibility=1.5
+	}
+	compileTestJava {
+		sourceCompatibility=1.7
+		targetCompatibility=1.7
+	}
+
+	[compileJava, compileTestJava]*.options*.compilerArgs = [
+		"-Xlint:serial",
+		"-Xlint:varargs",
+		"-Xlint:cast",
+		"-Xlint:classfile",
+		"-Xlint:dep-ann",
+		"-Xlint:divzero",
+		"-Xlint:empty",
+		"-Xlint:finally",
+		"-Xlint:overrides",
+		"-Xlint:path",
+		"-Xlint:processing",
+		"-Xlint:static",
+		"-Xlint:try",
+		"-Xlint:-options",     // intentionally disabled
+		"-Xlint:-fallthrough", // intentionally disabled
+		"-Xlint:-rawtypes",    // TODO enable and fix warnings
+		"-Xlint:-deprecation", // TODO enable and fix warnings
+		"-Xlint:-unchecked"    // TODO enable and fix warnings
+	]
 
 	sourceSets.test.resources.srcDirs = ["src/test/resources", "src/test/java"]
 
@@ -898,3 +916,19 @@ configure(rootProject) {
 		}
 	}
 }
+
+/*
+ * Support publication of artifacts versioned by topic branch.
+ * CI builds supply `-P BRANCH_NAME=` to gradle at build time.
+ * If  starts with 'SPR-', change version
+ *     from BUILD-SNAPSHOT => -SNAPSHOT
+ *     e.g. 3.2.1.BUILD-SNAPSHOT => 3.2.1.SPR-1234-SNAPSHOT
+ */
+def qualifyVersionIfNecessary(version) {
+	if (rootProject.hasProperty("BRANCH_NAME")) {
+		def qualifier = rootProject.getProperty("BRANCH_NAME")
+		if (qualifier.startsWith("SPR-")) {
+			version = version.replace('BUILD', qualifier)
+		}
+	}
+}

From 3cbb136861ce6ce6d9bacc2ef4d76d595fcf9a83 Mon Sep 17 00:00:00 2001
From: Chris Beams 
Date: Thu, 3 Jan 2013 14:28:32 +0100
Subject: [PATCH 28/34] Enable execution of TestNG tests in spring-test

Both JUnit- and TestNG-based tests are once again executed in the
spring-test module.

Note that two lines in FailingBeforeAndAfterMethodsTests had to be
commented out. See diff or `git grep 'See SPR-8116'` for details.

Issue: SPR-8116
---
 build.gradle                                                | 4 ++++
 .../context/testng/FailingBeforeAndAfterMethodsTests.java   | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 84c2ce62862..aa96a733e77 100644
--- a/build.gradle
+++ b/build.gradle
@@ -648,6 +648,10 @@ project("spring-webmvc-portlet") {
 
 project("spring-test") {
 	description = "Spring TestContext Framework"
+	test {
+		useJUnit()
+		useTestNG()
+	}
 	dependencies {
 		compile(project(":spring-core"))
 		optional(project(":spring-beans"))
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
index 7a2cb97c8f9..05ba435f9b3 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
@@ -237,7 +237,8 @@ public class FailingBeforeAndAfterMethodsTests {
 
 		@BeforeTransaction
 		public void beforeTransaction() {
-			org.testng.Assert.fail("always failing beforeTransaction()");
+			// See SPR-8116
+			//org.testng.Assert.fail("always failing beforeTransaction()");
 		}
 	}
 
@@ -250,7 +251,8 @@ public class FailingBeforeAndAfterMethodsTests {
 
 		@AfterTransaction
 		public void afterTransaction() {
-			org.testng.Assert.fail("always failing afterTransaction()");
+			// See SPR-8116
+			//org.testng.Assert.fail("always failing afterTransaction()");
 		}
 	}
 

From 7d6161f280af4558ec4ace3aafe29c33a493c72e Mon Sep 17 00:00:00 2001
From: Chris Beams 
Date: Thu, 3 Jan 2013 23:54:52 +0100
Subject: [PATCH 29/34] Use unmodified 'version' when not on a topic branch

---
 build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 1f1d23e2c62..d95c65b8fb0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -928,7 +928,8 @@ def qualifyVersionIfNecessary(version) {
 	if (rootProject.hasProperty("BRANCH_NAME")) {
 		def qualifier = rootProject.getProperty("BRANCH_NAME")
 		if (qualifier.startsWith("SPR-")) {
-			version = version.replace('BUILD', qualifier)
+			return version.replace('BUILD', qualifier)
 		}
 	}
+	return version
 }

From d52f883453ead747a1247e8089c58d68799f4c1d Mon Sep 17 00:00:00 2001
From: Phillip Webb 
Date: Thu, 3 Jan 2013 22:45:20 -0800
Subject: [PATCH 30/34] Add test dependencies sources for testCompile

Update the TestSourceSetDependenciesPlugin to consider testCompile
configurations.
---
 .../build/gradle/TestSourceSetDependenciesPlugin.groovy         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy b/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy
index 363c66c00f4..6cb64212733 100644
--- a/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/springframework/build/gradle/TestSourceSetDependenciesPlugin.groovy
@@ -43,7 +43,7 @@ class TestSourceSetDependenciesPlugin implements Plugin {
 
 	private void collectProjectDependencies(Set projectDependencies,
 			Project project) {
-		for(def configurationName in ["compile", "optional", "provided"]) {
+		for(def configurationName in ["compile", "optional", "provided", "testCompile"]) {
 			Configuration configuration = project.getConfigurations().findByName(configurationName)
 			if(configuration) {
 				configuration.dependencies.findAll { it instanceof ProjectDependency }.each {

From 16a3a8bda82f0c1ecba55f741d872c0e630b1e6e Mon Sep 17 00:00:00 2001
From: Phillip Webb 
Date: Thu, 3 Jan 2013 22:47:11 -0800
Subject: [PATCH 31/34] Polish test sourceSet dependencies

Remove all direct sourceSets.test.output dependencies and instead rely
on the 'test-source-set-dependencies' plugin.

This commit also updates the api JavaDoc task to ensure that
dependencies are not resolved too early.
---
 build.gradle | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index 071fdc3d61b..c1ddba90330 100644
--- a/build.gradle
+++ b/build.gradle
@@ -603,7 +603,6 @@ project("spring-webmvc") {
 		testCompile("commons-io:commons-io:1.3")
 		testCompile("org.hibernate:hibernate-validator:4.3.0.Final")
 		testCompile("org.apache.httpcomponents:httpclient:4.2")
-		testCompile(project(":spring-web").sourceSets.test.output)
 	}
 
 	// pick up DispatcherServlet.properties in src/main
@@ -615,6 +614,7 @@ project("spring-webmvc-tiles3") {
 	merge.into = project(":spring-webmvc")
 	dependencies {
 		compile(project(":spring-context"))
+		compile(project(":spring-web"))
 		provided("javax.el:el-api:1.0")
 		provided("javax.servlet:jstl:1.2")
 		provided("javax.servlet.jsp:jsp-api:2.1")
@@ -633,7 +633,6 @@ project("spring-webmvc-tiles3") {
 			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 		}
 		provided("javax.servlet:javax.servlet-api:3.0.1")
-		compile(project(":spring-web").sourceSets*.output) // mock request & response
 		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 	}
 }
@@ -777,7 +776,6 @@ configure(rootProject) {
 
 	dependencies { // for integration tests
 		testCompile(project(":spring-core"))
-		testCompile(project(":spring-core").sourceSets.test.output)
 		testCompile(project(":spring-beans"))
 		testCompile(project(":spring-aop"))
 		testCompile(project(":spring-expression"))
@@ -813,18 +811,20 @@ configure(rootProject) {
 			project.sourceSets.main.allJava
 		}
 
-		classpath = files(
-			// ensure servlet 3.x and Hibernate 4.x have precedence on the Javadoc
-			// classpath over their respective 2.5 and 3.x variants
-			project(":spring-webmvc").sourceSets.main.compileClasspath.files.find { it =~ "servlet-api" },
-			rootProject.sourceSets.test.compileClasspath.files.find { it =~ "hibernate-core" },
-			// ensure the javadoc process can resolve types compiled from .aj sources
-			project(":spring-aspects").sourceSets.main.output
-		)
-		classpath += files(subprojects.collect { it.sourceSets.main.compileClasspath })
-
 		maxMemory = "1024m"
 		destinationDir = new File(buildDir, "api")
+
+		doFirst {
+			classpath = files(
+				// ensure servlet 3.x and Hibernate 4.x have precedence on the Javadoc
+				// classpath over their respective 2.5 and 3.x variants
+				project(":spring-webmvc").sourceSets.main.compileClasspath.files.find { it =~ "servlet-api" },
+				rootProject.sourceSets.test.compileClasspath.files.find { it =~ "hibernate-core" },
+				// ensure the javadoc process can resolve types compiled from .aj sources
+				project(":spring-aspects").sourceSets.main.output
+			)
+			classpath += files(subprojects.collect { it.sourceSets.main.compileClasspath })
+		}
 	}
 
 	task docsZip(type: Zip) {

From 2a30fa07ea545c5187788825febd6e5eb7460275 Mon Sep 17 00:00:00 2001
From: Phillip Webb 
Date: Wed, 2 Jan 2013 12:43:15 -0800
Subject: [PATCH 32/34] Replace test beans with test objects

Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'.
---
 .../beans/DerivedTestBean.java                |  87 ----
 .../springframework/beans/GenericBean.java    | 237 ----------
 .../org/springframework/beans/ITestBean.java  |  71 ---
 .../beans/IndexedTestBean.java                | 145 ------
 .../springframework/beans/NestedTestBean.java |  61 ---
 .../org/springframework/beans/TestBean.java   | 442 ------------------
 .../core/ConventionsTests.java                |  22 +-
 .../GenericCollectionTypeResolverTests.java   |   6 +-
 ...ableTableParameterNameDiscovererTests.java |  10 +-
 ...ioritizedParameterNameDiscovererTests.java |   4 +-
 .../sample/objects/DerivedTestObject.java}    |  18 +-
 .../sample/objects/GenericObject.java}        |  28 +-
 .../sample/objects/ITestInterface.java}       |  10 +-
 .../sample/objects/ITestObject.java}          |  20 +-
 .../tests/sample/objects/TestObject.java      |  72 +++
 .../tests/sample/objects/package-info.java    |   4 +
 .../util/AutoPopulatingListTests.java         |  24 +-
 .../springframework/util/ClassUtilsTests.java |  30 +-
 .../util/ReflectionUtilsTests.java            |  61 ++-
 .../util/SerializationTestUtils.java          |   4 +-
 20 files changed, 196 insertions(+), 1160 deletions(-)
 delete mode 100644 spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java
 delete mode 100644 spring-core/src/test/java/org/springframework/beans/GenericBean.java
 delete mode 100644 spring-core/src/test/java/org/springframework/beans/ITestBean.java
 delete mode 100644 spring-core/src/test/java/org/springframework/beans/IndexedTestBean.java
 delete mode 100644 spring-core/src/test/java/org/springframework/beans/NestedTestBean.java
 delete mode 100644 spring-core/src/test/java/org/springframework/beans/TestBean.java
 rename spring-core/src/test/java/org/springframework/{beans/CustomEnum.java => tests/sample/objects/DerivedTestObject.java} (70%)
 rename spring-core/src/test/java/org/springframework/{beans/Colour.java => tests/sample/objects/GenericObject.java} (50%)
 rename spring-core/src/test/java/org/springframework/{beans/IOther.java => tests/sample/objects/ITestInterface.java} (80%)
 rename spring-core/src/test/java/org/springframework/{beans/INestedTestBean.java => tests/sample/objects/ITestObject.java} (66%)
 create mode 100644 spring-core/src/test/java/org/springframework/tests/sample/objects/TestObject.java
 create mode 100644 spring-core/src/test/java/org/springframework/tests/sample/objects/package-info.java

diff --git a/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java
deleted file mode 100644
index 70a3fcfe6bb..00000000000
--- a/spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.Serializable;
-
-/**
- * @author Juergen Hoeller
- * @since 21.08.2003
- */
-@SuppressWarnings("serial")
-public class DerivedTestBean extends TestBean implements Serializable {
-
-	private String beanName;
-
-	private boolean initialized;
-
-	private boolean destroyed;
-
-
-	public DerivedTestBean() {
-	}
-
-	public DerivedTestBean(String[] names) {
-		if (names == null || names.length < 2) {
-			throw new IllegalArgumentException("Invalid names array");
-		}
-		setName(names[0]);
-		setBeanName(names[1]);
-	}
-
-	public static DerivedTestBean create(String[] names) {
-		return new DerivedTestBean(names);
-	}
-
-
-	@Override
-	public void setBeanName(String beanName) {
-		if (this.beanName == null || beanName == null) {
-			this.beanName = beanName;
-		}
-	}
-
-	@Override
-	public String getBeanName() {
-		return beanName;
-	}
-
-	public void setSpouseRef(String name) {
-		setSpouse(new TestBean(name));
-	}
-
-
-	public void initialize() {
-		this.initialized = true;
-	}
-
-	public boolean wasInitialized() {
-		return initialized;
-	}
-
-
-	@Override
-	public void destroy() {
-		this.destroyed = true;
-	}
-
-	@Override
-	public boolean wasDestroyed() {
-		return destroyed;
-	}
-
-}
diff --git a/spring-core/src/test/java/org/springframework/beans/GenericBean.java b/spring-core/src/test/java/org/springframework/beans/GenericBean.java
deleted file mode 100644
index c4b85fa1f61..00000000000
--- a/spring-core/src/test/java/org/springframework/beans/GenericBean.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright 2002-2008 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.springframework.core.io.Resource;
-
-/**
- * @author Juergen Hoeller
- */
-public class GenericBean {
-
-	private Set integerSet;
-
-	private List resourceList;
-
-	private List> listOfLists;
-
-	private ArrayList listOfArrays;
-
-	private List> listOfMaps;
-
-	private Map plainMap;
-
-	private Map shortMap;
-
-	private HashMap longMap;
-
-	private Map> collectionMap;
-
-	private Map> mapOfMaps;
-
-	private Map> mapOfLists;
-
-	private CustomEnum customEnum;
-
-	private T genericProperty;
-
-	private List genericListProperty;
-
-
-	public GenericBean() {
-	}
-
-	public GenericBean(Set integerSet) {
-		this.integerSet = integerSet;
-	}
-
-	public GenericBean(Set integerSet, List resourceList) {
-		this.integerSet = integerSet;
-		this.resourceList = resourceList;
-	}
-
-	public GenericBean(HashSet integerSet, Map shortMap) {
-		this.integerSet = integerSet;
-		this.shortMap = shortMap;
-	}
-
-	public GenericBean(Map shortMap, Resource resource) {
-		this.shortMap = shortMap;
-		this.resourceList = Collections.singletonList(resource);
-	}
-
-	public GenericBean(Map plainMap, Map shortMap) {
-		this.plainMap = plainMap;
-		this.shortMap = shortMap;
-	}
-
-	public GenericBean(HashMap longMap) {
-		this.longMap = longMap;
-	}
-
-	public GenericBean(boolean someFlag, Map> collectionMap) {
-		this.collectionMap = collectionMap;
-	}
-
-
-	public Set getIntegerSet() {
-		return integerSet;
-	}
-
-	public void setIntegerSet(Set integerSet) {
-		this.integerSet = integerSet;
-	}
-
-	public List getResourceList() {
-		return resourceList;
-	}
-
-	public void setResourceList(List resourceList) {
-		this.resourceList = resourceList;
-	}
-
-	public List> getListOfLists() {
-		return listOfLists;
-	}
-
-	public ArrayList getListOfArrays() {
-		return listOfArrays;
-	}
-
-	public void setListOfArrays(ArrayList listOfArrays) {
-		this.listOfArrays = listOfArrays;
-	}
-
-	public void setListOfLists(List> listOfLists) {
-		this.listOfLists = listOfLists;
-	}
-
-	public List> getListOfMaps() {
-		return listOfMaps;
-	}
-
-	public void setListOfMaps(List> listOfMaps) {
-		this.listOfMaps = listOfMaps;
-	}
-
-	public Map getPlainMap() {
-		return plainMap;
-	}
-
-	public Map getShortMap() {
-		return shortMap;
-	}
-
-	public void setShortMap(Map shortMap) {
-		this.shortMap = shortMap;
-	}
-
-	public HashMap getLongMap() {
-		return longMap;
-	}
-
-	public void setLongMap(HashMap longMap) {
-		this.longMap = longMap;
-	}
-
-	public Map> getCollectionMap() {
-		return collectionMap;
-	}
-
-	public void setCollectionMap(Map> collectionMap) {
-		this.collectionMap = collectionMap;
-	}
-
-	public Map> getMapOfMaps() {
-		return mapOfMaps;
-	}
-
-	public void setMapOfMaps(Map> mapOfMaps) {
-		this.mapOfMaps = mapOfMaps;
-	}
-
-	public Map> getMapOfLists() {
-		return mapOfLists;
-	}
-
-	public void setMapOfLists(Map> mapOfLists) {
-		this.mapOfLists = mapOfLists;
-	}
-
-	public T getGenericProperty() {
-		return genericProperty;
-	}
-
-	public void setGenericProperty(T genericProperty) {
-		this.genericProperty = genericProperty;
-	}
-
-	public List getGenericListProperty() {
-		return genericListProperty;
-	}
-
-	public void setGenericListProperty(List genericListProperty) {
-		this.genericListProperty = genericListProperty;
-	}
-
-	public CustomEnum getCustomEnum() {
-		return customEnum;
-	}
-
-	public void setCustomEnum(CustomEnum customEnum) {
-		this.customEnum = customEnum;
-	}
-
-
-	public static GenericBean createInstance(Set integerSet) {
-		return new GenericBean(integerSet);
-	}
-
-	public static GenericBean createInstance(Set integerSet, List resourceList) {
-		return new GenericBean(integerSet, resourceList);
-	}
-
-	public static GenericBean createInstance(HashSet integerSet, Map shortMap) {
-		return new GenericBean(integerSet, shortMap);
-	}
-
-	public static GenericBean createInstance(Map shortMap, Resource resource) {
-		return new GenericBean(shortMap, resource);
-	}
-
-	public static GenericBean createInstance(Map map, Map shortMap) {
-		return new GenericBean(map, shortMap);
-	}
-
-	public static GenericBean createInstance(HashMap longMap) {
-		return new GenericBean(longMap);
-	}
-
-	public static GenericBean createInstance(boolean someFlag, Map> collectionMap) {
-		return new GenericBean(someFlag, collectionMap);
-	}
-
-}
\ No newline at end of file
diff --git a/spring-core/src/test/java/org/springframework/beans/ITestBean.java b/spring-core/src/test/java/org/springframework/beans/ITestBean.java
deleted file mode 100644
index cdf5ef510dd..00000000000
--- a/spring-core/src/test/java/org/springframework/beans/ITestBean.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2002-2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.IOException;
-
-/**
- * Interface used for {@link org.springframework.beans.TestBean}.
- *
- * 
Two methods are the same as on Person, but if this
- * extends person it breaks quite a few tests..
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public interface ITestBean {
-
-	int getAge();
-
-	void setAge(int age);
-
-	String getName();
-
-	void setName(String name);
-
-	ITestBean getSpouse();
-
-	void setSpouse(ITestBean spouse);
-
-	ITestBean[] getSpouses();
-
-	String[] getStringArray();
-
-	void setStringArray(String[] stringArray);
-
-	/**
-	 * Throws a given (non-null) exception.
-	 */
-	void exceptional(Throwable t) throws Throwable;
-
-	Object returnsThis();
-
-	INestedTestBean getDoctor();
-
-	INestedTestBean getLawyer();
-
-	IndexedTestBean getNestedIndexedBean();
-
-	/**
-	 * Increment the age by one.
-	 * @return the previous age
-	 */
-	int haveBirthday();
-
-	void unreliableFileOperation() throws IOException;
-
-}
\ No newline at end of file
diff --git a/spring-core/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-core/src/test/java/org/springframework/beans/IndexedTestBean.java
deleted file mode 100644
index ddb091770ee..00000000000
--- a/spring-core/src/test/java/org/springframework/beans/IndexedTestBean.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2002-2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-/**
- * @author Juergen Hoeller
- * @since 11.11.2003
- */
-public class IndexedTestBean {
-
-	private TestBean[] array;
-
-	private Collection collection;
-
-	private List list;
-
-	private Set set;
-
-	private SortedSet sortedSet;
-
-	private Map map;
-
-	private SortedMap sortedMap;
-
-
-	public IndexedTestBean() {
-		this(true);
-	}
-
-	public IndexedTestBean(boolean populate) {
-		if (populate) {
-			populate();
-		}
-	}
-
-	public void populate() {
-		TestBean tb0 = new TestBean("name0", 0);
-		TestBean tb1 = new TestBean("name1", 0);
-		TestBean tb2 = new TestBean("name2", 0);
-		TestBean tb3 = new TestBean("name3", 0);
-		TestBean tb4 = new TestBean("name4", 0);
-		TestBean tb5 = new TestBean("name5", 0);
-		TestBean tb6 = new TestBean("name6", 0);
-		TestBean tb7 = new TestBean("name7", 0);
-		TestBean tbX = new TestBean("nameX", 0);
-		TestBean tbY = new TestBean("nameY", 0);
-		this.array = new TestBean[] {tb0, tb1};
-		this.list = new ArrayList();
-		this.list.add(tb2);
-		this.list.add(tb3);
-		this.set = new TreeSet();
-		this.set.add(tb6);
-		this.set.add(tb7);
-		this.map = new HashMap();
-		this.map.put("key1", tb4);
-		this.map.put("key2", tb5);
-		this.map.put("key.3", tb5);
-		List list = new ArrayList();
-		list.add(tbX);
-		list.add(tbY);
-		this.map.put("key4", list);
-	}
-
-
-	public TestBean[] getArray() {
-		return array;
-	}
-
-	public void setArray(TestBean[] array) {
-		this.array = array;
-	}
-
-	public Collection getCollection() {
-		return collection;
-	}
-
-	public void setCollection(Collection collection) {
-		this.collection = collection;
-	}
-
-	public List getList() {
-		return list;
-	}
-
-	public void setList(List list) {
-		this.list = list;
-	}
-
-	public Set getSet() {
-		return set;
-	}
-
-	public void setSet(Set set) {
-		this.set = set;
-	}
-
-	public SortedSet getSortedSet() {
-		return sortedSet;
-	}
-
-	public void setSortedSet(SortedSet sortedSet) {
-		this.sortedSet = sortedSet;
-	}
-
-	public Map getMap() {
-		return map;
-	}
-
-	public void setMap(Map map) {
-		this.map = map;
-	}
-
-	public SortedMap getSortedMap() {
-		return sortedMap;
-	}
-
-	public void setSortedMap(SortedMap sortedMap) {
-		this.sortedMap = sortedMap;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java
deleted file mode 100644
index 412891c439b..00000000000
--- a/spring-core/src/test/java/org/springframework/beans/NestedTestBean.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-/**
- * Simple nested test bean used for testing bean factories, AOP framework etc.
- *
- * @author Trevor D. Cook
- * @since 30.09.2003
- */
-public class NestedTestBean implements INestedTestBean {
-
-	private String company = "";
-
-	public NestedTestBean() {
-	}
-
-	public NestedTestBean(String company) {
-		setCompany(company);
-	}
-
-	public void setCompany(String company) {
-		this.company = (company != null ? company : "");
-	}
-
-	@Override
-	public String getCompany() {
-		return company;
-	}
-
-	public boolean equals(Object obj) {
-		if (!(obj instanceof NestedTestBean)) {
-			return false;
-		}
-		NestedTestBean ntb = (NestedTestBean) obj;
-		return this.company.equals(ntb.company);
-	}
-
-	public int hashCode() {
-		return this.company.hashCode();
-	}
-
-	public String toString() {
-		return "NestedTestBean: " + this.company;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-core/src/test/java/org/springframework/beans/TestBean.java b/spring-core/src/test/java/org/springframework/beans/TestBean.java
deleted file mode 100644
index 06ad95816db..00000000000
--- a/spring-core/src/test/java/org/springframework/beans/TestBean.java
+++ /dev/null
@@ -1,442 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.springframework.util.ObjectUtils;
-
-/**
- * Simple test bean used for testing bean factories, the AOP framework etc.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @since 15 April 2001
- */
-public class TestBean implements ITestBean, IOther, Comparable {
-
-	private String beanName;
-
-	private String country;
-
-	private boolean postProcessed;
-
-	private String name;
-
-	private String sex;
-
-	private int age;
-
-	private boolean jedi;
-
-	private ITestBean[] spouses;
-
-	private String touchy;
-
-	private String[] stringArray;
-
-	private Integer[] someIntegerArray;
-
-	private Date date = new Date();
-
-	private Float myFloat = new Float(0.0);
-
-	private Collection friends = new LinkedList();
-
-	private Set someSet = new HashSet();
-
-	private Map someMap = new HashMap();
-
-	private List someList = new ArrayList();
-
-	private Properties someProperties = new Properties();
-
-	private INestedTestBean doctor = new NestedTestBean();
-
-	private INestedTestBean lawyer = new NestedTestBean();
-
-	private IndexedTestBean nestedIndexedBean;
-
-	private boolean destroyed;
-
-	private Number someNumber;
-
-	private Colour favouriteColour;
-
-	private Boolean someBoolean;
-
-	private List otherColours;
-
-	private List pets;
-
-
-	public TestBean() {
-	}
-
-	public TestBean(String name) {
-		this.name = name;
-	}
-
-	public TestBean(ITestBean spouse) {
-		this.spouses = new ITestBean[] {spouse};
-	}
-
-	public TestBean(String name, int age) {
-		this.name = name;
-		this.age = age;
-	}
-
-	public TestBean(ITestBean spouse, Properties someProperties) {
-		this.spouses = new ITestBean[] {spouse};
-		this.someProperties = someProperties;
-	}
-
-	public TestBean(List someList) {
-		this.someList = someList;
-	}
-
-	public TestBean(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public TestBean(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public TestBean(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-
-	public void setBeanName(String beanName) {
-		this.beanName = beanName;
-	}
-
-	public String getBeanName() {
-		return beanName;
-	}
-
-	public void setPostProcessed(boolean postProcessed) {
-		this.postProcessed = postProcessed;
-	}
-
-	public boolean isPostProcessed() {
-		return postProcessed;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getSex() {
-		return sex;
-	}
-
-	public void setSex(String sex) {
-		this.sex = sex;
-		if (this.name == null) {
-			this.name = sex;
-		}
-	}
-
-	@Override
-	public int getAge() {
-		return age;
-	}
-
-	@Override
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-	public boolean isJedi() {
-		return jedi;
-	}
-
-	public void setJedi(boolean jedi) {
-		this.jedi = jedi;
-	}
-
-	@Override
-	public ITestBean getSpouse() {
-		return (spouses != null ? spouses[0] : null);
-	}
-
-	@Override
-	public void setSpouse(ITestBean spouse) {
-		this.spouses = new ITestBean[] {spouse};
-	}
-
-	@Override
-	public ITestBean[] getSpouses() {
-		return spouses;
-	}
-
-	public String getTouchy() {
-		return touchy;
-	}
-
-	public void setTouchy(String touchy) throws Exception {
-		if (touchy.indexOf('.') != -1) {
-			throw new Exception("Can't contain a .");
-		}
-		if (touchy.indexOf(',') != -1) {
-			throw new NumberFormatException("Number format exception: contains a ,");
-		}
-		this.touchy = touchy;
-	}
-
-	public String getCountry() {
-		return country;
-	}
-
-	public void setCountry(String country) {
-		this.country = country;
-	}
-
-	@Override
-	public String[] getStringArray() {
-		return stringArray;
-	}
-
-	@Override
-	public void setStringArray(String[] stringArray) {
-		this.stringArray = stringArray;
-	}
-
-	public Integer[] getSomeIntegerArray() {
-		return someIntegerArray;
-	}
-
-	public void setSomeIntegerArray(Integer[] someIntegerArray) {
-		this.someIntegerArray = someIntegerArray;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public Float getMyFloat() {
-		return myFloat;
-	}
-
-	public void setMyFloat(Float myFloat) {
-		this.myFloat = myFloat;
-	}
-
-	public Collection getFriends() {
-		return friends;
-	}
-
-	public void setFriends(Collection friends) {
-		this.friends = friends;
-	}
-
-	public Set getSomeSet() {
-		return someSet;
-	}
-
-	public void setSomeSet(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public Map getSomeMap() {
-		return someMap;
-	}
-
-	public void setSomeMap(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public List getSomeList() {
-		return someList;
-	}
-
-	public void setSomeList(List someList) {
-		this.someList = someList;
-	}
-
-	public Properties getSomeProperties() {
-		return someProperties;
-	}
-
-	public void setSomeProperties(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-	@Override
-	public INestedTestBean getDoctor() {
-		return doctor;
-	}
-
-	public void setDoctor(INestedTestBean doctor) {
-		this.doctor = doctor;
-	}
-
-	@Override
-	public INestedTestBean getLawyer() {
-		return lawyer;
-	}
-
-	public void setLawyer(INestedTestBean lawyer) {
-		this.lawyer = lawyer;
-	}
-
-	public Number getSomeNumber() {
-		return someNumber;
-	}
-
-	public void setSomeNumber(Number someNumber) {
-		this.someNumber = someNumber;
-	}
-
-	public Colour getFavouriteColour() {
-		return favouriteColour;
-	}
-
-	public void setFavouriteColour(Colour favouriteColour) {
-		this.favouriteColour = favouriteColour;
-	}
-
-	public Boolean getSomeBoolean() {
-		return someBoolean;
-	}
-
-	public void setSomeBoolean(Boolean someBoolean) {
-		this.someBoolean = someBoolean;
-	}
-
-	@Override
-	public IndexedTestBean getNestedIndexedBean() {
-		return nestedIndexedBean;
-	}
-
-	public void setNestedIndexedBean(IndexedTestBean nestedIndexedBean) {
-		this.nestedIndexedBean = nestedIndexedBean;
-	}
-
-	public List getOtherColours() {
-		return otherColours;
-	}
-
-	public void setOtherColours(List otherColours) {
-		this.otherColours = otherColours;
-	}
-
-	public List getPets() {
-		return pets;
-	}
-
-	public void setPets(List pets) {
-		this.pets = pets;
-	}
-
-
-	/**
-	 * @see ITestBean#exceptional(Throwable)
-	 */
-	@Override
-	public void exceptional(Throwable t) throws Throwable {
-		if (t != null) {
-			throw t;
-		}
-	}
-
-	@Override
-	public void unreliableFileOperation() throws IOException {
-		throw new IOException();
-	}
-	/**
-	 * @see ITestBean#returnsThis()
-	 */
-	@Override
-	public Object returnsThis() {
-		return this;
-	}
-
-	/**
-	 * @see IOther#absquatulate()
-	 */
-	@Override
-	public void absquatulate() {
-	}
-
-	@Override
-	public int haveBirthday() {
-		return age++;
-	}
-
-
-	public void destroy() {
-		this.destroyed = true;
-	}
-
-	public boolean wasDestroyed() {
-		return destroyed;
-	}
-
-
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (other == null || !(other instanceof TestBean)) {
-			return false;
-		}
-		TestBean tb2 = (TestBean) other;
-		return (ObjectUtils.nullSafeEquals(this.name, tb2.name) && this.age == tb2.age);
-	}
-
-	public int hashCode() {
-		return this.age;
-	}
-
-	@Override
-	public int compareTo(Object other) {
-		if (this.name != null && other instanceof TestBean) {
-			return this.name.compareTo(((TestBean) other).getName());
-		}
-		else {
-			return 1;
-		}
-	}
-
-	public String toString() {
-		return this.name;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-core/src/test/java/org/springframework/core/ConventionsTests.java b/spring-core/src/test/java/org/springframework/core/ConventionsTests.java
index 19d9b264f0d..b906164710c 100644
--- a/spring-core/src/test/java/org/springframework/core/ConventionsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ConventionsTests.java
@@ -23,7 +23,7 @@ import java.util.Set;
 
 import junit.framework.TestCase;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.objects.TestObject;
 
 /**
  * @author Rob Harrop
@@ -31,23 +31,23 @@ import org.springframework.beans.TestBean;
 public class ConventionsTests extends TestCase {
 
 	public void testSimpleObject() {
-		TestBean testBean = new TestBean();
-		assertEquals("Incorrect singular variable name", "testBean", Conventions.getVariableName(testBean));
+		TestObject testObject = new TestObject();
+		assertEquals("Incorrect singular variable name", "testObject", Conventions.getVariableName(testObject));
 	}
 
 	public void testArray() {
-		TestBean[] testBeans = new TestBean[0];
-		assertEquals("Incorrect plural array form", "testBeanList", Conventions.getVariableName(testBeans));
+		TestObject[] testObjects = new TestObject[0];
+		assertEquals("Incorrect plural array form", "testObjectList", Conventions.getVariableName(testObjects));
 	}
 
 	public void testCollections() {
-		List list = new ArrayList();
-		list.add(new TestBean());
-		assertEquals("Incorrect plural List form", "testBeanList", Conventions.getVariableName(list));
+		List list = new ArrayList();
+		list.add(new TestObject());
+		assertEquals("Incorrect plural List form", "testObjectList", Conventions.getVariableName(list));
 
-		Set set = new HashSet();
-		set.add(new TestBean());
-		assertEquals("Incorrect plural Set form", "testBeanList", Conventions.getVariableName(set));
+		Set set = new HashSet();
+		set.add(new TestObject());
+		assertEquals("Incorrect plural Set form", "testObjectList", Conventions.getVariableName(set));
 
 		List emptyList = new ArrayList();
 		try {
diff --git a/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java
index bb70889aaeb..c5982691377 100644
--- a/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java
+++ b/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java
@@ -25,8 +25,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.springframework.beans.GenericBean;
 import org.springframework.core.io.Resource;
+import org.springframework.tests.sample.objects.GenericObject;
 
 /**
  * @author Serge Bogatyrjov
@@ -93,11 +93,11 @@ public class GenericCollectionTypeResolverTests extends AbstractGenericsTests {
 	}
 
 	public void testProgrammaticListIntrospection() throws Exception {
-		Method setter = GenericBean.class.getMethod("setResourceList", List.class);
+		Method setter = GenericObject.class.getMethod("setResourceList", List.class);
 		assertEquals(Resource.class,
 				GenericCollectionTypeResolver.getCollectionParameterType(new MethodParameter(setter, 0)));
 
-		Method getter = GenericBean.class.getMethod("getResourceList");
+		Method getter = GenericObject.class.getMethod("getResourceList");
 		assertEquals(Resource.class,
 				GenericCollectionTypeResolver.getCollectionReturnType(getter));
 	}
diff --git a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
index 0580ae54c28..a1515713792 100644
--- a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
+++ b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
@@ -25,7 +25,7 @@ import java.util.Date;
 import junit.framework.TestCase;
 
 import org.junit.Ignore;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.objects.TestObject;
 
 /**
  * @author Adrian Colyer
@@ -35,14 +35,14 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase {
 	private LocalVariableTableParameterNameDiscoverer discoverer = new LocalVariableTableParameterNameDiscoverer();
 
 	public void testMethodParameterNameDiscoveryNoArgs() throws NoSuchMethodException {
-		Method getName = TestBean.class.getMethod("getName", new Class[0]);
+		Method getName = TestObject.class.getMethod("getName", new Class[0]);
 		String[] names = discoverer.getParameterNames(getName);
 		assertNotNull("should find method info", names);
 		assertEquals("no argument names", 0, names.length);
 	}
 
 	public void testMethodParameterNameDiscoveryWithArgs() throws NoSuchMethodException {
-		Method setName = TestBean.class.getMethod("setName", new Class[] { String.class });
+		Method setName = TestObject.class.getMethod("setName", new Class[] { String.class });
 		String[] names = discoverer.getParameterNames(setName);
 		assertNotNull("should find method info", names);
 		assertEquals("one argument", 1, names.length);
@@ -50,14 +50,14 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase {
 	}
 
 	public void testConsParameterNameDiscoveryNoArgs() throws NoSuchMethodException {
-		Constructor noArgsCons = TestBean.class.getConstructor(new Class[0]);
+		Constructor noArgsCons = TestObject.class.getConstructor(new Class[0]);
 		String[] names = discoverer.getParameterNames(noArgsCons);
 		assertNotNull("should find cons info", names);
 		assertEquals("no argument names", 0, names.length);
 	}
 
 	public void testConsParameterNameDiscoveryArgs() throws NoSuchMethodException {
-		Constructor twoArgCons = TestBean.class.getConstructor(new Class[] { String.class, int.class });
+		Constructor twoArgCons = TestObject.class.getConstructor(new Class[] { String.class, int.class });
 		String[] names = discoverer.getParameterNames(twoArgCons);
 		assertNotNull("should find cons info", names);
 		assertEquals("one argument", 2, names.length);
diff --git a/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java
index eea35b88e6c..cd16ed0446d 100644
--- a/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java
+++ b/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java
@@ -22,7 +22,7 @@ import java.util.Arrays;
 
 import junit.framework.TestCase;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.objects.TestObject;
 
 public class PrioritizedParameterNameDiscovererTests extends TestCase {
 
@@ -56,7 +56,7 @@ public class PrioritizedParameterNameDiscovererTests extends TestCase {
 	private final Class anyClass = Object.class;
 
 	public PrioritizedParameterNameDiscovererTests() throws SecurityException, NoSuchMethodException {
-		anyMethod = TestBean.class.getMethod("getAge", (Class[]) null);
+		anyMethod = TestObject.class.getMethod("getAge", (Class[]) null);
 	}
 
 	public void testNoParametersDiscoverers() {
diff --git a/spring-core/src/test/java/org/springframework/beans/CustomEnum.java b/spring-core/src/test/java/org/springframework/tests/sample/objects/DerivedTestObject.java
similarity index 70%
rename from spring-core/src/test/java/org/springframework/beans/CustomEnum.java
rename to spring-core/src/test/java/org/springframework/tests/sample/objects/DerivedTestObject.java
index 1e43492191b..45ab490a7d8 100644
--- a/spring-core/src/test/java/org/springframework/beans/CustomEnum.java
+++ b/spring-core/src/test/java/org/springframework/tests/sample/objects/DerivedTestObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.beans;
+package org.springframework.tests.sample.objects;
 
-/**
- * @author Juergen Hoeller
- */
-public enum CustomEnum {
-
-	VALUE_1, VALUE_2;
+import java.io.Serializable;
 
-	public String toString() {
-		return "CustomEnum: " + name();
-	}
+@SuppressWarnings("serial")
+public class DerivedTestObject extends TestObject implements Serializable {
 
-}
\ No newline at end of file
+}
diff --git a/spring-core/src/test/java/org/springframework/beans/Colour.java b/spring-core/src/test/java/org/springframework/tests/sample/objects/GenericObject.java
similarity index 50%
rename from spring-core/src/test/java/org/springframework/beans/Colour.java
rename to spring-core/src/test/java/org/springframework/tests/sample/objects/GenericObject.java
index a992a2ebfc6..efd0455fdcb 100644
--- a/spring-core/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-core/src/test/java/org/springframework/tests/sample/objects/GenericObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package org.springframework.beans;
+package org.springframework.tests.sample.objects;
 
-import org.springframework.core.enums.ShortCodedLabeledEnum;
+import java.util.List;
 
-/**
- * @author Rob Harrop
- */
-@SuppressWarnings("serial")
-public class Colour extends ShortCodedLabeledEnum {
+import org.springframework.core.io.Resource;
+
+
+public class GenericObject {
 
-	public static final Colour RED = new Colour(0, "RED");
-	public static final Colour BLUE = new Colour(1, "BLUE");
-	public static final Colour GREEN = new Colour(2, "GREEN");
-	public static final Colour PURPLE = new Colour(3, "PURPLE");
+	private List resourceList;
+
+	public List getResourceList() {
+		return this.resourceList;
+	}
 
-	private Colour(int code, String label) {
-		super(code, label);
+	public void setResourceList(List resourceList) {
+		this.resourceList = resourceList;
 	}
 
 }
diff --git a/spring-core/src/test/java/org/springframework/beans/IOther.java b/spring-core/src/test/java/org/springframework/tests/sample/objects/ITestInterface.java
similarity index 80%
rename from spring-core/src/test/java/org/springframework/beans/IOther.java
rename to spring-core/src/test/java/org/springframework/tests/sample/objects/ITestInterface.java
index d7fb346185a..4aca1f255b2 100644
--- a/spring-core/src/test/java/org/springframework/beans/IOther.java
+++ b/spring-core/src/test/java/org/springframework/tests/sample/objects/ITestInterface.java
@@ -1,6 +1,5 @@
-
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.beans;
+package org.springframework.tests.sample.objects;
+
 
-public interface IOther {
+public interface ITestInterface {
 
 	void absquatulate();
 
-}
\ No newline at end of file
+}
diff --git a/spring-core/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-core/src/test/java/org/springframework/tests/sample/objects/ITestObject.java
similarity index 66%
rename from spring-core/src/test/java/org/springframework/beans/INestedTestBean.java
rename to spring-core/src/test/java/org/springframework/tests/sample/objects/ITestObject.java
index e0ae5f20a3f..ca795cb0c1e 100644
--- a/spring-core/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-core/src/test/java/org/springframework/tests/sample/objects/ITestObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,20 @@
  * limitations under the License.
  */
 
-package org.springframework.beans;
+package org.springframework.tests.sample.objects;
 
-public interface INestedTestBean {
+public interface ITestObject {
 
-	public String getCompany();
+	String getName();
 
-}
\ No newline at end of file
+	void setName(String name);
+
+	int getAge();
+
+	void setAge(int age);
+
+	TestObject getSpouse();
+
+	void setSpouse(TestObject spouse);
+
+}
diff --git a/spring-core/src/test/java/org/springframework/tests/sample/objects/TestObject.java b/spring-core/src/test/java/org/springframework/tests/sample/objects/TestObject.java
new file mode 100644
index 00000000000..68ce8c644b0
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/tests/sample/objects/TestObject.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.tests.sample.objects;
+
+public class TestObject implements ITestObject, ITestInterface, Comparable {
+
+	private String name;
+
+	private int age;
+
+	private TestObject spouse;
+
+	public TestObject() {
+	}
+
+	public TestObject(String name, int age) {
+		this.name = name;
+		this.age = age;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public int getAge() {
+		return this.age;
+	}
+
+	public void setAge(int age) {
+		this.age = age;
+	}
+
+	public TestObject getSpouse() {
+		return this.spouse;
+	}
+
+	public void setSpouse(TestObject spouse) {
+		this.spouse = spouse;
+	}
+
+	@Override
+	public void absquatulate() {
+	}
+
+	@Override
+	public int compareTo(Object o) {
+		if (this.name != null && o instanceof TestObject) {
+			return this.name.compareTo(((TestObject) o).getName());
+		}
+		else {
+			return 1;
+		}
+	}
+}
diff --git a/spring-core/src/test/java/org/springframework/tests/sample/objects/package-info.java b/spring-core/src/test/java/org/springframework/tests/sample/objects/package-info.java
new file mode 100644
index 00000000000..98c15ca647d
--- /dev/null
+++ b/spring-core/src/test/java/org/springframework/tests/sample/objects/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * General purpose sample objects that can be used with tests.
+ */
+package org.springframework.tests.sample.objects;
diff --git a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
index ff97d15d920..460e81b297b 100644
--- a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
+++ b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
@@ -20,7 +20,7 @@ import java.util.LinkedList;
 
 import junit.framework.*;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.objects.TestObject;
 
 /**
  * @author Rob Harrop
@@ -29,11 +29,11 @@ import org.springframework.beans.TestBean;
 public class AutoPopulatingListTests extends TestCase {
 
 	public void testWithClass() throws Exception {
-		doTestWithClass(new AutoPopulatingList(TestBean.class));
+		doTestWithClass(new AutoPopulatingList(TestObject.class));
 	}
 
 	public void testWithClassAndUserSuppliedBackingList() throws Exception {
-		doTestWithClass(new AutoPopulatingList(new LinkedList(), TestBean.class));
+		doTestWithClass(new AutoPopulatingList(new LinkedList(), TestObject.class));
 	}
 
 	public void testWithElementFactory() throws Exception {
@@ -49,7 +49,7 @@ public class AutoPopulatingListTests extends TestCase {
 		for (int x = 0; x < 10; x++) {
 			Object element = list.get(x);
 			assertNotNull("Element is null", list.get(x));
-			assertTrue("Element is incorrect type", element instanceof TestBean);
+			assertTrue("Element is incorrect type", element instanceof TestObject);
 			assertNotSame(lastElement, element);
 			lastElement = element;
 		}
@@ -59,10 +59,10 @@ public class AutoPopulatingListTests extends TestCase {
 		list.add(11, helloWorld);
 		assertEquals(helloWorld, list.get(11));
 
-		assertTrue(list.get(10) instanceof TestBean);
-		assertTrue(list.get(12) instanceof TestBean);
-		assertTrue(list.get(13) instanceof TestBean);
-		assertTrue(list.get(20) instanceof TestBean);
+		assertTrue(list.get(10) instanceof TestObject);
+		assertTrue(list.get(12) instanceof TestObject);
+		assertTrue(list.get(13) instanceof TestObject);
+		assertTrue(list.get(20) instanceof TestObject);
 	}
 
 	private void doTestWithElementFactory(AutoPopulatingList list) {
@@ -70,14 +70,14 @@ public class AutoPopulatingListTests extends TestCase {
 
 		for(int x = 0; x < list.size(); x++) {
 			Object element = list.get(x);
-			if(element instanceof TestBean) {
-				assertEquals(x, ((TestBean) element).getAge());
+			if(element instanceof TestObject) {
+				assertEquals(x, ((TestObject) element).getAge());
 			}
 		}
 	}
 
 	public void testSerialization() throws Exception {
-		AutoPopulatingList list = new AutoPopulatingList(TestBean.class);
+		AutoPopulatingList list = new AutoPopulatingList(TestObject.class);
 		assertEquals(list, SerializationTestUtils.serializeAndDeserialize(list));
 	}
 
@@ -86,7 +86,7 @@ public class AutoPopulatingListTests extends TestCase {
 
 		@Override
 		public Object createElement(int index) {
-			TestBean bean = new TestBean();
+			TestObject bean = new TestObject();
 			bean.setAge(index);
 			return bean;
 		}
diff --git a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
index e8ab8474060..f99216bbbef 100644
--- a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
@@ -28,10 +28,10 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.springframework.beans.DerivedTestBean;
-import org.springframework.beans.IOther;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.objects.DerivedTestObject;
+import org.springframework.tests.sample.objects.ITestInterface;
+import org.springframework.tests.sample.objects.ITestObject;
+import org.springframework.tests.sample.objects.TestObject;
 
 /**
  * @author Colin Sampaleanu
@@ -61,11 +61,11 @@ public class ClassUtilsTests extends TestCase {
 		assertEquals(String[].class, ClassUtils.forName(String[].class.getName(), classLoader));
 		assertEquals(String[][].class, ClassUtils.forName(String[][].class.getName(), classLoader));
 		assertEquals(String[][][].class, ClassUtils.forName(String[][][].class.getName(), classLoader));
-		assertEquals(TestBean.class, ClassUtils.forName("org.springframework.beans.TestBean", classLoader));
-		assertEquals(TestBean[].class, ClassUtils.forName("org.springframework.beans.TestBean[]", classLoader));
-		assertEquals(TestBean[].class, ClassUtils.forName(TestBean[].class.getName(), classLoader));
-		assertEquals(TestBean[][].class, ClassUtils.forName("org.springframework.beans.TestBean[][]", classLoader));
-		assertEquals(TestBean[][].class, ClassUtils.forName(TestBean[][].class.getName(), classLoader));
+		assertEquals(TestObject.class, ClassUtils.forName("org.springframework.tests.sample.objects.TestObject", classLoader));
+		assertEquals(TestObject[].class, ClassUtils.forName("org.springframework.tests.sample.objects.TestObject[]", classLoader));
+		assertEquals(TestObject[].class, ClassUtils.forName(TestObject[].class.getName(), classLoader));
+		assertEquals(TestObject[][].class, ClassUtils.forName("org.springframework.tests.sample.objects.TestObject[][]", classLoader));
+		assertEquals(TestObject[][].class, ClassUtils.forName(TestObject[][].class.getName(), classLoader));
 		assertEquals(short[][][].class, ClassUtils.forName("[[[S", classLoader));
 	}
 
@@ -201,11 +201,11 @@ public class ClassUtilsTests extends TestCase {
 	}
 
 	public void testCountOverloadedMethods() {
-		assertFalse(ClassUtils.hasAtLeastOneMethodWithName(TestBean.class, "foobar"));
+		assertFalse(ClassUtils.hasAtLeastOneMethodWithName(TestObject.class, "foobar"));
 		// no args
-		assertTrue(ClassUtils.hasAtLeastOneMethodWithName(TestBean.class, "hashCode"));
+		assertTrue(ClassUtils.hasAtLeastOneMethodWithName(TestObject.class, "hashCode"));
 		// matches although it takes an arg
-		assertTrue(ClassUtils.hasAtLeastOneMethodWithName(TestBean.class, "setAge"));
+		assertTrue(ClassUtils.hasAtLeastOneMethodWithName(TestObject.class, "setAge"));
 	}
 
 	public void testNoArgsStaticMethod() throws IllegalAccessException, InvocationTargetException {
@@ -260,12 +260,12 @@ public class ClassUtilsTests extends TestCase {
 	}
 
 	public void testGetAllInterfaces() {
-		DerivedTestBean testBean = new DerivedTestBean();
+		DerivedTestObject testBean = new DerivedTestObject();
 		List ifcs = Arrays.asList(ClassUtils.getAllInterfaces(testBean));
 		assertEquals("Correct number of interfaces", 4, ifcs.size());
 		assertTrue("Contains Serializable", ifcs.contains(Serializable.class));
-		assertTrue("Contains ITestBean", ifcs.contains(ITestBean.class));
-		assertTrue("Contains IOther", ifcs.contains(IOther.class));
+		assertTrue("Contains ITestBean", ifcs.contains(ITestObject.class));
+		assertTrue("Contains IOther", ifcs.contains(ITestInterface.class));
 	}
 
 	public void testClassNamesToString() {
diff --git a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
index d0eb51d285b..44025a090f1 100644
--- a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
@@ -35,7 +35,7 @@ import java.util.List;
 
 import org.junit.Ignore;
 import org.junit.Test;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.objects.TestObject;
 
 /**
  * @author Rob Harrop
@@ -47,19 +47,19 @@ public class ReflectionUtilsTests {
 
 	@Test
 	public void findField() {
-		Field field = ReflectionUtils.findField(TestBeanSubclassWithPublicField.class, "publicField", String.class);
+		Field field = ReflectionUtils.findField(TestObjectSubclassWithPublicField.class, "publicField", String.class);
 		assertNotNull(field);
 		assertEquals("publicField", field.getName());
 		assertEquals(String.class, field.getType());
 		assertTrue("Field should be public.", Modifier.isPublic(field.getModifiers()));
 
-		field = ReflectionUtils.findField(TestBeanSubclassWithNewField.class, "prot", String.class);
+		field = ReflectionUtils.findField(TestObjectSubclassWithNewField.class, "prot", String.class);
 		assertNotNull(field);
 		assertEquals("prot", field.getName());
 		assertEquals(String.class, field.getType());
 		assertTrue("Field should be protected.", Modifier.isProtected(field.getModifiers()));
 
-		field = ReflectionUtils.findField(TestBeanSubclassWithNewField.class, "name", String.class);
+		field = ReflectionUtils.findField(TestObjectSubclassWithNewField.class, "name", String.class);
 		assertNotNull(field);
 		assertEquals("name", field.getName());
 		assertEquals(String.class, field.getType());
@@ -68,8 +68,8 @@ public class ReflectionUtilsTests {
 
 	@Test
 	public void setField() {
-		final TestBeanSubclassWithNewField testBean = new TestBeanSubclassWithNewField();
-		final Field field = ReflectionUtils.findField(TestBeanSubclassWithNewField.class, "name", String.class);
+		final TestObjectSubclassWithNewField testBean = new TestObjectSubclassWithNewField();
+		final Field field = ReflectionUtils.findField(TestObjectSubclassWithNewField.class, "name", String.class);
 
 		ReflectionUtils.makeAccessible(field);
 
@@ -83,8 +83,8 @@ public class ReflectionUtilsTests {
 
 	@Test(expected = IllegalStateException.class)
 	public void setFieldIllegal() {
-		final TestBeanSubclassWithNewField testBean = new TestBeanSubclassWithNewField();
-		final Field field = ReflectionUtils.findField(TestBeanSubclassWithNewField.class, "name", String.class);
+		final TestObjectSubclassWithNewField testBean = new TestObjectSubclassWithNewField();
+		final Field field = ReflectionUtils.findField(TestObjectSubclassWithNewField.class, "name", String.class);
 		ReflectionUtils.setField(field, testBean, "FooBar");
 	}
 
@@ -92,11 +92,11 @@ public class ReflectionUtilsTests {
 	public void invokeMethod() throws Exception {
 		String rob = "Rob Harrop";
 
-		TestBean bean = new TestBean();
+		TestObject bean = new TestObject();
 		bean.setName(rob);
 
-		Method getName = TestBean.class.getMethod("getName", (Class[]) null);
-		Method setName = TestBean.class.getMethod("setName", new Class[] { String.class });
+		Method getName = TestObject.class.getMethod("getName", (Class[]) null);
+		Method setName = TestObject.class.getMethod("setName", new Class[] { String.class });
 
 		Object name = ReflectionUtils.invokeMethod(getName, bean);
 		assertEquals("Incorrect name returned", rob, name);
@@ -123,7 +123,7 @@ public class ReflectionUtilsTests {
 
 	@Test
 	public void copySrcToDestinationOfIncorrectClass() {
-		TestBean src = new TestBean();
+		TestObject src = new TestObject();
 		String dest = new String();
 		try {
 			ReflectionUtils.shallowCopyFieldState(src, dest);
@@ -135,7 +135,7 @@ public class ReflectionUtilsTests {
 
 	@Test
 	public void rejectsNullSrc() {
-		TestBean src = null;
+		TestObject src = null;
 		String dest = new String();
 		try {
 			ReflectionUtils.shallowCopyFieldState(src, dest);
@@ -147,7 +147,7 @@ public class ReflectionUtilsTests {
 
 	@Test
 	public void rejectsNullDest() {
-		TestBean src = new TestBean();
+		TestObject src = new TestObject();
 		String dest = null;
 		try {
 			ReflectionUtils.shallowCopyFieldState(src, dest);
@@ -159,15 +159,15 @@ public class ReflectionUtilsTests {
 
 	@Test
 	public void validCopy() {
-		TestBean src = new TestBean();
-		TestBean dest = new TestBean();
+		TestObject src = new TestObject();
+		TestObject dest = new TestObject();
 		testValidCopy(src, dest);
 	}
 
 	@Test
 	public void validCopyOnSubTypeWithNewField() {
-		TestBeanSubclassWithNewField src = new TestBeanSubclassWithNewField();
-		TestBeanSubclassWithNewField dest = new TestBeanSubclassWithNewField();
+		TestObjectSubclassWithNewField src = new TestObjectSubclassWithNewField();
+		TestObjectSubclassWithNewField dest = new TestObjectSubclassWithNewField();
 		src.magic = 11;
 
 		// Will check inherited fields are copied
@@ -180,8 +180,8 @@ public class ReflectionUtilsTests {
 
 	@Test
 	public void validCopyToSubType() {
-		TestBean src = new TestBean();
-		TestBeanSubclassWithNewField dest = new TestBeanSubclassWithNewField();
+		TestObject src = new TestObject();
+		TestObjectSubclassWithNewField dest = new TestObjectSubclassWithNewField();
 		dest.magic = 11;
 		testValidCopy(src, dest);
 		// Should have left this one alone
@@ -190,28 +190,27 @@ public class ReflectionUtilsTests {
 
 	@Test
 	public void validCopyToSubTypeWithFinalField() {
-		TestBeanSubclassWithFinalField src = new TestBeanSubclassWithFinalField();
-		TestBeanSubclassWithFinalField dest = new TestBeanSubclassWithFinalField();
+		TestObjectSubclassWithFinalField src = new TestObjectSubclassWithFinalField();
+		TestObjectSubclassWithFinalField dest = new TestObjectSubclassWithFinalField();
 		// Check that this doesn't fail due to attempt to assign final
 		testValidCopy(src, dest);
 	}
 
-	private void testValidCopy(TestBean src, TestBean dest) {
+	private void testValidCopy(TestObject src, TestObject dest) {
 		src.setName("freddie");
 		src.setAge(15);
-		src.setSpouse(new TestBean());
+		src.setSpouse(new TestObject());
 		assertFalse(src.getAge() == dest.getAge());
 
 		ReflectionUtils.shallowCopyFieldState(src, dest);
 		assertEquals(src.getAge(), dest.getAge());
 		assertEquals(src.getSpouse(), dest.getSpouse());
-		assertEquals(src.getDoctor(), dest.getDoctor());
 	}
 
 	@Test
 	public void doWithProtectedMethods() {
 		ListSavingMethodCallback mc = new ListSavingMethodCallback();
-		ReflectionUtils.doWithMethods(TestBean.class, mc, new ReflectionUtils.MethodFilter() {
+		ReflectionUtils.doWithMethods(TestObject.class, mc, new ReflectionUtils.MethodFilter() {
 			@Override
 			public boolean matches(Method m) {
 				return Modifier.isProtected(m.getModifiers());
@@ -227,7 +226,7 @@ public class ReflectionUtilsTests {
 	@Test
 	public void duplicatesFound() {
 		ListSavingMethodCallback mc = new ListSavingMethodCallback();
-		ReflectionUtils.doWithMethods(TestBeanSubclass.class, mc);
+		ReflectionUtils.doWithMethods(TestObjectSubclass.class, mc);
 		int absquatulateCount = 0;
 		for (String name : mc.getMethodNames()) {
 			if (name.equals("absquatulate")) {
@@ -370,7 +369,7 @@ public class ReflectionUtilsTests {
 		}
 	}
 
-	private static class TestBeanSubclass extends TestBean {
+	private static class TestObjectSubclass extends TestObject {
 
 		@Override
 		public void absquatulate() {
@@ -378,20 +377,20 @@ public class ReflectionUtilsTests {
 		}
 	}
 
-	private static class TestBeanSubclassWithPublicField extends TestBean {
+	private static class TestObjectSubclassWithPublicField extends TestObject {
 
 		@SuppressWarnings("unused")
 		public String publicField = "foo";
 	}
 
-	private static class TestBeanSubclassWithNewField extends TestBean {
+	private static class TestObjectSubclassWithNewField extends TestObject {
 
 		private int magic;
 
 		protected String prot = "foo";
 	}
 
-	private static class TestBeanSubclassWithFinalField extends TestBean {
+	private static class TestObjectSubclassWithFinalField extends TestObject {
 
 		@SuppressWarnings("unused")
 		private final String foo = "will break naive copy that doesn't exclude statics";
diff --git a/spring-core/src/test/java/org/springframework/util/SerializationTestUtils.java b/spring-core/src/test/java/org/springframework/util/SerializationTestUtils.java
index 39a7582e831..0d7fcdd3c45 100644
--- a/spring-core/src/test/java/org/springframework/util/SerializationTestUtils.java
+++ b/spring-core/src/test/java/org/springframework/util/SerializationTestUtils.java
@@ -17,7 +17,7 @@ import java.io.Serializable;
 
 import junit.framework.TestCase;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.objects.TestObject;
 
 /**
  * Utilities for testing serializability of objects.
@@ -64,7 +64,7 @@ public class SerializationTestUtils extends TestCase {
 	}
 
 	public void testWithNonSerializableObject() throws IOException {
-		TestBean o = new TestBean();
+		TestObject o = new TestObject();
 		assertFalse(o instanceof Serializable);
 
 		assertFalse(isSerializable(o));

From 42b5d6dd7edda6121bd87852805471ea53074985 Mon Sep 17 00:00:00 2001
From: Phillip Webb 
Date: Thu, 3 Jan 2013 00:43:48 -0800
Subject: [PATCH 33/34] Remove duplicate test classes

Prior to this commit many test utility classes and sample beans were
duplicated across projects. This was previously necessary due to the
fact that dependent test sources were not shared during a gradle
build. Since the introduction of the 'test-source-set-dependencies'
gradle plugin this is no longer the case.

This commit attempts to remove as much duplicate code as possible,
co-locating test utilities and beans in the most suitable project.
For example, test beans are now located in the 'spring-beans'
project.

Some of the duplicated code had started to drift apart when
modifications made in one project where not ported to others. All
changes have now been consolidated and when necessary existing tests
have been refactored to account for the differences.

Conflicts:
	spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
	spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
	spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
---
 .../AspectJExpressionPointcutTests.java       |  28 +-
 .../BeanNamePointcutMatchingTests.java        |   4 +-
 ...hodInvocationProceedingJoinPointTests.java |   6 +-
 .../TigerAspectJExpressionPointcutTests.java  |   6 +-
 .../aspectj/TypePatternClassFilterTests.java  |  16 +-
 .../AbstractAspectJAdvisorFactoryTests.java   |  10 +-
 .../annotation/ArgumentBindingTests.java      |   6 +-
 .../AspectJPointcutAdvisorTests.java          |   4 +-
 .../annotation/AspectProxyFactoryTests.java   |   8 +-
 .../AspectJNamespaceHandlerTests.java         |   7 +-
 .../AopNamespaceHandlerEventTests-context.xml |   2 +-
 .../config/AopNamespaceHandlerEventTests.java |  11 +-
 ...PointcutErrorTests-pointcutDuplication.xml |   2 +-
 ...dlerPointcutErrorTests-pointcutMissing.xml |   2 +-
 ...AopNamespaceHandlerPointcutErrorTests.java |   4 +-
 .../aop/config/TopLevelAopTagTests.java       |   4 +-
 .../aop/framework/AopProxyUtilsTests.java     |   6 +-
 .../framework/IntroductionBenchmarkTests.java |   6 +-
 .../aop/framework/MethodInvocationTests.java  |   4 +-
 .../aop/framework/PrototypeTargetTests.java   |   4 +-
 .../aop/framework/ProxyFactoryTests.java      |  29 +-
 .../adapter/ThrowsAdviceInterceptorTests.java |  16 +-
 .../ConcurrencyThrottleInterceptorTests.java  |  14 +-
 .../ExposeBeanNameAdvisorsTests.java          |   6 +-
 ...poseInvocationInterceptorTests-context.xml |  12 +-
 .../ExposeInvocationInterceptorTests.java     |   9 +-
 .../aop/scope/ScopedProxyAutowireTests.java   |   4 +-
 .../AbstractRegexpMethodPointcutTests.java    |  11 +-
 .../aop/support/AopUtilsTests.java            |  12 +-
 .../aop/support/ClassFiltersTests.java        |   6 +-
 .../aop/support/ClassUtilsTests.java          |   4 +-
 .../aop/support/ComposablePointcutTests.java  |   4 +-
 .../aop/support/ControlFlowPointcutTests.java |  11 +-
 ...elegatingIntroductionInterceptorTests.java |  25 +-
 .../aop/support/MethodMatchersTests.java      |  15 +-
 .../support/NameMatchMethodPointcutTests.java |  16 +-
 .../aop/support/PointcutsTests.java           |   4 +-
 ...ointcutAdvisorIntegrationTests-context.xml |  22 +-
 ...MethodPointcutAdvisorIntegrationTests.java |  16 +-
 ...monsPoolTargetSourceProxyTests-context.xml |   2 +-
 .../CommonsPoolTargetSourceProxyTests.java    |   7 +-
 .../HotSwappableTargetSourceTests-context.xml |  11 +-
 .../target/HotSwappableTargetSourceTests.java |  14 +-
 ...LazyInitTargetSourceTests-customTarget.xml |   2 +-
 .../LazyInitTargetSourceTests-singleton.xml   |   2 +-
 .../aop/target/LazyInitTargetSourceTests.java |   7 +-
 .../PrototypeBasedTargetSourceTests.java      |  12 +-
 .../PrototypeTargetSourceTests-context.xml    |  16 +-
 .../target/PrototypeTargetSourceTests.java    |   7 +-
 .../ThreadLocalTargetSourceTests-context.xml  |  33 +-
 .../target/ThreadLocalTargetSourceTests.java  |   9 +-
 .../advice/CountingAfterReturningAdvice.java  |   2 +-
 .../aop/advice}/CountingBeforeAdvice.java     |   2 +-
 .../tests/aop}/advice/MethodCounter.java      |   2 +-
 .../tests/aop}/advice/MyThrowsHandler.java    |   2 +-
 .../advice/TimestampIntroductionAdvisor.java  |   4 +-
 .../aop}/interceptor/NopInterceptor.java      |   2 +-
 .../SerializableNopInterceptor.java           |   2 +-
 .../TimestampIntroductionInterceptor.java     |   7 +-
 .../tests/sample}/beans/Person.java           |  12 +-
 .../sample}/beans/SerializablePerson.java     |   2 +-
 .../tests/sample}/beans/subpkg/DeepBean.java  |   2 +-
 .../src/test/java/test/aop/MethodCounter.java |  70 --
 .../test/java/test/aop/NopInterceptor.java    |  58 --
 .../test/aop/SerializableNopInterceptor.java  |  50 -
 .../src/test/java/test/beans/Colour.java      |  36 -
 .../test/java/test/beans/DerivedTestBean.java |  90 --
 .../test/java/test/beans/INestedTestBean.java |  23 -
 .../src/test/java/test/beans/IOther.java      |  24 -
 .../src/test/java/test/beans/ITestBean.java   |  69 --
 .../test/java/test/beans/NestedTestBean.java  |  61 --
 .../java/test/beans/SerializablePerson.java   |  70 --
 .../src/test/java/test/beans/TestBean.java    | 431 --------
 .../CollectingReaderEventListener.java        |  97 --
 .../test/util/SerializationTestUtils.java     | 100 --
 .../src/test/java/test/util/TimeStamped.java  |  34 -
 .../org/springframework/beans/Colour.java     |  36 -
 .../beans/DerivedTestBean.java                |  86 --
 .../org/springframework/beans/IOther.java     |  24 -
 .../org/springframework/beans/ITestBean.java  |  71 --
 .../beans/IndexedTestBean.java                | 145 ---
 .../springframework/beans/NestedTestBean.java |  60 --
 .../org/springframework/beans/TestBean.java   | 437 --------
 .../aspectj/AbstractBeanConfigurerTests.java  |   4 +-
 .../aspectj/beanConfigurerTests-beans.xml     |   2 +-
 .../cache/aspectj/AbstractAnnotationTest.java | 596 -----------
 ...nTest.java => AspectJAnnotationTests.java} |  35 +-
 .../cache/config/DefaultCacheableService.java |  27 +-
 .../CallCountingTransactionManager.java       |  59 --
 .../TransactionAspectTests-context.xml        |   2 +-
 .../aspectj/TransactionAspectTests.java       |   4 +-
 .../ComponentBeanDefinitionParserTest.java    |   5 +-
 .../springframework/beans/BeanUtilsTests.java |   8 +-
 .../beans/BeanWrapperEnumTests.java           |   6 +-
 .../beans/BeanWrapperGenericsTests.java       |  10 +-
 .../beans/BeanWrapperTests.java               |  12 +-
 .../CachedIntrospectionResultsTests.java      |   6 +-
 .../beans/ExtendedBeanInfoTests.java          |   4 +-
 .../factory/BeanFactoryUtilsTests-leaf.xml    |   2 +-
 .../factory/BeanFactoryUtilsTests-middle.xml  |  11 +-
 .../factory/BeanFactoryUtilsTests-root.xml    |  10 +-
 .../beans/factory/BeanFactoryUtilsTests.java  |  12 +-
 .../factory/ConcurrentBeanFactoryTests.java   |   7 +-
 .../DefaultListableBeanFactoryTests.java      |  60 +-
 .../beans/factory/FactoryBeanTests.java       |   4 +-
 .../factory/SharedBeanRegistryTests.java      |   6 +-
 .../beans/factory/access/beans1.xml           |   0
 .../beans/factory/access/beans2.xml           |   0
 ...wiredAnnotationBeanPostProcessorTests.java |  10 +-
 .../CustomAutowireConfigurerTests.java        |   4 +-
 ...njectAnnotationBeanPostProcessorTests.java |  10 +-
 .../config/CustomEditorConfigurerTests.java   |   4 +-
 ...ieldRetrievingFactoryBeanTests-context.xml |   2 +-
 .../FieldRetrievingFactoryBeanTests.java      |   8 +-
 ...ObjectFactoryCreatingFactoryBeanTests.java |   4 +-
 .../config/PropertiesFactoryBeanTests.java    |   4 +-
 .../PropertyPathFactoryBeanTests-context.xml  |  14 +-
 .../config/PropertyPathFactoryBeanTests.java  |   8 +-
 .../PropertyPlaceholderConfigurerTests.java   |   4 +-
 .../PropertyResourceConfigurerTests.java      |   8 +-
 .../config/SimpleScopeTests-context.xml       |   2 +-
 .../factory/config/SimpleScopeTests.java      |   6 +-
 .../CustomProblemReporterTests-context.xml    |   8 +-
 .../parsing/CustomProblemReporterTests.java   |   6 +-
 .../support/BeanDefinitionBuilderTests.java   |   4 +-
 .../factory/support/BeanDefinitionTests.java  |   4 +-
 .../support/BeanFactoryGenericsTests.java     |  13 +-
 ...DefinitionMetadataEqualsHashCodeTests.java |   4 +-
 .../PropertiesBeanDefinitionReaderTests.java  |   4 +-
 .../factory/support/genericBeanTests.xml      |   6 +-
 .../wiring/BeanConfigurerSupportTests.java    |   4 +-
 .../factory/xml/AbstractBeanFactoryTests.java |  39 +-
 .../xml/AbstractListableBeanFactoryTests.java |   8 +-
 .../xml/AutowireWithExclusionTests.java       |   4 +-
 .../factory/xml/CollectionMergingTests.java   |   4 +-
 .../xml/CollectionsWithDefaultTypesTests.java |   4 +-
 .../xml/ConstructorDependenciesBean.java      |   7 +-
 .../beans/factory/xml/CountingFactory.java    |   4 +-
 .../beans/factory/xml/DummyReferencer.java    |   6 +-
 ...uplicateBeanIdTests-multiLevel-context.xml |   4 +-
 ...DuplicateBeanIdTests-sameLevel-context.xml |   4 +-
 .../factory/xml/DuplicateBeanIdTests.java     |   4 +-
 .../factory/xml/EventPublicationTests.java    |   3 +-
 .../beans/factory/xml/FactoryMethodTests.java |   4 +-
 .../beans/factory/xml/FactoryMethods.java     |   5 +-
 .../beans/factory/xml/InstanceFactory.java    |   4 +-
 ...edBeansElementAttributeRecursionTests.java |   4 +-
 .../factory/xml/SchemaValidationTests.java    |   4 +-
 ...impleConstructorNamespaceHandlerTests.java |   6 +-
 .../SimplePropertyNamespaceHandlerTests.java  |   6 +-
 .../beans/factory/xml/TestBeanCreator.java    |   4 +-
 .../xml/UtilNamespaceHandlerTests.java        |   7 +-
 .../factory/xml/XmlBeanCollectionTests.java   |  98 +-
 .../xml/XmlBeanDefinitionReaderTests.java     |   4 +-
 .../xml/XmlListableBeanFactoryTests.java      |  10 +-
 .../propertyeditors/CustomEditorTests.java    |  16 +-
 .../beans/support/PagedListHolderTests.java   |  11 +-
 .../beans}/CollectingReaderEventListener.java |   2 +-
 .../tests/sample}/beans/BooleanTestBean.java  |   2 +-
 .../tests/sample}/beans/Colour.java           |   2 +-
 .../tests/sample}/beans/CountingTestBean.java |   6 +-
 .../tests/sample}/beans/CustomEnum.java       |   2 +-
 .../sample/beans}/DependenciesBean.java       |   4 +-
 .../tests/sample}/beans/DerivedTestBean.java  |   2 +-
 .../tests/sample}/beans/DummyBean.java        |   2 +-
 .../tests/sample}/beans/DummyFactory.java     |   3 +-
 .../tests/sample}/beans/GenericBean.java      |  17 +-
 .../sample}/beans/GenericIntegerBean.java     |   2 +-
 .../beans/GenericSetOfIntegerBean.java        |   2 +-
 .../tests/sample/beans}/HasMap.java           |  24 +-
 .../tests/sample}/beans/INestedTestBean.java  |   2 +-
 .../tests/sample}/beans/IOther.java           |   2 +-
 .../tests/sample}/beans/ITestBean.java        |   8 +-
 .../tests/sample}/beans/IndexedTestBean.java  |   2 +-
 .../tests/sample}/beans/LifecycleBean.java    |   2 +-
 .../sample/beans}/MustBeInitialized.java      |   4 +-
 .../tests/sample}/beans/NestedTestBean.java   |   2 +-
 .../tests/sample}/beans/NumberTestBean.java   |   2 +-
 .../beans/PackageLevelVisibleBean.java        |   2 +-
 .../tests/sample}/beans/Pet.java              |   2 +-
 .../tests/sample}/beans/SideEffectBean.java   |   2 +-
 .../tests/sample}/beans/TestBean.java         |  48 +-
 .../sample}/beans/factory/DummyFactory.java   |  20 +-
 .../tests/sample/beans/package-info.java      |   4 +
 .../util/SerializationTestUtils.java          |  65 --
 .../src/test/java/test/beans/Colour.java      |  36 -
 .../src/test/java/test/beans/CustomEnum.java  |  30 -
 .../test/java/test/beans/INestedTestBean.java |  23 -
 .../src/test/java/test/beans/ITestBean.java   |  71 --
 .../src/test/java/test/beans/TestBean.java    | 457 ---------
 .../java/test/util/TestResourceUtils.java     |  46 -
 .../support/multiConstructorArgs.properties   |   4 +-
 .../support/refConstructorArg.properties      |   6 +-
 .../support/simpleConstructorArg.properties   |   4 +-
 ...tAttributeRecursionTests-merge-context.xml |   2 +-
 .../autowire-constructor-with-exclusion.xml   |   4 +-
 .../factory/xml/autowire-with-exclusion.xml   |   4 +-
 .../factory/xml/autowire-with-inclusion.xml   |   4 +-
 .../xml/autowire-with-selective-inclusion.xml |   4 +-
 .../beans/factory/xml/beanEvents.xml          |   8 +-
 .../beans/factory/xml/collectionMerging.xml   |  28 +-
 .../beans/factory/xml/collections.xml         |  78 +-
 .../xml/collectionsWithDefaultTypes.xml       |   4 +-
 .../beans/factory/xml/factory-methods.xml     |   4 +-
 .../beans/factory/xml/schemaValidated.xml     |  10 +-
 ...simpleConstructorNamespaceHandlerTests.xml |  22 +-
 ...tructorNamespaceHandlerTestsWithErrors.xml |   2 +-
 .../simplePropertyNamespaceHandlerTests.xml   |  10 +-
 ...ropertyNamespaceHandlerTestsWithErrors.xml |   4 +-
 .../beans/factory/xml/test.xml                |  32 +-
 .../beans/factory/xml/testUtilNamespace.xml   |  18 +-
 .../beans/factory/xml/validateWithDtd.xml     |   2 +-
 .../beans/factory/xml/validateWithXsd.xml     |   2 +-
 .../beans/factory/xml/withMeta.xml            |   6 +-
 .../beans/INestedTestBean.java                |  23 -
 .../org/springframework/beans/IOther.java     |  24 -
 .../org/springframework/beans/ITestBean.java  |  71 --
 .../beans/IndexedTestBean.java                | 145 ---
 .../springframework/beans/NestedTestBean.java |  61 --
 .../org/springframework/beans/TestBean.java   | 457 ---------
 .../scheduling/TestMethodInvokingTask.java    |  52 -
 .../scheduling/quartz/QuartzSupportTests.java |   4 +-
 .../aop/aspectj/AfterAdviceBindingTests.java  |   6 +-
 .../aop/aspectj/AfterAdviceBindingTests.xml   |   2 +-
 .../AfterReturningAdviceBindingTests.java     |   6 +-
 .../AfterReturningAdviceBindingTests.xml      |   4 +-
 .../AfterThrowingAdviceBindingTests.java      |   4 +-
 .../AfterThrowingAdviceBindingTests.xml       |   2 +-
 .../aop/aspectj/AroundAdviceBindingTests.java |   6 +-
 .../aop/aspectj/AroundAdviceBindingTests.xml  |   2 +-
 .../aop/aspectj/AroundAdviceCircularTests.xml |   4 +-
 .../AspectAndAdvicePrecedenceTests.java       |   4 +-
 .../AspectAndAdvicePrecedenceTests.xml        |   2 +-
 ...AspectJExpressionPointcutAdvisorTests.java |   4 +-
 .../AspectJExpressionPointcutAdvisorTests.xml |   4 +-
 .../BeanNamePointcutAtAspectTests.java        |   6 +-
 .../aspectj/BeanNamePointcutAtAspectTests.xml |  10 +-
 .../aop/aspectj/BeanNamePointcutTests.java    |   4 +-
 .../aop/aspectj/BeanNamePointcutTests.xml     |  12 +-
 .../aop/aspectj/BeforeAdviceBindingTests.java |   6 +-
 .../aop/aspectj/BeforeAdviceBindingTests.xml  |   2 +-
 .../aop/aspectj/DeclareParentsTests.java      |   4 +-
 .../aop/aspectj/DeclareParentsTests.xml       |   6 +-
 ...licitJPArgumentMatchingAtAspectJTests.java |   6 +-
 ...plicitJPArgumentMatchingAtAspectJTests.xml |   2 +-
 .../ImplicitJPArgumentMatchingTests.xml       |   4 +-
 .../OverloadedAdviceTests-ambiguous.xml       |   2 +-
 .../aop/aspectj/OverloadedAdviceTests.xml     |   2 +-
 ...pectImplementingInterfaceTests-context.xml |   2 +-
 .../AspectImplementingInterfaceTests.java     |   4 +-
 ...xyCreatorAndLazyInitTargetSourceTests.java |   6 +-
 .../AspectJAutoProxyCreatorTests-aspects.xml  |   4 +-
 ...toProxyCreatorTests-aspectsPlusAdvisor.xml |   6 +-
 ...xyCreatorTests-aspectsWithAbstractBean.xml |   2 +-
 ...oProxyCreatorTests-aspectsWithOrdering.xml |   2 +-
 ...AspectJAutoProxyCreatorTests-pertarget.xml |   4 +-
 .../AspectJAutoProxyCreatorTests-perthis.xml  |   2 +-
 ...JAutoProxyCreatorTests-twoAdviceAspect.xml |   2 +-
 ...yCreatorTests-twoAdviceAspectPrototype.xml |   2 +-
 ...pectJAutoProxyCreatorTests-usesInclude.xml |   2 +-
 ...oProxyCreatorTests-usesJoinPointAspect.xml |   2 +-
 .../AspectJAutoProxyCreatorTests.java         |  11 +-
 .../AtAspectJAfterThrowingTests-context.xml   |   2 +-
 .../AtAspectJAfterThrowingTests.java          |   6 +-
 .../benchmark/BenchmarkTests-aspectj.xml      |   2 +-
 .../benchmark/BenchmarkTests-springAop.xml    |   2 +-
 .../autoproxy/benchmark/BenchmarkTests.java   |   4 +-
 ...fterReturningGenericTypeMatchingTests.java |   6 +-
 ...pNamespaceHandlerAdviceTypeTests-error.xml |   6 +-
 .../AopNamespaceHandlerAdviceTypeTests-ok.xml |   6 +-
 ...AopNamespaceHandlerArgNamesTests-error.xml |   6 +-
 .../AopNamespaceHandlerArgNamesTests-ok.xml   |   6 +-
 ...ceHandlerProxyTargetClassTests-context.xml |   6 +-
 ...NamespaceHandlerProxyTargetClassTests.java |   4 +-
 ...opNamespaceHandlerReturningTests-error.xml |   6 +-
 .../AopNamespaceHandlerReturningTests-ok.xml  |   6 +-
 .../AopNamespaceHandlerTests-context.xml      |   6 +-
 .../aop/config/AopNamespaceHandlerTests.java  |  14 +-
 ...AopNamespaceHandlerThrowingTests-error.xml |   6 +-
 .../AopNamespaceHandlerThrowingTests-ok.xml   |   6 +-
 .../config/PrototypeProxyTests-context.xml    |  10 +-
 .../aop/framework/AbstractAopProxyTests.java  |  47 +-
 .../aop/framework/CglibProxyTests.java        |  21 +-
 .../aop/framework/JdkDynamicProxyTests.java   |   8 +-
 .../ProxyFactoryBeanTests-autowiring.xml      |   4 +-
 .../ProxyFactoryBeanTests-context.xml         |  66 +-
 ...xyFactoryBeanTests-double-targetsource.xml |  10 +-
 .../ProxyFactoryBeanTests-frozen.xml          |  24 +-
 ...roxyFactoryBeanTests-inner-bean-target.xml |  23 +-
 .../ProxyFactoryBeanTests-invalid.xml         |   4 +-
 ...yFactoryBeanTests-notlast-targetsource.xml |   6 +-
 .../ProxyFactoryBeanTests-prototype.xml       |   6 +-
 .../ProxyFactoryBeanTests-serialization.xml   |  20 +-
 .../ProxyFactoryBeanTests-targetsource.xml    |  34 +-
 .../ProxyFactoryBeanTests-throws-advice.xml   |  20 +-
 .../aop/framework/ProxyFactoryBeanTests.java  |  20 +-
 ...visorAdapterRegistrationTests-with-bpp.xml |   4 +-
 ...orAdapterRegistrationTests-without-bpp.xml |   4 +-
 .../AdvisorAdapterRegistrationTests.java      |   4 +-
 ...oProxyCreatorTests-common-interceptors.xml |   6 +-
 ...oProxyCreatorTests-custom-targetsource.xml |  16 +-
 ...AdvisorAutoProxyCreatorTests-optimized.xml |   4 +-
 ...toProxyCreatorTests-quick-targetsource.xml |  10 +-
 .../AdvisorAutoProxyCreatorTests.java         |  26 +-
 .../autoproxy/AutoProxyCreatorTests.java      |  10 +-
 ...nNameAutoProxyCreatorInitTests-context.xml |   2 +-
 .../BeanNameAutoProxyCreatorInitTests.java    |   4 +-
 .../BeanNameAutoProxyCreatorTests-context.xml |  26 +-
 .../BeanNameAutoProxyCreatorTests.java        |  19 +-
 .../aop/scope/ScopedProxyTests-list.xml       |   2 +-
 .../aop/scope/ScopedProxyTests-override.xml   |   2 +-
 .../aop/scope/ScopedProxyTests-testbean.xml   |   2 +-
 .../aop/scope/ScopedProxyTests.java           |   8 +-
 .../CommonsPoolTargetSourceTests-context.xml  |   8 +-
 .../target/CommonsPoolTargetSourceTests.java  |   8 +-
 .../org/springframework/beans/Colour.java     |  36 -
 .../beans/DerivedTestBean.java                |  90 --
 .../beans/FieldAccessBean.java                |  44 -
 .../beans/INestedTestBean.java                |  23 -
 .../org/springframework/beans/IOther.java     |  24 -
 .../org/springframework/beans/ITestBean.java  |  71 --
 .../beans/IndexedTestBean.java                | 146 ---
 .../springframework/beans/NestedTestBean.java |  61 --
 .../org/springframework/beans/Person.java     |  36 -
 .../beans/SerializablePerson.java             |  70 --
 .../factory/AbstractBeanFactoryTests.java     | 329 ------
 .../AbstractListableBeanFactoryTests.java     |  84 --
 .../beans/factory/LifecycleBean.java          | 164 ---
 .../SingletonBeanFactoryLocatorTests.java     | 182 ----
 .../beans/factory/access/TestBean.java        |  75 --
 .../beans/factory/access/ref1.xml             |  28 -
 .../CollectingReaderEventListener.java        |  89 --
 .../beans/factory/xml/DependenciesBean.java   |  77 --
 ...MethodWrappedByCglibProxyTests-context.xml |   2 +-
 .../LookupMethodWrappedByCglibProxyTests.java |   4 +-
 ...aceHandlerWithExpressionLanguageTests.java |   4 +-
 .../factory/xml/XmlBeanFactoryTestTypes.java  |  10 +-
 .../xml/XmlBeanFactoryTests-autowire.xml      |  12 +-
 .../factory/xml/XmlBeanFactoryTests-child.xml |   6 +-
 .../xml/XmlBeanFactoryTests-collections.xml   |  74 +-
 ...lBeanFactoryTests-complexFactoryCircle.xml |   8 +-
 .../XmlBeanFactoryTests-constructorArg.xml    |  12 +-
 ...lBeanFactoryTests-constructorOverrides.xml |   2 +-
 .../XmlBeanFactoryTests-defaultAutowire.xml   |   8 +-
 .../XmlBeanFactoryTests-defaultLazyInit.xml   |   2 +-
 ...mlBeanFactoryTests-delegationOverrides.xml |   4 +-
 .../xml/XmlBeanFactoryTests-factoryCircle.xml |   2 +-
 .../xml/XmlBeanFactoryTests-initializers.xml  |   2 +-
 .../xml/XmlBeanFactoryTests-invalid.xml       |  13 +-
 ...toryTests-invalidOverridesNoSuchMethod.xml |   2 +-
 ...nFactoryTests-localCollectionsUsingXsd.xml |   2 +-
 .../xml/XmlBeanFactoryTests-overrides.xml     |  16 +-
 .../xml/XmlBeanFactoryTests-parent.xml        |   6 +-
 .../xml/XmlBeanFactoryTests-reftypes.xml      |  72 +-
 .../xml/XmlBeanFactoryTests-resource.xml      |   2 +-
 .../XmlBeanFactoryTests-resourceImport.xml    |   2 +-
 ...lBeanFactoryTests-satisfiedAllDepCheck.xml |   4 +-
 ...anFactoryTests-satisfiedObjectDepCheck.xml |   4 +-
 ...anFactoryTests-satisfiedSimpleDepCheck.xml |   2 +-
 ...toryTests-testWithDuplicateNameInAlias.xml |   4 +-
 ...eanFactoryTests-testWithDuplicateNames.xml |   4 +-
 ...s-unsatisfiedAllDepCheckMissingObjects.xml |   2 +-
 ...ts-unsatisfiedAllDepCheckMissingSimple.xml |   4 +-
 ...FactoryTests-unsatisfiedObjectDepCheck.xml |   2 +-
 ...FactoryTests-unsatisfiedSimpleDepCheck.xml |   2 +-
 .../factory/xml/XmlBeanFactoryTests.java      |  15 +-
 .../CustomNamespaceHandlerTests-context.xml   |   8 +-
 .../support/CustomNamespaceHandlerTests.java  |  25 +-
 .../AbstractApplicationContextTests.java      |   8 +-
 .../context/LifecycleContextBean.java         |   4 +-
 ...ndiBeanFactoryLocatorTests-collections.xml |  74 +-
 ...textJndiBeanFactoryLocatorTests-parent.xml |   6 +-
 .../ContextJndiBeanFactoryLocatorTests.java   |   4 +-
 .../AbstractCircularImportDetectionTests.java |   4 +-
 .../AnnotationProcessorPerformanceTests.java  |   6 +-
 .../ClassPathBeanDefinitionScannerTests.java  |   4 +-
 ...PathFactoryBeanDefinitionScannerTests.java |   6 +-
 ...ommonAnnotationBeanPostProcessorTests.java |  12 +-
 ...mponentScanAnnotationIntegrationTests.java |   4 +-
 .../ComponentScanParserScopedProxyTests.java  |   4 +-
 .../ConfigurationClassAndBFPPTests.java       |   4 +-
 ...nClassPostConstructAndAutowiringTests.java |   4 +-
 .../ConfigurationClassPostProcessorTests.java |   4 +-
 .../FooServiceDependentConverter.java         |   8 +-
 .../NestedConfigurationClassTests.java        |   4 +-
 .../PropertySourceAnnotationTests.java        |   4 +-
 .../componentscan/level1/Level1Config.java    |   4 +-
 .../componentscan/level2/Level2Config.java    |   4 +-
 .../AutowiredConfigurationTests.java          |   6 +-
 .../BeanMethodQualificationTests.java         |   4 +-
 ...figurationClassAspectIntegrationTests.java |   8 +-
 .../ConfigurationClassProcessingTests.java    |   6 +-
 ...assWithPlaceholderConfigurerBeanTests.java |   6 +-
 .../ConfigurationMetaAnnotationTests.java     |   4 +-
 .../ImportAnnotationDetectionTests.java       |   4 +-
 ...ortNonXmlResourceConfig-context.properties |   2 +-
 .../configuration/ImportResourceTests.java    |   6 +-
 .../annotation/configuration/ImportTests.java |   6 +-
 .../configuration/ImportXmlConfig-context.xml |   2 +-
 .../ImportXmlWithAopNamespace-context.xml     |   2 +-
 ...tedConfigurationClassEnhancementTests.java |   4 +-
 .../configuration/ScopingTests.java           |   6 +-
 .../annotation4/FactoryMethodComponent.java   |   4 +-
 .../context/annotation4/SimpleBean.java       |   4 +-
 .../annotation6/ConfigForScanning.java        |   2 +-
 .../event/ApplicationContextEventTests.java   |   4 +-
 .../EventPublicationInterceptorTests.java     |   6 +-
 .../ApplicationContextExpressionTests.java    |   4 +-
 .../EnvironmentAccessorIntegrationTests.java  |   4 +-
 .../BeanFactoryPostProcessorTests.java        |   4 +-
 ...athXmlApplicationContextTests-resource.xml |   2 +-
 ...ApplicationContextTests-resourceImport.xml |   2 +-
 .../ClassPathXmlApplicationContextTests.java  |   4 +-
 .../ConversionServiceFactoryBeanTests.java    |   4 +-
 ...rtyResourceConfigurerIntegrationTests.java |   4 +-
 ...ertySourcesPlaceholderConfigurerTests.java |   4 +-
 .../support/SimpleThreadScopeTest.java        |   4 +-
 ...ticApplicationContextMulticasterTests.java |   4 +-
 .../StaticApplicationContextTests.java        |   4 +-
 .../support/StaticMessageSourceTests.java     |   6 +-
 .../context/support/conversionService.xml     |   2 +-
 ...onversionServiceWithResourceOverriding.xml |   2 +-
 .../context/support/testBeans.properties      |  20 +-
 .../config/JeeNamespaceHandlerEventTests.java |   4 +-
 .../ejb/config/JeeNamespaceHandlerTests.java  |   6 +-
 .../ejb/config/jeeNamespaceHandlerTests.xml   |  14 +-
 .../jmx/export/MBeanExporterTests.java        |   7 +-
 .../AbstractMetadataAssemblerTests.java       |   5 +-
 .../export/propertyPlaceholderConfigurer.xml  |   2 +-
 .../jndi/JndiObjectFactoryBeanTests.java      |  12 +-
 .../jndi/JndiPropertySourceTests.java         |   4 +-
 .../jndi/SimpleNamingContextTests.java        |   6 +-
 .../mock/env/MockPropertySource.java          | 104 --
 .../mock/jndi/ExpectedLookupTemplate.java     |  82 --
 .../mock/jndi/SimpleNamingContextBuilder.java | 237 -----
 .../mock/jndi/package-info.java               |  10 -
 .../scheduling/timer/TimerSupportTests.java   |   4 +-
 .../scripting/ContextScriptBean.java          |   4 +-
 .../scripting/TestBeanAwareMessenger.java     |   4 +-
 .../scripting/bsh/BshScriptFactoryTests.java  |   4 +-
 .../scripting/bsh/MessengerImpl.bsh           |   2 +-
 .../scripting/bsh/bsh-with-xsd.xml            |   2 +-
 .../groovy/GroovyScriptFactoryTests.java      |   2 +-
 .../scripting/groovy/ScriptBean.groovy        |   2 +-
 .../groovy/groovy-multiple-properties.xml     |   2 +-
 ...tFactoryTests-beanNameAutoProxyCreator.xml |   2 +-
 ...sedJRubyScriptFactoryTests-factoryBean.xml |   2 +-
 .../jruby/AdvisedJRubyScriptFactoryTests.java |   5 +-
 .../jruby/JRubyScriptFactoryTests.java        |   2 +-
 .../scripting/jruby/jruby-with-xsd.xml        |   2 +-
 .../context}/SimpleMapScope.java              |   3 +-
 .../context}/TestMethodInvokingTask.java      |   2 +-
 .../mock/jndi/ExpectedLookupTemplate.java     |   2 +-
 .../mock/jndi/SimpleNamingContext.java        |   4 +-
 .../mock/jndi/SimpleNamingContextBuilder.java |   2 +-
 .../tests/mock/jndi/package-info.java         |  23 +-
 .../sample}/beans/BeanWithObjectProperty.java |   2 +-
 .../tests/sample}/beans/Employee.java         |   4 +-
 .../tests/sample}/beans/FactoryMethods.java   |   2 +-
 .../tests/sample}/beans/FieldAccessBean.java  |   2 +-
 .../sample}/beans/ResourceTestBean.java       |   2 +-
 .../org/springframework/ui/ModelMapTests.java |   4 +-
 .../util/SerializationTestUtils.java          |  65 --
 .../DataBinderFieldAccessTests.java           |   6 +-
 .../validation/DataBinderTests.java           |  36 +-
 .../DefaultMessageCodesResolverTests.java     |  16 +-
 .../validation/ValidationUtilsTests.java      |   4 +-
 .../BeanValidationPostProcessorTests.java     |   4 +-
 .../advice/CountingAfterReturningAdvice.java  |  36 -
 .../test/advice/CountingBeforeAdvice.java     |  36 -
 .../test/java/test/advice/MethodCounter.java  |  70 --
 .../src/test/java/test/beans/Colour.java      |  37 -
 .../src/test/java/test/beans/CustomScope.java |  74 --
 .../java/test/beans/DependsOnTestBean.java    |  36 -
 .../test/java/test/beans/INestedTestBean.java |  22 -
 .../src/test/java/test/beans/IOther.java      |  22 -
 .../src/test/java/test/beans/ITestBean.java   |  62 --
 .../test/java/test/beans/IndexedTestBean.java | 143 ---
 .../test/java/test/beans/NestedTestBean.java  |  64 --
 .../test/java/test/beans/SideEffectBean.java  |  41 -
 .../src/test/java/test/beans/TestBean.java    | 436 --------
 ...paceHandlerWithExpressionLanguageTests.xml |   4 +-
 .../support/simpleThreadScopeTests.xml        |  18 +-
 .../core/type/AnnotationMetadataTests.java    |   4 +-
 .../type}/TestAutowired.java                  |   2 +-
 .../type}/TestQualifier.java                  |   2 +-
 .../tests}/TestResourceUtils.java             |   4 +-
 .../springframework/tests}/TimeStamped.java   |   2 +-
 .../util/SerializationTestUtils.java          |  60 +-
 .../org/springframework/beans/Colour.java     |  36 -
 .../beans/INestedTestBean.java                |  23 -
 .../org/springframework/beans/IOther.java     |  24 -
 .../org/springframework/beans/ITestBean.java  |  71 --
 .../beans/IndexedTestBean.java                | 145 ---
 .../springframework/beans/NestedTestBean.java |  61 --
 .../org/springframework/beans/TestBean.java   | 457 ---------
 .../jdbc/core/RowMapperTests.java             |   4 +-
 .../BeanPropertySqlParameterSourceTests.java  |   4 +-
 .../JdbcBeanDefinitionReaderTests.java        |   6 +-
 .../org/springframework/beans/Colour.java     |  36 -
 .../beans/INestedTestBean.java                |  23 -
 .../org/springframework/beans/IOther.java     |  24 -
 .../org/springframework/beans/ITestBean.java  |  71 --
 .../beans/IndexedTestBean.java                | 145 ---
 .../springframework/beans/NestedTestBean.java |  61 --
 .../org/springframework/beans/TestBean.java   | 457 ---------
 .../jms/config/JmsNamespaceHandlerTests.java  |   4 +-
 .../jms/config/jmsNamespaceHandlerTests.xml   |   6 +-
 .../jms/remoting/JmsInvokerTests.java         |   6 +-
 .../CallCountingTransactionManager.java       |  63 --
 .../web/DelegatingServletInputStream.java     |  68 --
 .../web/DelegatingServletOutputStream.java    |  74 --
 .../mock/web/HeaderValueHolder.java           |  96 --
 .../mock/web/MockFilterChain.java             | 184 ----
 .../mock/web/MockFilterConfig.java            | 108 --
 .../mock/web/MockHttpServletRequest.java      | 964 ------------------
 .../mock/web/MockHttpServletResponse.java     | 641 ------------
 .../mock/web/MockHttpSession.java             | 278 -----
 .../mock/web/MockRequestDispatcher.java       |  95 --
 .../mock/web/MockServletConfig.java           | 107 --
 .../mock/web/MockServletContext.java          | 516 ----------
 .../mock/web/PassThroughFilterChain.java      |  86 --
 .../org/springframework/beans/Colour.java     |  36 -
 .../beans/INestedTestBean.java                |  23 -
 .../org/springframework/beans/IOther.java     |  24 -
 .../org/springframework/beans/ITestBean.java  |  71 --
 .../beans/IndexedTestBean.java                | 145 ---
 .../springframework/beans/NestedTestBean.java |  61 --
 .../org/springframework/beans/TestBean.java   | 457 ---------
 .../beans/factory/config/SimpleMapScope.java  |  88 --
 .../mock/jndi/ExpectedLookupTemplate.java     |  82 --
 .../mock/jndi/SimpleNamingContext.java        | 381 -------
 .../mock/jndi/SimpleNamingContextBuilder.java | 237 -----
 .../HibernateJtaTransactionTests.java         |   4 +-
 .../hibernate3/HibernateTemplateTests.java    |   4 +-
 .../LocalSessionFactoryBeanTests.java         |  10 +-
 .../orm/hibernate3/support/LobTypeTests.java  |   4 +-
 .../orm/jdo/JdoTransactionManagerTests.java   |   6 +-
 .../orm/jpa/domain/ContextualPerson.java      |   4 +-
 .../orm/jpa/domain/Person.java                |   4 +-
 .../orm/jpa/domain/persistence-multi.xml      |   2 +-
 .../PersistenceXmlParsingTests.java           |   4 +-
 .../support/PersistenceInjectionTests.java    |   6 +-
 .../transaction/MockJtaTransaction.java       |  67 --
 .../util/SerializationTestUtils.java          |  97 --
 .../beans/factory/xml/child.xml               |   6 +-
 .../beans/factory/xml/test.xml                |  32 +-
 .../org/springframework/beans/Colour.java     |  37 -
 .../org/springframework/beans/Employee.java   |  39 -
 .../beans/INestedTestBean.java                |  23 -
 .../org/springframework/beans/IOther.java     |  24 -
 .../org/springframework/beans/ITestBean.java  |  71 --
 .../beans/IndexedTestBean.java                | 146 ---
 .../springframework/beans/NestedTestBean.java |  61 --
 .../org/springframework/beans/TestBean.java   | 455 ---------
 ...stractSpr3350SingleSpringContextTests.java |   4 +-
 ...ingleSpringContextTests-context.properties |   2 +-
 ...pr3350SingleSpringContextTests-context.xml |   2 +-
 ...AndInheritedLoaderTests-context.properties |   2 +-
 ...dingPropertiesAndInheritedLoaderTests.java |   4 +-
 ...xtendingPropertiesTests-context.properties |   2 +-
 ...ithPropertiesExtendingPropertiesTests.java |   4 +-
 ...ionalJUnit38SpringContextTests-context.xml |   4 +-
 ...ransactionalJUnit38SpringContextTests.java |   6 +-
 ...tionalJUnit4SpringContextTests-context.xml |   4 +-
 ...TransactionalJUnit4SpringContextTests.java |   6 +-
 ...ltContextLoaderClassSpringRunnerTests.java |   4 +-
 ...gJUnit4ClassRunnerAppCtxTests-context1.xml |   2 +-
 ...gJUnit4ClassRunnerAppCtxTests-context2.xml |   2 +-
 ...erizedDependencyInjectionTests-context.xml |   6 +-
 ...ParameterizedDependencyInjectionTests.java |   6 +-
 ...4ClassRunnerAppCtxTests-context.properties |   2 +-
 ...sedSpringJUnit4ClassRunnerAppCtxTests.java |   4 +-
 ...ngJUnit4ClassRunnerAppCtxTests-context.xml |   4 +-
 .../SpringJUnit4ClassRunnerAppCtxTests.java   |   6 +-
 ...ingDefaultConfigClassesInheritedTests.java |   4 +-
 .../DefaultConfigClassesBaseTests.java        |   4 +-
 .../DefaultConfigClassesInheritedTests.java   |   4 +-
 ...ingDefaultConfigClassesInheritedTests.java |   4 +-
 ...ltLoaderDefaultConfigClassesBaseTests.java |   4 +-
 ...derDefaultConfigClassesInheritedTests.java |   4 +-
 ...tLoaderExplicitConfigClassesBaseTests.java |   4 +-
 ...erExplicitConfigClassesInheritedTests.java |   4 +-
 .../ExplicitConfigClassesBaseTests.java       |   4 +-
 .../ExplicitConfigClassesInheritedTests.java  |   4 +-
 .../annotation/PojoAndStringConfig.java       |   6 +-
 .../DefaultProfileAnnotationConfigTests.java  |   6 +-
 .../annotation/DefaultProfileConfig.java      |   4 +-
 .../profile/annotation/DevProfileConfig.java  |   4 +-
 .../DefaultProfileAnnotationConfigTests.java  |   6 +-
 .../importresource/DefaultProfileConfig.java  |   4 +-
 .../junit4/profile/importresource/import.xml  |   2 +-
 .../DefaultProfileXmlConfigTests-context.xml  |   4 +-
 .../xml/DefaultProfileXmlConfigTests.java     |   6 +-
 ...DefaultLocationsInheritedTests-context.xml |   2 +-
 .../DefaultLocationsBaseTests-context.xml     |   2 +-
 .../spr3896/DefaultLocationsBaseTests.java    |   4 +-
 ...DefaultLocationsInheritedTests-context.xml |   2 +-
 .../DefaultLocationsInheritedTests.java       |   4 +-
 .../spr3896/ExplicitLocationsBaseTests.java   |   4 +-
 .../ExplicitLocationsInheritedTests.java      |   4 +-
 ...ransactionalAnnotatedConfigClassTests.java |   4 +-
 ...edConfigClassWithAtConfigurationTests.java |   4 +-
 ...figClassesWithoutAtConfigurationTests.java |   4 +-
 ...aTransactionManagementConfigurerTests.java |   6 +-
 .../spr9645/LookUpNonexistentTxMgrTests.java  |   6 +-
 .../LookUpTxMgrByTypeAndDefaultNameTests.java |   6 +-
 .../LookUpTxMgrByTypeAndNameTests.java        |   6 +-
 ...grByTypeAndQualifierAtClassLevelTests.java |   6 +-
 ...rByTypeAndQualifierAtMethodLevelTests.java |   6 +-
 .../spr9645/LookUpTxMgrByTypeTests.java       |   6 +-
 ...TransactionalTestNGSpringContextTests.java |   6 +-
 ...tionalTestNGSpringContextTests-context.xml |   4 +-
 ...TransactionalTestNGSpringContextTests.java |   6 +-
 .../RequestAndSessionScopedBeansWacTests.java |   4 +-
 ...tAndSessionScopedBeansWacTests-context.xml |   4 +-
 .../org/springframework/beans/Colour.java     |  36 -
 .../beans/DerivedTestBean.java                |  90 --
 .../beans/INestedTestBean.java                |  23 -
 .../org/springframework/beans/IOther.java     |  24 -
 .../org/springframework/beans/ITestBean.java  |  71 --
 .../beans/IndexedTestBean.java                | 145 ---
 .../springframework/beans/NestedTestBean.java |  61 --
 .../org/springframework/beans/TestBean.java   | 457 ---------
 .../CollectingReaderEventListener.java        |  91 --
 .../mock/jndi/SimpleNamingContext.java        | 381 -------
 .../CallCountingTransactionManager.java       |   3 +-
 .../transaction/MockJtaTransaction.java       |   2 +-
 .../CallCountingTransactionManager.java       |  63 --
 .../JndiJtaTransactionManagerTests.java       |   4 +-
 .../JtaTransactionManagerTests.java           |   3 +-
 .../TxNamespaceHandlerEventTests.java         |   4 +-
 .../transaction/TxNamespaceHandlerTests.java  |   5 +-
 ...tationTransactionAttributeSourceTests.java |   4 +-
 ...AnnotationTransactionInterceptorTests.java |   4 +-
 ...ationTransactionNamespaceHandlerTests.java |   4 +-
 .../EnableTransactionManagementTests.java     |   4 +-
 ...tationTransactionNamespaceHandlerTests.xml |   2 +-
 .../config/AnnotationDrivenTests.java         |   4 +-
 .../TransactionManagerConfiguration.java      |   4 +-
 .../annotationDrivenProxyTargetClassTests.xml |   4 +-
 .../AbstractTransactionAspectTests.java       |   6 +-
 .../BeanFactoryTransactionTests.java          |  10 +-
 .../interceptor/ImplementsNoInterfaces.java   |   4 +-
 .../noTransactionAttributeSource.xml          |   5 +-
 .../interceptor/transactionalBeanFactory.xml  |  12 +-
 .../WebSphereUowTransactionManagerTests.java  |   4 +-
 ...aTransactionManagerSerializationTests.java |   4 +-
 .../transaction/txNamespaceHandlerTests.xml   |   4 +-
 .../util/SerializationTestUtils.java          |  97 --
 .../beans/BeanWithObjectProperty.java         |  35 -
 .../org/springframework/beans/Colour.java     |  36 -
 .../beans/DerivedTestBean.java                |  90 --
 .../beans/FieldAccessBean.java                |  44 -
 .../beans/INestedTestBean.java                |  23 -
 .../org/springframework/beans/IOther.java     |  24 -
 .../beans/IndexedTestBean.java                | 145 ---
 .../springframework/beans/NestedTestBean.java |  61 --
 .../org/springframework/beans/Person.java     |  36 -
 .../beans/SerializablePerson.java             |  70 --
 .../org/springframework/beans/TestBean.java   | 495 ---------
 .../beans/factory/DummyFactory.java           | 179 ----
 .../AbstractHttpRequestFactoryTestCase.java   |   3 +-
 .../http/client/FreePortScanner.java          |  99 --
 .../remoting/caucho/CauchoRemotingTests.java  |   6 +-
 .../httpinvoker/HttpInvokerTests.java         |   6 +-
 .../tests/web}/FreePortScanner.java           |   2 +-
 .../util/SerializationTestUtils.java          |  97 --
 .../web/bind/EscapedErrorsTests.java          |   4 +-
 .../bind/ServletRequestDataBinderTests.java   |   6 +-
 .../support/WebRequestDataBinderTests.java    |  39 +-
 .../client/RestTemplateIntegrationTests.java  |   4 +-
 .../RequestAndSessionScopedBeanTests.java     |   4 +-
 .../context/request/RequestScopeTests.java    |   6 +-
 .../request/RequestScopedProxyTests.java      |  10 +-
 .../context/request/SessionScopeTests.java    |   6 +-
 .../WebApplicationContextScopeTests.java      |   4 +-
 .../SpringBeanAutowiringSupportTests.java     |   6 +-
 .../jsf/DelegatingVariableResolverTests.java  |   4 +-
 .../ModelAttributeMethodProcessorTests.java   |   4 +-
 .../SessionAttributesHandlerTests.java        |   4 +-
 .../web/context/request/requestScopeTests.xml |  18 +-
 .../request/requestScopedProxyTests.xml       |  20 +-
 .../web/context/request/sessionScopeTests.xml |   4 +-
 .../org/springframework/beans/Colour.java     |  36 -
 .../beans/DerivedTestBean.java                |  90 --
 .../beans/INestedTestBean.java                |  23 -
 .../org/springframework/beans/IOther.java     |  24 -
 .../org/springframework/beans/ITestBean.java  |  71 --
 .../beans/IndexedTestBean.java                | 145 ---
 .../springframework/beans/NestedTestBean.java |  61 --
 .../org/springframework/beans/TestBean.java   | 457 ---------
 .../factory/AbstractBeanFactoryTests.java     | 329 ------
 .../AbstractListableBeanFactoryTests.java     |  84 --
 .../beans/factory/DummyFactory.java           | 179 ----
 .../beans/factory/LifecycleBean.java          | 164 ---
 .../beans/factory/MustBeInitialized.java      |  47 -
 .../AbstractApplicationContextTests.java      | 160 ---
 .../context/LifecycleContextBean.java         |   2 +-
 .../web/DelegatingServletOutputStream.java    |  74 --
 .../mock/web/HeaderValueHolder.java           |  96 --
 .../mock/web/MockHttpServletResponse.java     | 641 ------------
 .../mock/web/MockHttpSession.java             | 278 -----
 .../mock/web/MockMultipartFile.java           | 139 ---
 .../mock/web/MockRequestDispatcher.java       |  95 --
 .../mock/web/MockServletContext.java          | 516 ----------
 .../mock/web/portlet/MockPortletSession.java  |   5 +-
 .../ComplexPortletApplicationContext.java     |   5 +-
 .../web/portlet/DispatcherPortletTests.java   |   4 +-
 .../SimplePortletApplicationContext.java      |   4 +-
 .../bind/PortletRequestDataBinderTests.java   |   6 +-
 ...AbstractXmlWebApplicationContextTests.java |   4 +-
 .../PortletApplicationContextScopeTests.java  |  14 +-
 .../context/WEB-INF/applicationContext.xml    |   6 +-
 .../context/WEB-INF/contextInclude.xml        |   2 +-
 .../portlet/context/WEB-INF/test-servlet.xml  |  16 +-
 .../XmlPortletApplicationContextTests.java    |   4 +-
 .../portlet/mvc/CommandControllerTests.java   |   6 +-
 .../Portlet20AnnotationControllerTests.java   |   8 +-
 .../PortletAnnotationControllerTests.java     |   8 +-
 .../web/portlet/util/PortletUtilsTests.java   |   6 +-
 .../beans/BeanWithObjectProperty.java         |  35 -
 .../org/springframework/beans/Colour.java     |  36 -
 .../beans/DerivedTestBean.java                |  90 --
 .../springframework/beans/GenericBean.java    | 247 -----
 .../beans/INestedTestBean.java                |  23 -
 .../org/springframework/beans/IOther.java     |  24 -
 .../org/springframework/beans/ITestBean.java  |  71 --
 .../beans/IndexedTestBean.java                | 145 ---
 .../springframework/beans/NestedTestBean.java |  61 --
 .../java/org/springframework/beans/Pet.java   |  54 -
 .../org/springframework/beans/TestBean.java   | 457 ---------
 .../beans/factory/DummyFactory.java           | 179 ----
 .../beans/factory/LifecycleBean.java          | 164 ---
 .../beans/factory/MustBeInitialized.java      |  47 -
 .../context/LifecycleContextBean.java         |   2 +-
 .../ui/jasperreports/PersonBean.java          |  64 --
 .../ui/jasperreports/ProductBean.java         |  64 --
 .../util/SerializationTestUtils.java          |  65 --
 .../AbstractApplicationContextTests.java      | 166 ---
 .../web/context/AbstractBeanFactoryTests.java | 337 ------
 .../AbstractListableBeanFactoryTests.java     |  71 --
 .../web/context/ContextLoaderTests.java       |   6 +-
 .../ResourceBundleMessageSourceTests.java     | 281 -----
 .../ContextLoaderTests-acc-context.xml        |   2 +-
 .../context/WEB-INF/applicationContext.xml    |   6 +-
 .../web/context/WEB-INF/context-addition.xml  |  14 +-
 .../web/context/WEB-INF/contextInclude.xml    |   2 +-
 .../web/context/WEB-INF/sessionContext.xml    |   4 +-
 .../web/context/WEB-INF/test-servlet.xml      |  16 +-
 .../web/context/WEB-INF/testNamespace.xml     |   4 +-
 .../XmlWebApplicationContextTests.java        |   5 +-
 .../support/ServletContextSupportTests.java   |   4 +-
 .../servlet/ComplexWebApplicationContext.java |   4 +-
 .../web/servlet/DispatcherServletTests.java   |   4 +-
 .../servlet/SimpleWebApplicationContext.java  |   4 +-
 ...MvcConfigurationSupportExtensionTests.java |   4 +-
 .../mvc/CancellableFormControllerTests.java   |   4 +-
 .../servlet/mvc/CommandControllerTests.java   |   4 +-
 .../web/servlet/mvc/FormControllerTests.java  |   6 +-
 .../mvc/WizardFormControllerTests.java        |   4 +-
 .../ServletAnnotationControllerTests.java     |  12 +-
 ...ExtendedServletRequestDataBinderTests.java |   4 +-
 ...ResolverMethodReturnValueHandlerTests.java |   4 +-
 ...MappingHandlerAdapterIntegrationTests.java |   4 +-
 .../RequestPartIntegrationTests.java          |   4 +-
 ...vetModelAttributeMethodProcessorTests.java |   4 +-
 ...nnotationControllerHandlerMethodTests.java |  12 +-
 .../MultiActionControllerTests.java           |   4 +-
 .../DefaultHandlerExceptionResolverTests.java |   4 +-
 .../RedirectAttributesModelMapTests.java      |   4 +-
 .../web/servlet/tags/BindTagTests.java        |   8 +-
 .../tags/form/AbstractFormTagTests.java       |   4 +-
 .../web/servlet/tags/form/ButtonTagTests.java |   4 +-
 .../servlet/tags/form/CheckboxTagTests.java   |   8 +-
 .../servlet/tags/form/CheckboxesTagTests.java |   8 +-
 .../web/servlet/tags/form/ErrorsTagTests.java |   4 +-
 .../tags/form/HiddenInputTagTests.java        |   4 +-
 .../web/servlet/tags/form/InputTagTests.java  |   4 +-
 .../web/servlet/tags/form/LabelTagTests.java  |   4 +-
 .../servlet/tags/form/OptionTagEnumTests.java |   6 +-
 .../web/servlet/tags/form/OptionTagTests.java |   6 +-
 .../servlet/tags/form/OptionsTagTests.java    |   4 +-
 .../tags/form/RadioButtonTagTests.java        |   6 +-
 .../tags/form/RadioButtonsTagTests.java       |   8 +-
 .../web/servlet/tags/form/SelectTagTests.java |   6 +-
 .../tags/form/TestBeanWithRealCountry.java    |   4 +-
 .../servlet/tags/form/TextareaTagTests.java   |   4 +-
 .../web/servlet/view/RedirectViewTests.java   |   4 +-
 .../web/servlet/view/ViewResolverTests.java   |   4 +-
 .../view/freemarker/FreeMarkerMacroTests.java |   4 +-
 .../view/velocity/VelocityMacroTests.java     |   4 +-
 .../view/velocity/VelocityRenderTests.java    |   4 +-
 .../web/context/WEB-INF/sessionContext.xml    |   4 +-
 ...ceHandlerScopeIntegrationTests-context.xml |   8 +-
 ...NamespaceHandlerScopeIntegrationTests.java |  14 +-
 ...toProxyCreatorIntegrationTests-context.xml |  32 +-
 ...visorAutoProxyCreatorIntegrationTests.java |  59 +-
 ...ansactionalAnnotationIntegrationTests.java |  18 +-
 .../CallCountingTransactionManager.java       |  65 --
 ...TransactionManagementIntegrationTests.java |   4 +-
 .../test/advice/CountingBeforeAdvice.java     |  36 -
 src/test/java/test/beans/Colour.java          |  36 -
 src/test/java/test/beans/INestedTestBean.java |  23 -
 src/test/java/test/beans/IOther.java          |  24 -
 src/test/java/test/beans/ITestBean.java       |  71 --
 src/test/java/test/beans/IndexedTestBean.java | 145 ---
 src/test/java/test/beans/NestedTestBean.java  |  61 --
 src/test/java/test/beans/Pet.java             |  54 -
 src/test/java/test/beans/TestBean.java        | 457 ---------
 .../java/test/interceptor/NopInterceptor.java |  59 --
 .../SerializableNopInterceptor.java           |  48 -
 .../test/util/SerializationTestUtils.java     | 100 --
 813 files changed, 2233 insertions(+), 27852 deletions(-)
 rename {src/test/java/test => spring-aop/src/test/java/org/springframework/tests/aop}/advice/CountingAfterReturningAdvice.java (95%)
 rename spring-aop/src/test/java/{test/aop => org/springframework/tests/aop/advice}/CountingBeforeAdvice.java (95%)
 rename {src/test/java/test => spring-aop/src/test/java/org/springframework/tests/aop}/advice/MethodCounter.java (97%)
 rename {spring-context/src/test/java/test => spring-aop/src/test/java/org/springframework/tests/aop}/advice/MyThrowsHandler.java (93%)
 rename {spring-context/src/test/java/test => spring-aop/src/test/java/org/springframework/tests/aop}/advice/TimestampIntroductionAdvisor.java (89%)
 rename {spring-context/src/test/java/test => spring-aop/src/test/java/org/springframework/tests/aop}/interceptor/NopInterceptor.java (96%)
 rename {spring-context/src/test/java/test => spring-aop/src/test/java/org/springframework/tests/aop}/interceptor/SerializableNopInterceptor.java (95%)
 rename {spring-context/src/test/java/test => spring-aop/src/test/java/org/springframework/tests/aop}/interceptor/TimestampIntroductionInterceptor.java (89%)
 rename {spring-webmvc/src/test/java/org/springframework => spring-aop/src/test/java/org/springframework/tests/sample}/beans/Person.java (82%)
 rename {spring-webmvc/src/test/java/org/springframework => spring-aop/src/test/java/org/springframework/tests/sample}/beans/SerializablePerson.java (96%)
 rename spring-aop/src/test/java/{test => org/springframework/tests/sample}/beans/subpkg/DeepBean.java (94%)
 delete mode 100644 spring-aop/src/test/java/test/aop/MethodCounter.java
 delete mode 100644 spring-aop/src/test/java/test/aop/NopInterceptor.java
 delete mode 100644 spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java
 delete mode 100644 spring-aop/src/test/java/test/beans/Colour.java
 delete mode 100644 spring-aop/src/test/java/test/beans/DerivedTestBean.java
 delete mode 100644 spring-aop/src/test/java/test/beans/INestedTestBean.java
 delete mode 100644 spring-aop/src/test/java/test/beans/IOther.java
 delete mode 100644 spring-aop/src/test/java/test/beans/ITestBean.java
 delete mode 100644 spring-aop/src/test/java/test/beans/NestedTestBean.java
 delete mode 100644 spring-aop/src/test/java/test/beans/SerializablePerson.java
 delete mode 100644 spring-aop/src/test/java/test/beans/TestBean.java
 delete mode 100644 spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java
 delete mode 100644 spring-aop/src/test/java/test/util/SerializationTestUtils.java
 delete mode 100644 spring-aop/src/test/java/test/util/TimeStamped.java
 delete mode 100644 spring-aspects/src/test/java/org/springframework/beans/Colour.java
 delete mode 100644 spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java
 delete mode 100644 spring-aspects/src/test/java/org/springframework/beans/IOther.java
 delete mode 100644 spring-aspects/src/test/java/org/springframework/beans/ITestBean.java
 delete mode 100644 spring-aspects/src/test/java/org/springframework/beans/IndexedTestBean.java
 delete mode 100644 spring-aspects/src/test/java/org/springframework/beans/NestedTestBean.java
 delete mode 100644 spring-aspects/src/test/java/org/springframework/beans/TestBean.java
 delete mode 100644 spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractAnnotationTest.java
 rename spring-aspects/src/test/java/org/springframework/cache/aspectj/{AspectJAnnotationTest.java => AspectJAnnotationTests.java} (56%)
 delete mode 100644 spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
 rename {spring-context => spring-beans}/src/test/java/org/springframework/beans/factory/access/beans1.xml (100%)
 rename {spring-context => spring-beans}/src/test/java/org/springframework/beans/factory/access/beans2.xml (100%)
 rename spring-beans/src/test/java/org/springframework/{beans/factory/xml => tests/beans}/CollectingReaderEventListener.java (98%)
 rename spring-beans/src/test/java/{test => org/springframework/tests/sample}/beans/BooleanTestBean.java (95%)
 rename {spring-context-support/src/test/java/org/springframework => spring-beans/src/test/java/org/springframework/tests/sample}/beans/Colour.java (95%)
 rename {spring-aop/src/test/java/test => spring-beans/src/test/java/org/springframework/tests/sample}/beans/CountingTestBean.java (94%)
 rename {spring-webmvc/src/test/java/org/springframework => spring-beans/src/test/java/org/springframework/tests/sample}/beans/CustomEnum.java (94%)
 rename spring-beans/src/test/java/org/springframework/{beans/factory/xml => tests/sample/beans}/DependenciesBean.java (95%)
 rename spring-beans/src/test/java/{test => org/springframework/tests/sample}/beans/DerivedTestBean.java (97%)
 rename spring-beans/src/test/java/{test => org/springframework/tests/sample}/beans/DummyBean.java (96%)
 rename spring-beans/src/test/java/{test => org/springframework/tests/sample}/beans/DummyFactory.java (97%)
 rename spring-beans/src/test/java/{test => org/springframework/tests/sample}/beans/GenericBean.java (95%)
 rename spring-beans/src/test/java/{test => org/springframework/tests/sample}/beans/GenericIntegerBean.java (93%)
 rename spring-beans/src/test/java/{test => org/springframework/tests/sample}/beans/GenericSetOfIntegerBean.java (93%)
 rename {spring-context/src/test/java/org/springframework/beans/factory => spring-beans/src/test/java/org/springframework/tests/sample/beans}/HasMap.java (75%)
 rename {spring-aspects/src/test/java/org/springframework => spring-beans/src/test/java/org/springframework/tests/sample}/beans/INestedTestBean.java (93%)
 rename spring-beans/src/test/java/{test => org/springframework/tests/sample}/beans/IOther.java (93%)
 rename {spring-web/src/test/java/org/springframework => spring-beans/src/test/java/org/springframework/tests/sample}/beans/ITestBean.java (90%)
 rename spring-beans/src/test/java/{test => org/springframework/tests/sample}/beans/IndexedTestBean.java (98%)
 rename spring-beans/src/test/java/{test => org/springframework/tests/sample}/beans/LifecycleBean.java (99%)
 rename {spring-context/src/test/java/org/springframework/beans/factory => spring-beans/src/test/java/org/springframework/tests/sample/beans}/MustBeInitialized.java (92%)
 rename spring-beans/src/test/java/{test => org/springframework/tests/sample}/beans/NestedTestBean.java (96%)
 rename spring-beans/src/test/java/{test => org/springframework/tests/sample}/beans/NumberTestBean.java (98%)
 rename spring-beans/src/test/java/{test => org/springframework/tests/sample}/beans/PackageLevelVisibleBean.java (94%)
 rename {spring-test/src/test/java/org/springframework => spring-beans/src/test/java/org/springframework/tests/sample}/beans/Pet.java (96%)
 rename {spring-aop/src/test/java/test => spring-beans/src/test/java/org/springframework/tests/sample}/beans/SideEffectBean.java (95%)
 rename {spring-context/src/test/java/org/springframework => spring-beans/src/test/java/org/springframework/tests/sample}/beans/TestBean.java (89%)
 rename {spring-context/src/test/java/org/springframework => spring-beans/src/test/java/org/springframework/tests/sample}/beans/factory/DummyFactory.java (87%)
 create mode 100644 spring-beans/src/test/java/org/springframework/tests/sample/beans/package-info.java
 delete mode 100644 spring-beans/src/test/java/org/springframework/util/SerializationTestUtils.java
 delete mode 100644 spring-beans/src/test/java/test/beans/Colour.java
 delete mode 100644 spring-beans/src/test/java/test/beans/CustomEnum.java
 delete mode 100644 spring-beans/src/test/java/test/beans/INestedTestBean.java
 delete mode 100644 spring-beans/src/test/java/test/beans/ITestBean.java
 delete mode 100644 spring-beans/src/test/java/test/beans/TestBean.java
 delete mode 100644 spring-beans/src/test/java/test/util/TestResourceUtils.java
 delete mode 100644 spring-context-support/src/test/java/org/springframework/beans/INestedTestBean.java
 delete mode 100644 spring-context-support/src/test/java/org/springframework/beans/IOther.java
 delete mode 100644 spring-context-support/src/test/java/org/springframework/beans/ITestBean.java
 delete mode 100644 spring-context-support/src/test/java/org/springframework/beans/IndexedTestBean.java
 delete mode 100644 spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java
 delete mode 100644 spring-context-support/src/test/java/org/springframework/beans/TestBean.java
 delete mode 100644 spring-context-support/src/test/java/org/springframework/scheduling/TestMethodInvokingTask.java
 delete mode 100644 spring-context/src/test/java/org/springframework/beans/Colour.java
 delete mode 100644 spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java
 delete mode 100644 spring-context/src/test/java/org/springframework/beans/FieldAccessBean.java
 delete mode 100644 spring-context/src/test/java/org/springframework/beans/INestedTestBean.java
 delete mode 100644 spring-context/src/test/java/org/springframework/beans/IOther.java
 delete mode 100644 spring-context/src/test/java/org/springframework/beans/ITestBean.java
 delete mode 100644 spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java
 delete mode 100644 spring-context/src/test/java/org/springframework/beans/NestedTestBean.java
 delete mode 100644 spring-context/src/test/java/org/springframework/beans/Person.java
 delete mode 100644 spring-context/src/test/java/org/springframework/beans/SerializablePerson.java
 delete mode 100644 spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
 delete mode 100644 spring-context/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java
 delete mode 100644 spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java
 delete mode 100644 spring-context/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
 delete mode 100644 spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java
 delete mode 100644 spring-context/src/test/java/org/springframework/beans/factory/access/ref1.xml
 delete mode 100644 spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
 delete mode 100644 spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
 delete mode 100644 spring-context/src/test/java/org/springframework/mock/env/MockPropertySource.java
 delete mode 100644 spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
 delete mode 100644 spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
 delete mode 100644 spring-context/src/test/java/org/springframework/mock/jndi/package-info.java
 rename spring-context/src/test/java/org/springframework/{beans/factory/config => tests/context}/SimpleMapScope.java (95%)
 rename spring-context/src/test/java/org/springframework/{scheduling => tests/context}/TestMethodInvokingTask.java (96%)
 rename {spring-tx/src/test/java/org/springframework => spring-context/src/test/java/org/springframework/tests}/mock/jndi/ExpectedLookupTemplate.java (98%)
 rename spring-context/src/test/java/org/springframework/{ => tests}/mock/jndi/SimpleNamingContext.java (98%)
 rename {spring-tx/src/test/java/org/springframework => spring-context/src/test/java/org/springframework/tests}/mock/jndi/SimpleNamingContextBuilder.java (99%)
 rename spring-aop/src/test/java/test/beans/Person.java => spring-context/src/test/java/org/springframework/tests/mock/jndi/package-info.java (62%)
 rename spring-context/src/test/java/org/springframework/{ => tests/sample}/beans/BeanWithObjectProperty.java (94%)
 rename spring-context/src/test/java/{test => org/springframework/tests/sample}/beans/Employee.java (89%)
 rename spring-context/src/test/java/{test => org/springframework/tests/sample}/beans/FactoryMethods.java (95%)
 rename {spring-webmvc/src/test/java/org/springframework => spring-context/src/test/java/org/springframework/tests/sample}/beans/FieldAccessBean.java (94%)
 rename spring-context/src/test/java/org/springframework/{ => tests/sample}/beans/ResourceTestBean.java (97%)
 delete mode 100644 spring-context/src/test/java/org/springframework/util/SerializationTestUtils.java
 delete mode 100644 spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java
 delete mode 100644 spring-context/src/test/java/test/advice/CountingBeforeAdvice.java
 delete mode 100644 spring-context/src/test/java/test/advice/MethodCounter.java
 delete mode 100644 spring-context/src/test/java/test/beans/Colour.java
 delete mode 100644 spring-context/src/test/java/test/beans/CustomScope.java
 delete mode 100644 spring-context/src/test/java/test/beans/DependsOnTestBean.java
 delete mode 100644 spring-context/src/test/java/test/beans/INestedTestBean.java
 delete mode 100644 spring-context/src/test/java/test/beans/IOther.java
 delete mode 100644 spring-context/src/test/java/test/beans/ITestBean.java
 delete mode 100644 spring-context/src/test/java/test/beans/IndexedTestBean.java
 delete mode 100644 spring-context/src/test/java/test/beans/NestedTestBean.java
 delete mode 100644 spring-context/src/test/java/test/beans/SideEffectBean.java
 delete mode 100644 spring-context/src/test/java/test/beans/TestBean.java
 rename spring-core/src/test/java/org/springframework/{beans/factory/annotation => core/type}/TestAutowired.java (95%)
 rename spring-core/src/test/java/org/springframework/{beans/factory/annotation => core/type}/TestQualifier.java (95%)
 rename {spring-aop/src/test/java/test/util => spring-core/src/test/java/org/springframework/tests}/TestResourceUtils.java (91%)
 rename {spring-context/src/test/java/test/util => spring-core/src/test/java/org/springframework/tests}/TimeStamped.java (96%)
 delete mode 100644 spring-jdbc/src/test/java/org/springframework/beans/Colour.java
 delete mode 100644 spring-jdbc/src/test/java/org/springframework/beans/INestedTestBean.java
 delete mode 100644 spring-jdbc/src/test/java/org/springframework/beans/IOther.java
 delete mode 100644 spring-jdbc/src/test/java/org/springframework/beans/ITestBean.java
 delete mode 100644 spring-jdbc/src/test/java/org/springframework/beans/IndexedTestBean.java
 delete mode 100644 spring-jdbc/src/test/java/org/springframework/beans/NestedTestBean.java
 delete mode 100644 spring-jdbc/src/test/java/org/springframework/beans/TestBean.java
 delete mode 100644 spring-jms/src/test/java/org/springframework/beans/Colour.java
 delete mode 100644 spring-jms/src/test/java/org/springframework/beans/INestedTestBean.java
 delete mode 100644 spring-jms/src/test/java/org/springframework/beans/IOther.java
 delete mode 100644 spring-jms/src/test/java/org/springframework/beans/ITestBean.java
 delete mode 100644 spring-jms/src/test/java/org/springframework/beans/IndexedTestBean.java
 delete mode 100644 spring-jms/src/test/java/org/springframework/beans/NestedTestBean.java
 delete mode 100644 spring-jms/src/test/java/org/springframework/beans/TestBean.java
 delete mode 100644 spring-jms/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
 delete mode 100644 spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletInputStream.java
 delete mode 100644 spring-orm-hibernate4/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
 delete mode 100644 spring-orm-hibernate4/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
 delete mode 100644 spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterChain.java
 delete mode 100644 spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockFilterConfig.java
 delete mode 100644 spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletRequest.java
 delete mode 100644 spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
 delete mode 100644 spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockHttpSession.java
 delete mode 100644 spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
 delete mode 100644 spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletConfig.java
 delete mode 100644 spring-orm-hibernate4/src/test/java/org/springframework/mock/web/MockServletContext.java
 delete mode 100644 spring-orm-hibernate4/src/test/java/org/springframework/mock/web/PassThroughFilterChain.java
 delete mode 100644 spring-orm/src/test/java/org/springframework/beans/Colour.java
 delete mode 100644 spring-orm/src/test/java/org/springframework/beans/INestedTestBean.java
 delete mode 100644 spring-orm/src/test/java/org/springframework/beans/IOther.java
 delete mode 100644 spring-orm/src/test/java/org/springframework/beans/ITestBean.java
 delete mode 100644 spring-orm/src/test/java/org/springframework/beans/IndexedTestBean.java
 delete mode 100644 spring-orm/src/test/java/org/springframework/beans/NestedTestBean.java
 delete mode 100644 spring-orm/src/test/java/org/springframework/beans/TestBean.java
 delete mode 100644 spring-orm/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
 delete mode 100644 spring-orm/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
 delete mode 100644 spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
 delete mode 100644 spring-orm/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
 delete mode 100644 spring-orm/src/test/java/org/springframework/transaction/MockJtaTransaction.java
 delete mode 100644 spring-orm/src/test/java/org/springframework/util/SerializationTestUtils.java
 delete mode 100644 spring-test/src/test/java/org/springframework/beans/Colour.java
 delete mode 100644 spring-test/src/test/java/org/springframework/beans/Employee.java
 delete mode 100644 spring-test/src/test/java/org/springframework/beans/INestedTestBean.java
 delete mode 100644 spring-test/src/test/java/org/springframework/beans/IOther.java
 delete mode 100644 spring-test/src/test/java/org/springframework/beans/ITestBean.java
 delete mode 100644 spring-test/src/test/java/org/springframework/beans/IndexedTestBean.java
 delete mode 100644 spring-test/src/test/java/org/springframework/beans/NestedTestBean.java
 delete mode 100644 spring-test/src/test/java/org/springframework/beans/TestBean.java
 delete mode 100644 spring-tx/src/test/java/org/springframework/beans/Colour.java
 delete mode 100644 spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java
 delete mode 100644 spring-tx/src/test/java/org/springframework/beans/INestedTestBean.java
 delete mode 100644 spring-tx/src/test/java/org/springframework/beans/IOther.java
 delete mode 100644 spring-tx/src/test/java/org/springframework/beans/ITestBean.java
 delete mode 100644 spring-tx/src/test/java/org/springframework/beans/IndexedTestBean.java
 delete mode 100644 spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java
 delete mode 100644 spring-tx/src/test/java/org/springframework/beans/TestBean.java
 delete mode 100644 spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
 delete mode 100644 spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
 rename {spring-test/src/test/java/org/springframework/test => spring-tx/src/test/java/org/springframework/tests}/transaction/CallCountingTransactionManager.java (97%)
 rename spring-tx/src/test/java/org/springframework/{ => tests}/transaction/MockJtaTransaction.java (96%)
 delete mode 100644 spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
 delete mode 100644 spring-tx/src/test/java/org/springframework/util/SerializationTestUtils.java
 delete mode 100644 spring-web/src/test/java/org/springframework/beans/BeanWithObjectProperty.java
 delete mode 100644 spring-web/src/test/java/org/springframework/beans/Colour.java
 delete mode 100644 spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java
 delete mode 100644 spring-web/src/test/java/org/springframework/beans/FieldAccessBean.java
 delete mode 100644 spring-web/src/test/java/org/springframework/beans/INestedTestBean.java
 delete mode 100644 spring-web/src/test/java/org/springframework/beans/IOther.java
 delete mode 100644 spring-web/src/test/java/org/springframework/beans/IndexedTestBean.java
 delete mode 100644 spring-web/src/test/java/org/springframework/beans/NestedTestBean.java
 delete mode 100644 spring-web/src/test/java/org/springframework/beans/Person.java
 delete mode 100644 spring-web/src/test/java/org/springframework/beans/SerializablePerson.java
 delete mode 100644 spring-web/src/test/java/org/springframework/beans/TestBean.java
 delete mode 100644 spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java
 delete mode 100644 spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java
 rename {spring-webmvc/src/test/java/org/springframework/http/client => spring-web/src/test/java/org/springframework/tests/web}/FreePortScanner.java (98%)
 delete mode 100644 spring-web/src/test/java/org/springframework/util/SerializationTestUtils.java
 delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java
 delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java
 delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/beans/INestedTestBean.java
 delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/beans/IOther.java
 delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/beans/ITestBean.java
 delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/beans/IndexedTestBean.java
 delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java
 delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java
 delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
 delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java
 delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java
 delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java
 delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
 delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
 delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
 delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
 delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
 delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java
 delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java
 delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
 delete mode 100644 spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockServletContext.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/beans/BeanWithObjectProperty.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/beans/Colour.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/beans/GenericBean.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/beans/INestedTestBean.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/beans/IOther.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/beans/ITestBean.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/beans/IndexedTestBean.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/beans/Pet.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/beans/TestBean.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/ui/jasperreports/PersonBean.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/ui/jasperreports/ProductBean.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/util/SerializationTestUtils.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/web/context/AbstractListableBeanFactoryTests.java
 delete mode 100644 spring-webmvc/src/test/java/org/springframework/web/context/ResourceBundleMessageSourceTests.java
 delete mode 100644 src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
 delete mode 100644 src/test/java/test/advice/CountingBeforeAdvice.java
 delete mode 100644 src/test/java/test/beans/Colour.java
 delete mode 100644 src/test/java/test/beans/INestedTestBean.java
 delete mode 100644 src/test/java/test/beans/IOther.java
 delete mode 100644 src/test/java/test/beans/ITestBean.java
 delete mode 100644 src/test/java/test/beans/IndexedTestBean.java
 delete mode 100644 src/test/java/test/beans/NestedTestBean.java
 delete mode 100644 src/test/java/test/beans/Pet.java
 delete mode 100644 src/test/java/test/beans/TestBean.java
 delete mode 100644 src/test/java/test/interceptor/NopInterceptor.java
 delete mode 100644 src/test/java/test/interceptor/SerializableNopInterceptor.java
 delete mode 100644 src/test/java/test/util/SerializationTestUtils.java

diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
index cf96bf3f06b..429350b00d8 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,10 +33,10 @@ import org.springframework.aop.Pointcut;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 
-import test.beans.IOther;
-import test.beans.ITestBean;
-import test.beans.TestBean;
-import test.beans.subpkg.DeepBean;
+import org.springframework.tests.sample.beans.IOther;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.tests.sample.beans.subpkg.DeepBean;
 
 /**
  * @author Rob Harrop
@@ -66,7 +66,7 @@ public final class AspectJExpressionPointcutTests {
 
 	@Test
 	public void testMatchExplicit() {
-		String expression = "execution(int test.beans.TestBean.getAge())";
+		String expression = "execution(int org.springframework.tests.sample.beans.TestBean.getAge())";
 
 		Pointcut pointcut = getPointcut(expression);
 		ClassFilter classFilter = pointcut.getClassFilter();
@@ -128,8 +128,8 @@ public final class AspectJExpressionPointcutTests {
 	 * @throws SecurityException
 	 */
 	private void testThisOrTarget(String which) throws SecurityException, NoSuchMethodException {
-		String matchesTestBean = which + "(test.beans.TestBean)";
-		String matchesIOther = which + "(test.beans.IOther)";
+		String matchesTestBean = which + "(org.springframework.tests.sample.beans.TestBean)";
+		String matchesIOther = which + "(org.springframework.tests.sample.beans.IOther)";
 		AspectJExpressionPointcut testBeanPc = new AspectJExpressionPointcut();
 		testBeanPc.setExpression(matchesTestBean);
 
@@ -156,7 +156,7 @@ public final class AspectJExpressionPointcutTests {
 	}
 
 	private void testWithinPackage(boolean matchSubpackages) throws SecurityException, NoSuchMethodException {
-		String withinBeansPackage = "within(test.beans.";
+		String withinBeansPackage = "within(org.springframework.tests.sample.beans.";
 		// Subpackages are matched by **
 		if (matchSubpackages) {
 			withinBeansPackage += ".";
@@ -214,7 +214,7 @@ public final class AspectJExpressionPointcutTests {
 
 	@Test
 	public void testMatchWithArgs() throws Exception {
-		String expression = "execution(void test.beans.TestBean.setSomeNumber(Number)) && args(Double)";
+		String expression = "execution(void org.springframework.tests.sample.beans.TestBean.setSomeNumber(Number)) && args(Double)";
 
 		Pointcut pointcut = getPointcut(expression);
 		ClassFilter classFilter = pointcut.getClassFilter();
@@ -235,7 +235,7 @@ public final class AspectJExpressionPointcutTests {
 
 	@Test
 	public void testSimpleAdvice() {
-		String expression = "execution(int test.beans.TestBean.getAge())";
+		String expression = "execution(int org.springframework.tests.sample.beans.TestBean.getAge())";
 
 		CallCountingInterceptor interceptor = new CallCountingInterceptor();
 
@@ -254,7 +254,7 @@ public final class AspectJExpressionPointcutTests {
 
 	@Test
 	public void testDynamicMatchingProxy() {
-		String expression = "execution(void test.beans.TestBean.setSomeNumber(Number)) && args(Double)";
+		String expression = "execution(void org.springframework.tests.sample.beans.TestBean.setSomeNumber(Number)) && args(Double)";
 
 		CallCountingInterceptor interceptor = new CallCountingInterceptor();
 
@@ -273,7 +273,7 @@ public final class AspectJExpressionPointcutTests {
 
 	@Test
 	public void testInvalidExpression() {
-		String expression = "execution(void test.beans.TestBean.setSomeNumber(Number) && args(Double)";
+		String expression = "execution(void org.springframework.tests.sample.beans.TestBean.setSomeNumber(Number) && args(Double)";
 
 		try {
 			getPointcut(expression).getClassFilter();  // call to getClassFilter forces resolution
@@ -315,7 +315,7 @@ public final class AspectJExpressionPointcutTests {
 
 	@Test
 	public void testWithUnsupportedPointcutPrimitive() throws Exception {
-		String expression = "call(int test.beans.TestBean.getAge())";
+		String expression = "call(int org.springframework.tests.sample.beans.TestBean.getAge())";
 
 		try {
 			getPointcut(expression).getClassFilter(); // call to getClassFilter forces resolution...
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java
index ac6dc31a2a2..057ad77309f 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import static org.junit.Assert.*;
 
 import org.junit.Test;
 
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * Tests for matching of bean() pointcut designator.
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java
index 8c84e801b8d..551756eea73 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,8 +28,8 @@ import org.aspectj.lang.reflect.SourceLocation;
 import org.aspectj.runtime.reflect.Factory;
 import static org.junit.Assert.*;
 import org.junit.Test;
-import test.beans.ITestBean;
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 import org.springframework.aop.MethodBeforeAdvice;
 import org.springframework.aop.framework.AopContext;
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java
index b8c336b0fbb..13635c2c6d1 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TigerAspectJExpressionPointcutTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ import org.junit.Test;
 
 import test.annotation.EmptySpringAnnotation;
 import test.annotation.transaction.Tx;
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 
 /**
@@ -70,7 +70,7 @@ public final class TigerAspectJExpressionPointcutTests {
 
 	@Test
 	public void testMatchGenericArgument() {
-		String expression = "execution(* set*(java.util.List) )";
+		String expression = "execution(* set*(java.util.List) )";
 		AspectJExpressionPointcut ajexp = new AspectJExpressionPointcut();
 		ajexp.setExpression(expression);
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
index fea874179e0..0275360441b 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/TypePatternClassFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,11 +22,11 @@ import org.junit.Test;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 
-import test.beans.CountingTestBean;
-import test.beans.IOther;
-import test.beans.ITestBean;
-import test.beans.TestBean;
-import test.beans.subpkg.DeepBean;
+import org.springframework.tests.sample.beans.CountingTestBean;
+import org.springframework.tests.sample.beans.IOther;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.tests.sample.beans.subpkg.DeepBean;
 
 /**
  * Unit tests for the {@link TypePatternClassFilter} class.
@@ -45,7 +45,7 @@ public final class TypePatternClassFilterTests {
 
 	@Test
 	public void testValidPatternMatching() {
-		TypePatternClassFilter tpcf = new TypePatternClassFilter("test.beans.*");
+		TypePatternClassFilter tpcf = new TypePatternClassFilter("org.springframework.tests.sample.beans.*");
 		assertTrue("Must match: in package", tpcf.matches(TestBean.class));
 		assertTrue("Must match: in package", tpcf.matches(ITestBean.class));
 		assertTrue("Must match: in package", tpcf.matches(IOther.class));
@@ -56,7 +56,7 @@ public final class TypePatternClassFilterTests {
 
 	@Test
 	public void testSubclassMatching() {
-		TypePatternClassFilter tpcf = new TypePatternClassFilter("test.beans.ITestBean+");
+		TypePatternClassFilter tpcf = new TypePatternClassFilter("org.springframework.tests.sample.beans.ITestBean+");
 		assertTrue("Must match: in package", tpcf.matches(TestBean.class));
 		assertTrue("Must match: in package", tpcf.matches(ITestBean.class));
 		assertTrue("Must match: in package", tpcf.matches(CountingTestBean.class));
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
index ae3ac04918e..273869e8a0a 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,8 +58,8 @@ import test.aop.DefaultLockable;
 import test.aop.Lockable;
 import test.aop.PerTargetAspect;
 import test.aop.TwoAdviceAspect;
-import test.beans.ITestBean;
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * Abstract tests for AspectJAdvisorFactory.
@@ -650,7 +650,7 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
 	}
 
 
-	@Aspect("pertypewithin(test.beans.IOther+)")
+	@Aspect("pertypewithin(org.springframework.tests.sample.beans.IOther+)")
 	public static class PerTypeWithinAspect {
 
 		public int count;
@@ -979,7 +979,7 @@ abstract class AbstractMakeModifiable {
 @Aspect
 class MakeITestBeanModifiable extends AbstractMakeModifiable {
 
-	@DeclareParents(value = "test.beans.ITestBean+",
+	@DeclareParents(value = "org.springframework.tests.sample.beans.ITestBean+",
 			defaultImpl=ModifiableImpl.class)
 	public static MutableModifable mixin;
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java
index d15b0a11cab..66d5e0f739e 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,8 +29,8 @@ import org.aspectj.lang.annotation.Pointcut;
 import org.junit.Test;
 import org.springframework.aop.aspectj.AspectJAdviceParameterNameDiscoverer;
 
-import test.beans.ITestBean;
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * @author Adrian Colyer
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java
index 88beb1455a5..966d289eb13 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectJPointcutAdvisorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ import org.springframework.aop.aspectj.AspectJExpressionPointcutTests;
 import org.springframework.aop.framework.AopConfigException;
 
 import test.aop.PerTargetAspect;
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 
 /**
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java
index 93aebbfa673..16d6f0e9e79 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,16 @@
 
 package org.springframework.aop.aspectj.annotation;
 
+import static org.junit.Assert.assertEquals;
+
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
-import static org.junit.Assert.*;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.springframework.util.SerializationTestUtils;
+
 import test.aop.PerThisAspect;
-import test.util.SerializationTestUtils;
 
 /**
  * @author Rob Harrop
diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJNamespaceHandlerTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJNamespaceHandlerTests.java
index 6b7d3ff0965..f1ff305aad4 100644
--- a/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJNamespaceHandlerTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.aop.aspectj.autoproxy;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -30,8 +30,7 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.beans.factory.xml.XmlReaderContext;
-
-import test.parsing.CollectingReaderEventListener;
+import org.springframework.tests.beans.CollectingReaderEventListener;
 
 /**
  * @author Rob Harrop
diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
index 939493b2eb0..984f5ada7b8 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml
@@ -20,7 +20,7 @@
 
 	
 
-	
+	
 
 	
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
index 0d86588b8c9..fec13dbbed1 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,10 @@
 
 package org.springframework.aop.config;
 
-import static org.junit.Assert.*;
-import static test.util.TestResourceUtils.qualifiedResource;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -32,8 +34,7 @@ import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
-
-import test.parsing.CollectingReaderEventListener;
+import org.springframework.tests.beans.CollectingReaderEventListener;
 
 /**
  * @author Rob Harrop
diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
index 472b91f7183..cd01ffd5326 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml
@@ -14,7 +14,7 @@
 
 	
 
-	
+	
 
 	
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
index 7654895ccee..850fbc15d1b 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml
@@ -14,7 +14,7 @@
 
 	
 
-	
+	
 
 	
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java
index 19ea1742c0b..7320dd553cc 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.springframework.aop.config;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static test.util.TestResourceUtils.qualifiedResource;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 import org.junit.Test;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
diff --git a/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java b/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java
index 3dbd38f98c6..9e0b3d14ebb 100644
--- a/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package org.springframework.aop.config;
 
 import static org.junit.Assert.assertTrue;
-import static test.util.TestResourceUtils.qualifiedResource;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 import org.junit.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java
index dca823663df..e2abdda7993 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,8 +27,8 @@ import java.util.List;
 import org.junit.Test;
 import org.springframework.aop.SpringProxy;
 
-import test.beans.ITestBean;
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * @author Rod Johnson
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java
index 03b971fed02..eaaf2d8d42b 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/IntroductionBenchmarkTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import org.junit.Test;
 import org.springframework.aop.support.DelegatingIntroductionInterceptor;
 import org.springframework.util.StopWatch;
 
-import test.beans.ITestBean;
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * Benchmarks for introductions.
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java
index 4e815534441..139ef6c415e 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/MethodInvocationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 import org.junit.Test;
 
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * @author Rod Johnson
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java
index 7f5a4bc4376..d9d43527dec 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/PrototypeTargetTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package org.springframework.aop.framework;
 
 import static org.junit.Assert.assertEquals;
-import static test.util.TestResourceUtils.qualifiedResource;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
index ddf48d28d82..7f856028885 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,28 +16,33 @@
 
 package org.springframework.aop.framework;
 
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import javax.accessibility.Accessible;
-import javax.swing.*;
+import javax.swing.JFrame;
+import javax.swing.RootPaneContainer;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
 import org.junit.Ignore;
 import org.junit.Test;
-import test.aop.CountingBeforeAdvice;
-import test.aop.NopInterceptor;
-import test.beans.IOther;
-import test.beans.ITestBean;
-import test.beans.TestBean;
-import test.util.TimeStamped;
-
 import org.springframework.aop.Advisor;
 import org.springframework.aop.interceptor.DebugInterceptor;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.support.DefaultIntroductionAdvisor;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.aop.support.DelegatingIntroductionInterceptor;
+import org.springframework.tests.TimeStamped;
+import org.springframework.tests.aop.advice.CountingBeforeAdvice;
+import org.springframework.tests.aop.interceptor.NopInterceptor;
+import org.springframework.tests.sample.beans.IOther;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * Also tests AdvisedSupport and ProxyCreatorSupport superclasses.
@@ -190,7 +195,7 @@ public final class ProxyFactoryTests {
 		TestBeanSubclass raw = new TestBeanSubclass();
 		ProxyFactory factory = new ProxyFactory(raw);
 		//System.out.println("Proxied interfaces are " + StringUtils.arrayToDelimitedString(factory.getProxiedInterfaces(), ","));
-		assertEquals("Found correct number of interfaces", 3, factory.getProxiedInterfaces().length);
+		assertEquals("Found correct number of interfaces", 5, factory.getProxiedInterfaces().length);
 		ITestBean tb = (ITestBean) factory.getProxy();
 		assertThat("Picked up secondary interface", tb, instanceOf(IOther.class));
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java
index fe72f963255..633705f0686 100644
--- a/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,21 +16,23 @@
 
 package org.springframework.aop.framework.adapter;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.rmi.RemoteException;
+
 import javax.transaction.TransactionRolledbackException;
 
 import org.aopalliance.intercept.MethodInvocation;
-import static org.junit.Assert.*;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-
 import org.junit.Test;
-import test.aop.MethodCounter;
-
 import org.springframework.aop.ThrowsAdvice;
+import org.springframework.tests.aop.advice.MethodCounter;
+
 
 /**
  * @author Rod Johnson
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java
index 964fac9efaf..db2751f5137 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ConcurrencyThrottleInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,19 +16,17 @@
 
 package org.springframework.aop.interceptor;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.Test;
-
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.framework.ProxyFactory;
-
-import test.beans.DerivedTestBean;
-import test.beans.ITestBean;
-import test.beans.TestBean;
-import test.util.SerializationTestUtils;
+import org.springframework.tests.sample.beans.DerivedTestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.util.SerializationTestUtils;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java
index 170f5b34bc5..3b0bd31e530 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeBeanNameAdvisorsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@ import org.junit.Test;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.beans.factory.NamedBean;
 
-import test.beans.ITestBean;
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * @author Rod Johnson
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml
index bea92760ce6..5f00163fb55 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml
@@ -5,8 +5,8 @@
 	Tests for throws advice.
 -->
 
-	
-	
+
+	
 
 	
 		
@@ -14,8 +14,8 @@
 		
 		INSTANCE
 	
-	
-	
+
+	
 
 	
 		
@@ -25,5 +25,5 @@
 			exposeInvocation,countingBeforeAdvice,nopInterceptor
 		
 	
-	
-		
+
+
diff --git a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java
index 632c5bad07d..5405d09831b 100644
--- a/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,16 +18,15 @@ package org.springframework.aop.interceptor;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static test.util.TestResourceUtils.qualifiedResource;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 import org.aopalliance.intercept.MethodInvocation;
 import org.junit.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
-
-import test.beans.ITestBean;
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * Non-XML tests are in AbstractAopProxyTests
diff --git a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java
index ccbe9502bfa..84c4decb198 100644
--- a/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/scope/ScopedProxyAutowireTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package org.springframework.aop.scope;
 
 import static org.junit.Assert.assertSame;
-import static test.util.TestResourceUtils.qualifiedResource;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 import org.junit.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/AbstractRegexpMethodPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/AbstractRegexpMethodPointcutTests.java
index b230ed72605..03cf0b719e3 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/AbstractRegexpMethodPointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/AbstractRegexpMethodPointcutTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,16 @@
 
 package org.springframework.aop.support;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 
 import org.junit.Before;
 import org.junit.Test;
-
-import test.beans.TestBean;
-import test.util.SerializationTestUtils;
+import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.util.SerializationTestUtils;
 
 /**
  * @author Rod Johnson
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
index 505697408c9..01be11617ea 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/AopUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,9 @@
 
 package org.springframework.aop.support;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
 import java.lang.reflect.Method;
 
@@ -26,10 +28,10 @@ import org.springframework.aop.MethodMatcher;
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
 import org.springframework.aop.target.EmptyTargetSource;
+import org.springframework.tests.aop.interceptor.NopInterceptor;
+import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.util.SerializationTestUtils;
 
-import test.aop.NopInterceptor;
-import test.beans.TestBean;
-import test.util.SerializationTestUtils;
 
 /**
  * @author Rod Johnson
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java
index 42992fb57c2..51f18dde21f 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/ClassFiltersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@ import org.junit.Test;
 import org.springframework.aop.ClassFilter;
 import org.springframework.core.NestedRuntimeException;
 
-import test.beans.ITestBean;
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * @author Rod Johnson
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java
index 1c250e966da..35828d28e0b 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.springframework.aop.support;
 import junit.framework.TestCase;
 
 import org.springframework.aop.framework.ProxyFactory;
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.ClassUtils;
 
 /**
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java
index 2ca2acd665e..513885ed21f 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/ComposablePointcutTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import org.springframework.aop.MethodMatcher;
 import org.springframework.aop.Pointcut;
 import org.springframework.core.NestedRuntimeException;
 
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * @author Rod Johnson
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java
index 6288f7674af..be21c52d2aa 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/ControlFlowPointcutTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,16 @@
 
 package org.springframework.aop.support;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 
 import org.junit.Test;
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.tests.aop.interceptor.NopInterceptor;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.aop.NopInterceptor;
-import test.beans.ITestBean;
-import test.beans.TestBean;
 
 /**
  * @author Rod Johnson
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
index 1b7c8d60b36..1872a457f9a 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/DelegatingIntroductionInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,9 @@
 
 package org.springframework.aop.support;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 
@@ -27,16 +29,15 @@ import org.junit.Test;
 import org.springframework.aop.IntroductionAdvisor;
 import org.springframework.aop.IntroductionInterceptor;
 import org.springframework.aop.framework.ProxyFactory;
-
-import test.aop.SerializableNopInterceptor;
-import test.beans.INestedTestBean;
-import test.beans.ITestBean;
-import test.beans.NestedTestBean;
-import test.beans.Person;
-import test.beans.SerializablePerson;
-import test.beans.TestBean;
-import test.util.SerializationTestUtils;
-import test.util.TimeStamped;
+import org.springframework.tests.TimeStamped;
+import org.springframework.tests.aop.interceptor.SerializableNopInterceptor;
+import org.springframework.tests.sample.beans.INestedTestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.NestedTestBean;
+import org.springframework.tests.sample.beans.Person;
+import org.springframework.tests.sample.beans.SerializablePerson;
+import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.util.SerializationTestUtils;
 
 /**
  * @author Rod Johnson
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java b/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java
index 5b3ceb039b8..8f06791335c 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/MethodMatchersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,17 +16,18 @@
 
 package org.springframework.aop.support;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
 import java.lang.reflect.Method;
 
 import org.junit.Test;
 import org.springframework.aop.MethodMatcher;
-
-import test.beans.IOther;
-import test.beans.ITestBean;
-import test.beans.TestBean;
-import test.util.SerializationTestUtils;
+import org.springframework.tests.sample.beans.IOther;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.util.SerializationTestUtils;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java b/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java
index 8b89281e763..5edde823dbc 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/NameMatchMethodPointcutTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,18 +16,20 @@
 
 package org.springframework.aop.support;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.tests.aop.interceptor.NopInterceptor;
+import org.springframework.tests.aop.interceptor.SerializableNopInterceptor;
+import org.springframework.tests.sample.beans.Person;
+import org.springframework.tests.sample.beans.SerializablePerson;
+import org.springframework.util.SerializationTestUtils;
 
-import test.aop.NopInterceptor;
-import test.aop.SerializableNopInterceptor;
-import test.beans.Person;
-import test.beans.SerializablePerson;
-import test.util.SerializationTestUtils;
 
 /**
  * @author Rod Johnson
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java
index 1ed7cd8430a..b24dccc2c9d 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/PointcutsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import org.junit.Test;
 import org.springframework.aop.ClassFilter;
 import org.springframework.aop.Pointcut;
 
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * @author Rod Johnson
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml
index 1e3ae07f26a..cbd660d7fe9 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests-context.xml
@@ -4,12 +4,12 @@
 
 
 	
-		
+	
 		custom
 		666
 	
 
-	
+	
 
 	
 		
@@ -21,19 +21,19 @@
 	
 
 	
-		test.beans.ITestBean		
+		org.springframework.tests.sample.beans.ITestBean
 		
-		settersAdvisor		
+		settersAdvisor
 	
 
 	
-		test.beans.Person
+		org.springframework.tests.sample.beans.Person
 		
-			
+			
 				serializableSettersAdvised
 			
 		
-		settersAdvisor	
+		settersAdvisor
 	
 
 	
@@ -48,11 +48,11 @@
 	
 
 	
-		test.beans.ITestBean		
+		org.springframework.tests.sample.beans.ITestBean
 		
 		true
-			
-		settersAndAbsquatulateAdvisor		
+		
+		settersAndAbsquatulateAdvisor
 	
 
-		
+
diff --git a/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
index b55f2bb9f90..4a3d04cbd8f 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/RegexpMethodPointcutAdvisorIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,20 +17,20 @@
 package org.springframework.aop.support;
 
 import static org.junit.Assert.assertEquals;
-import static test.util.TestResourceUtils.qualifiedResource;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 import org.junit.Test;
 import org.springframework.aop.framework.Advised;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
+import org.springframework.tests.aop.interceptor.NopInterceptor;
+import org.springframework.tests.aop.interceptor.SerializableNopInterceptor;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.Person;
+import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.util.SerializationTestUtils;
 
-import test.aop.NopInterceptor;
-import test.aop.SerializableNopInterceptor;
-import test.beans.ITestBean;
-import test.beans.Person;
-import test.beans.TestBean;
-import test.util.SerializationTestUtils;
 
 /**
  * @author Rod Johnson
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests-context.xml
index 75be80560ee..07e9e4d3d95 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests-context.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests-context.xml
@@ -3,7 +3,7 @@
 
 
 
-	
+	
 
 	
 		
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests.java b/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests.java
index e70d2c7baa3..af6b44c0ca1 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceProxyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,15 +17,14 @@
 package org.springframework.aop.target;
 
 import static org.junit.Assert.assertTrue;
-import static test.util.TestResourceUtils.qualifiedResource;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 import org.junit.Test;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
-
-import test.beans.ITestBean;
+import org.springframework.tests.sample.beans.ITestBean;
 
 /**
  * @author Rob Harrop
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml
index 04cc623d30b..33f30be78c1 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests-context.xml
@@ -4,15 +4,15 @@
 
 
 	
-		
+	
 		10
 	
 
-	
+	
 		20
 	
-	
-	
 	
@@ -23,5 +23,4 @@
 		
 	
 
-		
-	
\ No newline at end of file
+
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
index cb897b602f1..a4bb0c2554b 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/HotSwappableTargetSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ package org.springframework.aop.target;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static test.util.TestResourceUtils.qualifiedResource;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 import org.junit.After;
 import org.junit.Before;
@@ -30,12 +30,12 @@ import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
+import org.springframework.tests.aop.interceptor.SerializableNopInterceptor;
+import org.springframework.tests.sample.beans.Person;
+import org.springframework.tests.sample.beans.SerializablePerson;
+import org.springframework.tests.sample.beans.SideEffectBean;
+import org.springframework.util.SerializationTestUtils;
 
-import test.aop.SerializableNopInterceptor;
-import test.beans.Person;
-import test.beans.SerializablePerson;
-import test.beans.SideEffectBean;
-import test.util.SerializationTestUtils;
 
 
 /**
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml
index 9bfe5dfd960..f633c66d5b2 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-customTarget.xml
@@ -3,7 +3,7 @@
 
 
 
-	
+	
 		10
 	
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml
index 74b1fe0ec22..10ef6a35aef 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests-singleton.xml
@@ -3,7 +3,7 @@
 
 
 
-	
+	
 		10
 	
 
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
index 57cedd275bc..b5bb4a1751c 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/LazyInitTargetSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ package org.springframework.aop.target;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static test.util.TestResourceUtils.qualifiedResource;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 import java.util.Set;
 
@@ -27,8 +27,7 @@ import org.junit.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
-
-import test.beans.ITestBean;
+import org.springframework.tests.sample.beans.ITestBean;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
index ea2eef2ae13..91e1d087f59 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeBasedTargetSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,17 +16,17 @@
 
 package org.springframework.aop.target;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.springframework.aop.TargetSource;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
-
-import test.beans.SerializablePerson;
-import test.beans.TestBean;
-import test.util.SerializationTestUtils;
+import org.springframework.tests.sample.beans.SerializablePerson;
+import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.util.SerializationTestUtils;
 
 /**
  * Unit tests relating to the abstract {@link AbstractPrototypeBasedTargetSource}
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml
index b271b1f5565..961269efde2 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml
+++ b/spring-aop/src/test/java/org/springframework/aop/target/PrototypeTargetSourceTests-context.xml
@@ -4,22 +4,22 @@
 
 
 	
-		
+	
 		10
 	
-	
-	
+
+	
 		10
 	
 
-		
+	
 		prototypeTest
 	
-	
-	
-	
+
+	
+
 	
-		debugInterceptor,test		
+		debugInterceptor,test
 	
 
 	
@@ -20,7 +20,7 @@
 		
 		getStatsMixin
 	
-	
+
 	
@@ -33,23 +33,22 @@
 	
 
 	
-	
-	
+
+	
 		Rod
 		
 	
-	
-	
+
+	
 		Kerry
 	
-	
-		
+
+	
 		test
 	
-	
+
 	
 		
 	
 
-		
-	
\ No newline at end of file
+
diff --git a/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java
index 1a6d5be3e30..b8976f1958a 100644
--- a/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/target/ThreadLocalTargetSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,16 +19,15 @@ package org.springframework.aop.target;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
-import static test.util.TestResourceUtils.qualifiedResource;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
-
-import test.beans.ITestBean;
-import test.beans.SideEffectBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.SideEffectBean;
 
 
 /**
diff --git a/src/test/java/test/advice/CountingAfterReturningAdvice.java b/spring-aop/src/test/java/org/springframework/tests/aop/advice/CountingAfterReturningAdvice.java
similarity index 95%
rename from src/test/java/test/advice/CountingAfterReturningAdvice.java
rename to spring-aop/src/test/java/org/springframework/tests/aop/advice/CountingAfterReturningAdvice.java
index a8a3a01e3a3..5b206516af9 100644
--- a/src/test/java/test/advice/CountingAfterReturningAdvice.java
+++ b/spring-aop/src/test/java/org/springframework/tests/aop/advice/CountingAfterReturningAdvice.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.advice;
+package org.springframework.tests.aop.advice;
 
 import java.lang.reflect.Method;
 
diff --git a/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java b/spring-aop/src/test/java/org/springframework/tests/aop/advice/CountingBeforeAdvice.java
similarity index 95%
rename from spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java
rename to spring-aop/src/test/java/org/springframework/tests/aop/advice/CountingBeforeAdvice.java
index 91a49faa0fe..2e34d50262c 100644
--- a/spring-aop/src/test/java/test/aop/CountingBeforeAdvice.java
+++ b/spring-aop/src/test/java/org/springframework/tests/aop/advice/CountingBeforeAdvice.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.aop;
+package org.springframework.tests.aop.advice;
 
 import java.lang.reflect.Method;
 
diff --git a/src/test/java/test/advice/MethodCounter.java b/spring-aop/src/test/java/org/springframework/tests/aop/advice/MethodCounter.java
similarity index 97%
rename from src/test/java/test/advice/MethodCounter.java
rename to spring-aop/src/test/java/org/springframework/tests/aop/advice/MethodCounter.java
index e0e45d6f142..931b0ec6681 100644
--- a/src/test/java/test/advice/MethodCounter.java
+++ b/spring-aop/src/test/java/org/springframework/tests/aop/advice/MethodCounter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.advice;
+package org.springframework.tests.aop.advice;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
diff --git a/spring-context/src/test/java/test/advice/MyThrowsHandler.java b/spring-aop/src/test/java/org/springframework/tests/aop/advice/MyThrowsHandler.java
similarity index 93%
rename from spring-context/src/test/java/test/advice/MyThrowsHandler.java
rename to spring-aop/src/test/java/org/springframework/tests/aop/advice/MyThrowsHandler.java
index abe79f9dc32..96edd1280cd 100644
--- a/spring-context/src/test/java/test/advice/MyThrowsHandler.java
+++ b/spring-aop/src/test/java/org/springframework/tests/aop/advice/MyThrowsHandler.java
@@ -1,7 +1,7 @@
 /**
  *
  */
-package test.advice;
+package org.springframework.tests.aop.advice;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
diff --git a/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java b/spring-aop/src/test/java/org/springframework/tests/aop/advice/TimestampIntroductionAdvisor.java
similarity index 89%
rename from spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java
rename to spring-aop/src/test/java/org/springframework/tests/aop/advice/TimestampIntroductionAdvisor.java
index bdcb2f2c9e4..0fa9d4b4da9 100644
--- a/spring-context/src/test/java/test/advice/TimestampIntroductionAdvisor.java
+++ b/spring-aop/src/test/java/org/springframework/tests/aop/advice/TimestampIntroductionAdvisor.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package test.advice;
+package org.springframework.tests.aop.advice;
 
 import org.springframework.aop.support.DelegatingIntroductionInterceptor;
 import org.springframework.aop.support.DefaultIntroductionAdvisor;
+import org.springframework.tests.aop.interceptor.TimestampIntroductionInterceptor;
 
-import test.interceptor.TimestampIntroductionInterceptor;
 
 /**
  *
diff --git a/spring-context/src/test/java/test/interceptor/NopInterceptor.java b/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/NopInterceptor.java
similarity index 96%
rename from spring-context/src/test/java/test/interceptor/NopInterceptor.java
rename to spring-aop/src/test/java/org/springframework/tests/aop/interceptor/NopInterceptor.java
index b1cdf832a4a..d152719261c 100644
--- a/spring-context/src/test/java/test/interceptor/NopInterceptor.java
+++ b/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/NopInterceptor.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package test.interceptor;
+package org.springframework.tests.aop.interceptor;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
diff --git a/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java b/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/SerializableNopInterceptor.java
similarity index 95%
rename from spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java
rename to spring-aop/src/test/java/org/springframework/tests/aop/interceptor/SerializableNopInterceptor.java
index d8d179f7e43..8c72878c9df 100644
--- a/spring-context/src/test/java/test/interceptor/SerializableNopInterceptor.java
+++ b/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/SerializableNopInterceptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.interceptor;
+package org.springframework.tests.aop.interceptor;
 
 import java.io.Serializable;
 
diff --git a/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java b/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/TimestampIntroductionInterceptor.java
similarity index 89%
rename from spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java
rename to spring-aop/src/test/java/org/springframework/tests/aop/interceptor/TimestampIntroductionInterceptor.java
index eb9789edb37..de4dfecff6b 100644
--- a/spring-context/src/test/java/test/interceptor/TimestampIntroductionInterceptor.java
+++ b/spring-aop/src/test/java/org/springframework/tests/aop/interceptor/TimestampIntroductionInterceptor.java
@@ -14,15 +14,14 @@
  * limitations under the License.
  */
 
-package test.interceptor;
+package org.springframework.tests.aop.interceptor;
 
 import org.springframework.aop.support.DelegatingIntroductionInterceptor;
-
-import test.util.TimeStamped;
+import org.springframework.tests.TimeStamped;
 
 @SuppressWarnings("serial")
 public class TimestampIntroductionInterceptor extends DelegatingIntroductionInterceptor
-	implements TimeStamped {
+		implements TimeStamped {
 
 	private long ts;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/Person.java b/spring-aop/src/test/java/org/springframework/tests/sample/beans/Person.java
similarity index 82%
rename from spring-webmvc/src/test/java/org/springframework/beans/Person.java
rename to spring-aop/src/test/java/org/springframework/tests/sample/beans/Person.java
index 7c66f4b451b..38e0903e2e6 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/Person.java
+++ b/spring-aop/src/test/java/org/springframework/tests/sample/beans/Person.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans;
+package org.springframework.tests.sample.beans;
 
 /**
  *
@@ -23,14 +23,16 @@ package org.springframework.beans;
 public interface Person {
 
 	String getName();
+
 	void setName(String name);
+
 	int getAge();
+
 	void setAge(int i);
 
 	/**
-	 * Test for non-property method matching.
-	 * If the parameter is a Throwable, it will be thrown rather than
-	 * returned.
+	 * Test for non-property method matching. If the parameter is a Throwable, it will be
+	 * thrown rather than returned.
 	 */
 	Object echo(Object o) throws Throwable;
-}
\ No newline at end of file
+}
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-aop/src/test/java/org/springframework/tests/sample/beans/SerializablePerson.java
similarity index 96%
rename from spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java
rename to spring-aop/src/test/java/org/springframework/tests/sample/beans/SerializablePerson.java
index dbe365f4937..2730d50c8ec 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java
+++ b/spring-aop/src/test/java/org/springframework/tests/sample/beans/SerializablePerson.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans;
+package org.springframework.tests.sample.beans;
 
 import java.io.Serializable;
 
diff --git a/spring-aop/src/test/java/test/beans/subpkg/DeepBean.java b/spring-aop/src/test/java/org/springframework/tests/sample/beans/subpkg/DeepBean.java
similarity index 94%
rename from spring-aop/src/test/java/test/beans/subpkg/DeepBean.java
rename to spring-aop/src/test/java/org/springframework/tests/sample/beans/subpkg/DeepBean.java
index b18646f4d02..45546b4cfde 100644
--- a/spring-aop/src/test/java/test/beans/subpkg/DeepBean.java
+++ b/spring-aop/src/test/java/org/springframework/tests/sample/beans/subpkg/DeepBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.beans.subpkg;
+package org.springframework.tests.sample.beans.subpkg;
 
 import org.springframework.aop.aspectj.AspectJExpressionPointcutTests;
 
diff --git a/spring-aop/src/test/java/test/aop/MethodCounter.java b/spring-aop/src/test/java/test/aop/MethodCounter.java
deleted file mode 100644
index ae673bd168d..00000000000
--- a/spring-aop/src/test/java/test/aop/MethodCounter.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.aop;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-
-/**
- * Abstract superclass for counting advices etc.
- *
- * @author Rod Johnson
- * @author Chris Beams
- */
-@SuppressWarnings("serial")
-public class MethodCounter implements Serializable {
-
-	/** Method name --> count, does not understand overloading */
-	private HashMap map = new HashMap();
-
-	private int allCount;
-
-	protected void count(Method m) {
-		count(m.getName());
-	}
-
-	protected void count(String methodName) {
-		Integer i = map.get(methodName);
-		i = (i != null) ? new Integer(i.intValue() + 1) : new Integer(1);
-		map.put(methodName, i);
-		++allCount;
-	}
-
-	public int getCalls(String methodName) {
-		Integer i = map.get(methodName);
-		return (i != null ? i.intValue() : 0);
-	}
-
-	public int getCalls() {
-		return allCount;
-	}
-
-	/**
-	 * A bit simplistic: just wants the same class.
-	 * Doesn't worry about counts.
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object other) {
-		return (other != null && other.getClass() == this.getClass());
-	}
-
-	public int hashCode() {
-		return getClass().hashCode();
-	}
-
-}
diff --git a/spring-aop/src/test/java/test/aop/NopInterceptor.java b/spring-aop/src/test/java/test/aop/NopInterceptor.java
deleted file mode 100644
index 20b9ece08fd..00000000000
--- a/spring-aop/src/test/java/test/aop/NopInterceptor.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.aop;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-
-/**
- * Trivial interceptor that can be introduced in a chain to display it.
- *
- * @author Rod Johnson
- */
-public class NopInterceptor implements MethodInterceptor {
-
-	private int count;
-
-	/**
-	 * @see org.aopalliance.intercept.MethodInterceptor#invoke(MethodInvocation)
-	 */
-	@Override
-	public Object invoke(MethodInvocation invocation) throws Throwable {
-		increment();
-		return invocation.proceed();
-	}
-
-	public int getCount() {
-		return this.count;
-	}
-
-	protected void increment() {
-		++count;
-	}
-
-	public boolean equals(Object other) {
-		if (!(other instanceof NopInterceptor)) {
-			return false;
-		}
-		if (this == other) {
-			return true;
-		}
-		return this.count == ((NopInterceptor) other).count;
-	}
-
-}
diff --git a/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java b/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java
deleted file mode 100644
index 064df39ab52..00000000000
--- a/spring-aop/src/test/java/test/aop/SerializableNopInterceptor.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.aop;
-
-import java.io.Serializable;
-
-
-
-/**
- * Subclass of NopInterceptor that is serializable and
- * can be used to test proxy serialization.
- *
- * @author Rod Johnson
- * @author Chris Beams
- */
-@SuppressWarnings("serial")
-public class SerializableNopInterceptor extends NopInterceptor implements Serializable {
-
-	/**
-	 * We must override this field and the related methods as
-	 * otherwise count won't be serialized from the non-serializable
-	 * NopInterceptor superclass.
-	 */
-	private int count;
-
-	@Override
-	public int getCount() {
-		return this.count;
-	}
-
-	@Override
-	protected void increment() {
-		++count;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-aop/src/test/java/test/beans/Colour.java b/spring-aop/src/test/java/test/beans/Colour.java
deleted file mode 100644
index 8793fd3f94b..00000000000
--- a/spring-aop/src/test/java/test/beans/Colour.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-import org.springframework.core.enums.ShortCodedLabeledEnum;
-
-/**
- * @author Rob Harrop
- */
-@SuppressWarnings("serial")
-public class Colour extends ShortCodedLabeledEnum {
-
-	public static final Colour RED = new Colour(0, "RED");
-	public static final Colour BLUE = new Colour(1, "BLUE");
-	public static final Colour GREEN = new Colour(2, "GREEN");
-	public static final Colour PURPLE = new Colour(3, "PURPLE");
-
-	private Colour(int code, String label) {
-		super(code, label);
-	}
-
-}
\ No newline at end of file
diff --git a/spring-aop/src/test/java/test/beans/DerivedTestBean.java b/spring-aop/src/test/java/test/beans/DerivedTestBean.java
deleted file mode 100644
index 225ae1a300d..00000000000
--- a/spring-aop/src/test/java/test/beans/DerivedTestBean.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-import java.io.Serializable;
-
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.beans.factory.DisposableBean;
-
-/**
- * @author Juergen Hoeller
- * @since 21.08.2003
- */
-@SuppressWarnings("serial")
-public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean {
-
-	private String beanName;
-
-	private boolean initialized;
-
-	private boolean destroyed;
-
-
-	public DerivedTestBean() {
-	}
-
-	public DerivedTestBean(String[] names) {
-		if (names == null || names.length < 2) {
-			throw new IllegalArgumentException("Invalid names array");
-		}
-		setName(names[0]);
-		setBeanName(names[1]);
-	}
-
-	public static DerivedTestBean create(String[] names) {
-		return new DerivedTestBean(names);
-	}
-
-
-	@Override
-	public void setBeanName(String beanName) {
-		if (this.beanName == null || beanName == null) {
-			this.beanName = beanName;
-		}
-	}
-
-	@Override
-	public String getBeanName() {
-		return beanName;
-	}
-
-	public void setSpouseRef(String name) {
-		setSpouse(new TestBean(name));
-	}
-
-
-	public void initialize() {
-		this.initialized = true;
-	}
-
-	public boolean wasInitialized() {
-		return initialized;
-	}
-
-
-	@Override
-	public void destroy() {
-		this.destroyed = true;
-	}
-
-	@Override
-	public boolean wasDestroyed() {
-		return destroyed;
-	}
-
-}
diff --git a/spring-aop/src/test/java/test/beans/INestedTestBean.java b/spring-aop/src/test/java/test/beans/INestedTestBean.java
deleted file mode 100644
index 56c9d829ee3..00000000000
--- a/spring-aop/src/test/java/test/beans/INestedTestBean.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-public interface INestedTestBean {
-
-	public String getCompany();
-
-}
\ No newline at end of file
diff --git a/spring-aop/src/test/java/test/beans/IOther.java b/spring-aop/src/test/java/test/beans/IOther.java
deleted file mode 100644
index f3c6263261e..00000000000
--- a/spring-aop/src/test/java/test/beans/IOther.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-public interface IOther {
-
-	void absquatulate();
-
-}
\ No newline at end of file
diff --git a/spring-aop/src/test/java/test/beans/ITestBean.java b/spring-aop/src/test/java/test/beans/ITestBean.java
deleted file mode 100644
index 74f371b0547..00000000000
--- a/spring-aop/src/test/java/test/beans/ITestBean.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2002-2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-import java.io.IOException;
-
-/**
- * Interface used for {@link test.beans.TestBean}.
- *
- * 
Two methods are the same as on Person, but if this
- * extends person it breaks quite a few tests..
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public interface ITestBean {
-
-	int getAge();
-
-	void setAge(int age);
-
-	String getName();
-
-	void setName(String name);
-
-	ITestBean getSpouse();
-
-	void setSpouse(ITestBean spouse);
-
-	ITestBean[] getSpouses();
-
-	String[] getStringArray();
-
-	void setStringArray(String[] stringArray);
-
-	/**
-	 * Throws a given (non-null) exception.
-	 */
-	void exceptional(Throwable t) throws Throwable;
-
-	Object returnsThis();
-
-	INestedTestBean getDoctor();
-
-	INestedTestBean getLawyer();
-
-	/**
-	 * Increment the age by one.
-	 * @return the previous age
-	 */
-	int haveBirthday();
-
-	void unreliableFileOperation() throws IOException;
-
-}
\ No newline at end of file
diff --git a/spring-aop/src/test/java/test/beans/NestedTestBean.java b/spring-aop/src/test/java/test/beans/NestedTestBean.java
deleted file mode 100644
index edc145ad7d2..00000000000
--- a/spring-aop/src/test/java/test/beans/NestedTestBean.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-/**
- * Simple nested test bean used for testing bean factories, AOP framework etc.
- *
- * @author Trevor D. Cook
- * @since 30.09.2003
- */
-public class NestedTestBean implements INestedTestBean {
-
-	private String company = "";
-
-	public NestedTestBean() {
-	}
-
-	public NestedTestBean(String company) {
-		setCompany(company);
-	}
-
-	public void setCompany(String company) {
-		this.company = (company != null ? company : "");
-	}
-
-	@Override
-	public String getCompany() {
-		return company;
-	}
-
-	public boolean equals(Object obj) {
-		if (!(obj instanceof NestedTestBean)) {
-			return false;
-		}
-		NestedTestBean ntb = (NestedTestBean) obj;
-		return this.company.equals(ntb.company);
-	}
-
-	public int hashCode() {
-		return this.company.hashCode();
-	}
-
-	public String toString() {
-		return "NestedTestBean: " + this.company;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-aop/src/test/java/test/beans/SerializablePerson.java b/spring-aop/src/test/java/test/beans/SerializablePerson.java
deleted file mode 100644
index 3aa60f1fdc0..00000000000
--- a/spring-aop/src/test/java/test/beans/SerializablePerson.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-import java.io.Serializable;
-
-import org.springframework.util.ObjectUtils;
-
-/**
- * Serializable implementation of the Person interface.
- *
- * @author Rod Johnson
- */
-@SuppressWarnings("serial")
-public class SerializablePerson implements Person, Serializable {
-
-	private String name;
-	private int age;
-
-	@Override
-	public int getAge() {
-		return age;
-	}
-
-	@Override
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	@Override
-	public Object echo(Object o) throws Throwable {
-		if (o instanceof Throwable) {
-			throw (Throwable) o;
-		}
-		return o;
-	}
-
-	public boolean equals(Object other) {
-		if (!(other instanceof SerializablePerson)) {
-			return false;
-		}
-		SerializablePerson p = (SerializablePerson) other;
-		return p.age == age && ObjectUtils.nullSafeEquals(name, p.name);
-	}
-
-}
diff --git a/spring-aop/src/test/java/test/beans/TestBean.java b/spring-aop/src/test/java/test/beans/TestBean.java
deleted file mode 100644
index 3f50f93836c..00000000000
--- a/spring-aop/src/test/java/test/beans/TestBean.java
+++ /dev/null
@@ -1,431 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.springframework.util.ObjectUtils;
-
-/**
- * Simple test bean used for testing bean factories, the AOP framework etc.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @since 15 April 2001
- */
-public class TestBean implements ITestBean, IOther, Comparable {
-
-	private String beanName;
-
-	private String country;
-
-	private boolean postProcessed;
-
-	private String name;
-
-	private String sex;
-
-	private int age;
-
-	private boolean jedi;
-
-	private ITestBean[] spouses;
-
-	private String touchy;
-
-	private String[] stringArray;
-
-	private Integer[] someIntegerArray;
-
-	private Date date = new Date();
-
-	private Float myFloat = new Float(0.0);
-
-	private Collection friends = new LinkedList();
-
-	private Set someSet = new HashSet();
-
-	private Map someMap = new HashMap();
-
-	private List someList = new ArrayList();
-
-	private Properties someProperties = new Properties();
-
-	private INestedTestBean doctor = new NestedTestBean();
-
-	private INestedTestBean lawyer = new NestedTestBean();
-
-	private boolean destroyed;
-
-	private Number someNumber;
-
-	private Colour favouriteColour;
-
-	private Boolean someBoolean;
-
-	private List otherColours;
-
-	private List pets;
-
-
-	public TestBean() {
-	}
-
-	public TestBean(String name) {
-		this.name = name;
-	}
-
-	public TestBean(ITestBean spouse) {
-		this.spouses = new ITestBean[] {spouse};
-	}
-
-	public TestBean(String name, int age) {
-		this.name = name;
-		this.age = age;
-	}
-
-	public TestBean(ITestBean spouse, Properties someProperties) {
-		this.spouses = new ITestBean[] {spouse};
-		this.someProperties = someProperties;
-	}
-
-	public TestBean(List someList) {
-		this.someList = someList;
-	}
-
-	public TestBean(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public TestBean(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public TestBean(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-
-	public void setBeanName(String beanName) {
-		this.beanName = beanName;
-	}
-
-	public String getBeanName() {
-		return beanName;
-	}
-
-	public void setPostProcessed(boolean postProcessed) {
-		this.postProcessed = postProcessed;
-	}
-
-	public boolean isPostProcessed() {
-		return postProcessed;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getSex() {
-		return sex;
-	}
-
-	public void setSex(String sex) {
-		this.sex = sex;
-		if (this.name == null) {
-			this.name = sex;
-		}
-	}
-
-	@Override
-	public int getAge() {
-		return age;
-	}
-
-	@Override
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-	public boolean isJedi() {
-		return jedi;
-	}
-
-	public void setJedi(boolean jedi) {
-		this.jedi = jedi;
-	}
-
-	@Override
-	public ITestBean getSpouse() {
-		return (spouses != null ? spouses[0] : null);
-	}
-
-	@Override
-	public void setSpouse(ITestBean spouse) {
-		this.spouses = new ITestBean[] {spouse};
-	}
-
-	@Override
-	public ITestBean[] getSpouses() {
-		return spouses;
-	}
-
-	public String getTouchy() {
-		return touchy;
-	}
-
-	public void setTouchy(String touchy) throws Exception {
-		if (touchy.indexOf('.') != -1) {
-			throw new Exception("Can't contain a .");
-		}
-		if (touchy.indexOf(',') != -1) {
-			throw new NumberFormatException("Number format exception: contains a ,");
-		}
-		this.touchy = touchy;
-	}
-
-	public String getCountry() {
-		return country;
-	}
-
-	public void setCountry(String country) {
-		this.country = country;
-	}
-
-	@Override
-	public String[] getStringArray() {
-		return stringArray;
-	}
-
-	@Override
-	public void setStringArray(String[] stringArray) {
-		this.stringArray = stringArray;
-	}
-
-	public Integer[] getSomeIntegerArray() {
-		return someIntegerArray;
-	}
-
-	public void setSomeIntegerArray(Integer[] someIntegerArray) {
-		this.someIntegerArray = someIntegerArray;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public Float getMyFloat() {
-		return myFloat;
-	}
-
-	public void setMyFloat(Float myFloat) {
-		this.myFloat = myFloat;
-	}
-
-	public Collection getFriends() {
-		return friends;
-	}
-
-	public void setFriends(Collection friends) {
-		this.friends = friends;
-	}
-
-	public Set getSomeSet() {
-		return someSet;
-	}
-
-	public void setSomeSet(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public Map getSomeMap() {
-		return someMap;
-	}
-
-	public void setSomeMap(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public List getSomeList() {
-		return someList;
-	}
-
-	public void setSomeList(List someList) {
-		this.someList = someList;
-	}
-
-	public Properties getSomeProperties() {
-		return someProperties;
-	}
-
-	public void setSomeProperties(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-	@Override
-	public INestedTestBean getDoctor() {
-		return doctor;
-	}
-
-	public void setDoctor(INestedTestBean doctor) {
-		this.doctor = doctor;
-	}
-
-	@Override
-	public INestedTestBean getLawyer() {
-		return lawyer;
-	}
-
-	public void setLawyer(INestedTestBean lawyer) {
-		this.lawyer = lawyer;
-	}
-
-	public Number getSomeNumber() {
-		return someNumber;
-	}
-
-	public void setSomeNumber(Number someNumber) {
-		this.someNumber = someNumber;
-	}
-
-	public Colour getFavouriteColour() {
-		return favouriteColour;
-	}
-
-	public void setFavouriteColour(Colour favouriteColour) {
-		this.favouriteColour = favouriteColour;
-	}
-
-	public Boolean getSomeBoolean() {
-		return someBoolean;
-	}
-
-	public void setSomeBoolean(Boolean someBoolean) {
-		this.someBoolean = someBoolean;
-	}
-
-	public List getOtherColours() {
-		return otherColours;
-	}
-
-	public void setOtherColours(List otherColours) {
-		this.otherColours = otherColours;
-	}
-
-	public List getPets() {
-		return pets;
-	}
-
-	public void setPets(List pets) {
-		this.pets = pets;
-	}
-
-
-	/**
-	 * @see ITestBean#exceptional(Throwable)
-	 */
-	@Override
-	public void exceptional(Throwable t) throws Throwable {
-		if (t != null) {
-			throw t;
-		}
-	}
-
-	@Override
-	public void unreliableFileOperation() throws IOException {
-		throw new IOException();
-	}
-	/**
-	 * @see ITestBean#returnsThis()
-	 */
-	@Override
-	public Object returnsThis() {
-		return this;
-	}
-
-	/**
-	 * @see IOther#absquatulate()
-	 */
-	@Override
-	public void absquatulate() {
-	}
-
-	@Override
-	public int haveBirthday() {
-		return age++;
-	}
-
-
-	public void destroy() {
-		this.destroyed = true;
-	}
-
-	public boolean wasDestroyed() {
-		return destroyed;
-	}
-
-
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (other == null || !(other instanceof TestBean)) {
-			return false;
-		}
-		TestBean tb2 = (TestBean) other;
-		return (ObjectUtils.nullSafeEquals(this.name, tb2.name) && this.age == tb2.age);
-	}
-
-	public int hashCode() {
-		return this.age;
-	}
-
-	@Override
-	public int compareTo(Object other) {
-		if (this.name != null && other instanceof TestBean) {
-			return this.name.compareTo(((TestBean) other).getName());
-		}
-		else {
-			return 1;
-		}
-	}
-
-	public String toString() {
-		return this.name;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java b/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java
deleted file mode 100644
index 5aa69c1fa89..00000000000
--- a/spring-aop/src/test/java/test/parsing/CollectingReaderEventListener.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.parsing;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.parsing.AliasDefinition;
-import org.springframework.beans.factory.parsing.ComponentDefinition;
-import org.springframework.beans.factory.parsing.DefaultsDefinition;
-import org.springframework.beans.factory.parsing.ImportDefinition;
-import org.springframework.beans.factory.parsing.ReaderEventListener;
-
-/**
- * @author Rob Harrop
- * @author Juergen Hoeller
- * @author Chris Beams
- */
-public class CollectingReaderEventListener implements ReaderEventListener {
-
-	private final List defaults = new LinkedList();
-
-	private final Map componentDefinitions = new LinkedHashMap(8);
-
-	private final Map aliasMap = new LinkedHashMap(8);
-
-	private final List imports = new LinkedList();
-
-
-	@Override
-	public void defaultsRegistered(DefaultsDefinition defaultsDefinition) {
-		this.defaults.add(defaultsDefinition);
-	}
-
-	public List getDefaults() {
-		return Collections.unmodifiableList(this.defaults);
-	}
-
-	@Override
-	public void componentRegistered(ComponentDefinition componentDefinition) {
-		this.componentDefinitions.put(componentDefinition.getName(), componentDefinition);
-	}
-
-	public ComponentDefinition getComponentDefinition(String name) {
-		return (ComponentDefinition) this.componentDefinitions.get(name);
-	}
-
-	public ComponentDefinition[] getComponentDefinitions() {
-		Collection collection = this.componentDefinitions.values();
-		return collection.toArray(new ComponentDefinition[collection.size()]);
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public void aliasRegistered(AliasDefinition aliasDefinition) {
-		List aliases = (List) this.aliasMap.get(aliasDefinition.getBeanName());
-		if(aliases == null) {
-			aliases = new ArrayList();
-			this.aliasMap.put(aliasDefinition.getBeanName(), aliases);
-		}
-		aliases.add(aliasDefinition);
-	}
-
-	public List getAliases(String beanName) {
-		List aliases = (List) this.aliasMap.get(beanName);
-		return aliases == null ? null : Collections.unmodifiableList(aliases);
-	}
-
-	@Override
-	public void importProcessed(ImportDefinition importDefinition) {
-		this.imports.add(importDefinition);
-	}
-
-	public List getImports() {
-		return Collections.unmodifiableList(this.imports);
-	}
-
-}
diff --git a/spring-aop/src/test/java/test/util/SerializationTestUtils.java b/spring-aop/src/test/java/test/util/SerializationTestUtils.java
deleted file mode 100644
index e9bc9fee04a..00000000000
--- a/spring-aop/src/test/java/test/util/SerializationTestUtils.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.util;
-
-import java.awt.*;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.NotSerializableException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-
-import static org.junit.Assert.*;
-import org.junit.Test;
-import test.beans.TestBean;
-
-/**
- * Utilities for testing serializability of objects.
- * Exposes static methods for use in other test cases.
- * Contains {@link org.junit.Test} methods to test itself.
- *
- * @author Rod Johnson
- * @author Chris Beams
- */
-public final class SerializationTestUtils {
-
-	public static void testSerialization(Object o) throws IOException {
-		OutputStream baos = new ByteArrayOutputStream();
-		ObjectOutputStream oos = new ObjectOutputStream(baos);
-		oos.writeObject(o);
-	}
-
-	public static boolean isSerializable(Object o) throws IOException {
-		try {
-			testSerialization(o);
-			return true;
-		}
-		catch (NotSerializableException ex) {
-			return false;
-		}
-	}
-
-	public static Object serializeAndDeserialize(Object o) throws IOException, ClassNotFoundException {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ObjectOutputStream oos = new ObjectOutputStream(baos);
-		oos.writeObject(o);
-		oos.flush();
-		baos.flush();
-		byte[] bytes = baos.toByteArray();
-
-		ByteArrayInputStream is = new ByteArrayInputStream(bytes);
-		ObjectInputStream ois = new ObjectInputStream(is);
-		Object o2 = ois.readObject();
-		return o2;
-	}
-
-
-	@Test(expected=NotSerializableException.class)
-	public void testWithNonSerializableObject() throws IOException {
-		TestBean o = new TestBean();
-		assertFalse(o instanceof Serializable);
-		assertFalse(isSerializable(o));
-
-		testSerialization(o);
-	}
-
-	@Test
-	public void testWithSerializableObject() throws Exception {
-		int x = 5;
-		int y = 10;
-		Point p = new Point(x, y);
-		assertTrue(p instanceof Serializable);
-
-		testSerialization(p);
-
-		assertTrue(isSerializable(p));
-
-		Point p2 = (Point) serializeAndDeserialize(p);
-		assertNotSame(p, p2);
-		assertEquals(x, (int) p2.getX());
-		assertEquals(y, (int) p2.getY());
-	}
-
-}
diff --git a/spring-aop/src/test/java/test/util/TimeStamped.java b/spring-aop/src/test/java/test/util/TimeStamped.java
deleted file mode 100644
index 4fedb8998b0..00000000000
--- a/spring-aop/src/test/java/test/util/TimeStamped.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.util;
-
-/**
- * This interface can be implemented by cacheable objects or cache entries,
- * to enable the freshness of objects to be checked.
- *
- * @author Rod Johnson
- */
-public interface TimeStamped {
-
-	/**
-	 * Return the timestamp for this object.
-	 * @return long the timestamp for this object,
-	 * as returned by System.currentTimeMillis()
-	 */
-	long getTimeStamp();
-
-}
diff --git a/spring-aspects/src/test/java/org/springframework/beans/Colour.java b/spring-aspects/src/test/java/org/springframework/beans/Colour.java
deleted file mode 100644
index a992a2ebfc6..00000000000
--- a/spring-aspects/src/test/java/org/springframework/beans/Colour.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import org.springframework.core.enums.ShortCodedLabeledEnum;
-
-/**
- * @author Rob Harrop
- */
-@SuppressWarnings("serial")
-public class Colour extends ShortCodedLabeledEnum {
-
-	public static final Colour RED = new Colour(0, "RED");
-	public static final Colour BLUE = new Colour(1, "BLUE");
-	public static final Colour GREEN = new Colour(2, "GREEN");
-	public static final Colour PURPLE = new Colour(3, "PURPLE");
-
-	private Colour(int code, String label) {
-		super(code, label);
-	}
-
-}
diff --git a/spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java
deleted file mode 100644
index a10846ba95a..00000000000
--- a/spring-aspects/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.Serializable;
-
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.beans.factory.DisposableBean;
-
-/**
- * @author Juergen Hoeller
- * @since 21.08.2003
- */
-@SuppressWarnings("serial")
-public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean {
-
-	private String beanName;
-
-	private boolean initialized;
-
-	private boolean destroyed;
-
-
-	public DerivedTestBean() {
-	}
-
-	public DerivedTestBean(String[] names) {
-		if (names == null || names.length < 2) {
-			throw new IllegalArgumentException("Invalid names array");
-		}
-		setName(names[0]);
-		setBeanName(names[1]);
-	}
-
-	public static DerivedTestBean create(String[] names) {
-		return new DerivedTestBean(names);
-	}
-
-
-	public void setBeanName(String beanName) {
-		if (this.beanName == null || beanName == null) {
-			this.beanName = beanName;
-		}
-	}
-
-	public String getBeanName() {
-		return beanName;
-	}
-
-	public void setSpouseRef(String name) {
-		setSpouse(new TestBean(name));
-	}
-
-
-	public void initialize() {
-		this.initialized = true;
-	}
-
-	public boolean wasInitialized() {
-		return initialized;
-	}
-
-
-	public void destroy() {
-		this.destroyed = true;
-	}
-
-	public boolean wasDestroyed() {
-		return destroyed;
-	}
-
-}
diff --git a/spring-aspects/src/test/java/org/springframework/beans/IOther.java b/spring-aspects/src/test/java/org/springframework/beans/IOther.java
deleted file mode 100644
index d7fb346185a..00000000000
--- a/spring-aspects/src/test/java/org/springframework/beans/IOther.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-public interface IOther {
-
-	void absquatulate();
-
-}
\ No newline at end of file
diff --git a/spring-aspects/src/test/java/org/springframework/beans/ITestBean.java b/spring-aspects/src/test/java/org/springframework/beans/ITestBean.java
deleted file mode 100644
index 478999c05da..00000000000
--- a/spring-aspects/src/test/java/org/springframework/beans/ITestBean.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.IOException;
-
-/**
- * Interface used for {@link org.springframework.beans.TestBean}.
- *
- * 
Two methods are the same as on Person, but if this
- * extends person it breaks quite a few tests..
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public interface ITestBean {
-
-	int getAge();
-
-	void setAge(int age);
-
-	String getName();
-
-	void setName(String name);
-
-	ITestBean getSpouse();
-
-	void setSpouse(ITestBean spouse);
-
-	ITestBean[] getSpouses();
-
-	String[] getStringArray();
-
-	void setStringArray(String[] stringArray);
-
-	/**
-	 * Throws a given (non-null) exception.
-	 */
-	void exceptional(Throwable t) throws Throwable;
-
-	Object returnsThis();
-
-	INestedTestBean getDoctor();
-
-	INestedTestBean getLawyer();
-
-	IndexedTestBean getNestedIndexedBean();
-
-	/**
-	 * Increment the age by one.
-	 * @return the previous age
-	 */
-	int haveBirthday();
-
-	void unreliableFileOperation() throws IOException;
-
-}
\ No newline at end of file
diff --git a/spring-aspects/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-aspects/src/test/java/org/springframework/beans/IndexedTestBean.java
deleted file mode 100644
index d7af36ed641..00000000000
--- a/spring-aspects/src/test/java/org/springframework/beans/IndexedTestBean.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-/**
- * @author Juergen Hoeller
- * @since 11.11.2003
- */
-public class IndexedTestBean {
-
-	private TestBean[] array;
-
-	private Collection collection;
-
-	private List list;
-
-	private Set set;
-
-	private SortedSet sortedSet;
-
-	private Map map;
-
-	private SortedMap sortedMap;
-
-
-	public IndexedTestBean() {
-		this(true);
-	}
-
-	public IndexedTestBean(boolean populate) {
-		if (populate) {
-			populate();
-		}
-	}
-
-	public void populate() {
-		TestBean tb0 = new TestBean("name0", 0);
-		TestBean tb1 = new TestBean("name1", 0);
-		TestBean tb2 = new TestBean("name2", 0);
-		TestBean tb3 = new TestBean("name3", 0);
-		TestBean tb4 = new TestBean("name4", 0);
-		TestBean tb5 = new TestBean("name5", 0);
-		TestBean tb6 = new TestBean("name6", 0);
-		TestBean tb7 = new TestBean("name7", 0);
-		TestBean tbX = new TestBean("nameX", 0);
-		TestBean tbY = new TestBean("nameY", 0);
-		this.array = new TestBean[] {tb0, tb1};
-		this.list = new ArrayList();
-		this.list.add(tb2);
-		this.list.add(tb3);
-		this.set = new TreeSet();
-		this.set.add(tb6);
-		this.set.add(tb7);
-		this.map = new HashMap();
-		this.map.put("key1", tb4);
-		this.map.put("key2", tb5);
-		this.map.put("key.3", tb5);
-		List list = new ArrayList();
-		list.add(tbX);
-		list.add(tbY);
-		this.map.put("key4", list);
-	}
-
-
-	public TestBean[] getArray() {
-		return array;
-	}
-
-	public void setArray(TestBean[] array) {
-		this.array = array;
-	}
-
-	public Collection getCollection() {
-		return collection;
-	}
-
-	public void setCollection(Collection collection) {
-		this.collection = collection;
-	}
-
-	public List getList() {
-		return list;
-	}
-
-	public void setList(List list) {
-		this.list = list;
-	}
-
-	public Set getSet() {
-		return set;
-	}
-
-	public void setSet(Set set) {
-		this.set = set;
-	}
-
-	public SortedSet getSortedSet() {
-		return sortedSet;
-	}
-
-	public void setSortedSet(SortedSet sortedSet) {
-		this.sortedSet = sortedSet;
-	}
-
-	public Map getMap() {
-		return map;
-	}
-
-	public void setMap(Map map) {
-		this.map = map;
-	}
-
-	public SortedMap getSortedMap() {
-		return sortedMap;
-	}
-
-	public void setSortedMap(SortedMap sortedMap) {
-		this.sortedMap = sortedMap;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-aspects/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-aspects/src/test/java/org/springframework/beans/NestedTestBean.java
deleted file mode 100644
index 88b450b9171..00000000000
--- a/spring-aspects/src/test/java/org/springframework/beans/NestedTestBean.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-/**
- * Simple nested test bean used for testing bean factories, AOP framework etc.
- *
- * @author Trevor D. Cook
- * @since 30.09.2003
- */
-public class NestedTestBean implements INestedTestBean {
-
-	private String company = "";
-
-	public NestedTestBean() {
-	}
-
-	public NestedTestBean(String company) {
-		setCompany(company);
-	}
-
-	public void setCompany(String company) {
-		this.company = (company != null ? company : "");
-	}
-
-	public String getCompany() {
-		return company;
-	}
-
-	public boolean equals(Object obj) {
-		if (!(obj instanceof NestedTestBean)) {
-			return false;
-		}
-		NestedTestBean ntb = (NestedTestBean) obj;
-		return this.company.equals(ntb.company);
-	}
-
-	public int hashCode() {
-		return this.company.hashCode();
-	}
-
-	public String toString() {
-		return "NestedTestBean: " + this.company;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-aspects/src/test/java/org/springframework/beans/TestBean.java b/spring-aspects/src/test/java/org/springframework/beans/TestBean.java
deleted file mode 100644
index ac8e5ea4857..00000000000
--- a/spring-aspects/src/test/java/org/springframework/beans/TestBean.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.util.ObjectUtils;
-
-/**
- * Simple test bean used for testing bean factories, the AOP framework etc.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @since 15 April 2001
- */
-public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOther, Comparable {
-
-	private String beanName;
-
-	private String country;
-
-	private BeanFactory beanFactory;
-
-	private boolean postProcessed;
-
-	private String name;
-
-	private String sex;
-
-	private int age;
-
-	private boolean jedi;
-
-	private ITestBean[] spouses;
-
-	private String touchy;
-
-	private String[] stringArray;
-
-	private Integer[] someIntegerArray;
-
-	private Date date = new Date();
-
-	private Float myFloat = new Float(0.0);
-
-	private Collection friends = new LinkedList();
-
-	private Set someSet = new HashSet();
-
-	private Map someMap = new HashMap();
-
-	private List someList = new ArrayList();
-
-	private Properties someProperties = new Properties();
-
-	private INestedTestBean doctor = new NestedTestBean();
-
-	private INestedTestBean lawyer = new NestedTestBean();
-
-	private IndexedTestBean nestedIndexedBean;
-
-	private boolean destroyed;
-
-	private Number someNumber;
-
-	private Colour favouriteColour;
-
-	private Boolean someBoolean;
-
-	private List otherColours;
-
-	private List pets;
-
-
-	public TestBean() {
-	}
-
-	public TestBean(String name) {
-		this.name = name;
-	}
-
-	public TestBean(ITestBean spouse) {
-		this.spouses = new ITestBean[] {spouse};
-	}
-
-	public TestBean(String name, int age) {
-		this.name = name;
-		this.age = age;
-	}
-
-	public TestBean(ITestBean spouse, Properties someProperties) {
-		this.spouses = new ITestBean[] {spouse};
-		this.someProperties = someProperties;
-	}
-
-	public TestBean(List someList) {
-		this.someList = someList;
-	}
-
-	public TestBean(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public TestBean(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public TestBean(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-
-	public void setBeanName(String beanName) {
-		this.beanName = beanName;
-	}
-
-	public String getBeanName() {
-		return beanName;
-	}
-
-	public void setBeanFactory(BeanFactory beanFactory) {
-		this.beanFactory = beanFactory;
-	}
-
-	public BeanFactory getBeanFactory() {
-		return beanFactory;
-	}
-
-	public void setPostProcessed(boolean postProcessed) {
-		this.postProcessed = postProcessed;
-	}
-
-	public boolean isPostProcessed() {
-		return postProcessed;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getSex() {
-		return sex;
-	}
-
-	public void setSex(String sex) {
-		this.sex = sex;
-		if (this.name == null) {
-			this.name = sex;
-		}
-	}
-
-	public int getAge() {
-		return age;
-	}
-
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-	public boolean isJedi() {
-		return jedi;
-	}
-
-	public void setJedi(boolean jedi) {
-		this.jedi = jedi;
-	}
-
-	public ITestBean getSpouse() {
-		return (spouses != null ? spouses[0] : null);
-	}
-
-	public void setSpouse(ITestBean spouse) {
-		this.spouses = new ITestBean[] {spouse};
-	}
-
-	public ITestBean[] getSpouses() {
-		return spouses;
-	}
-
-	public String getTouchy() {
-		return touchy;
-	}
-
-	public void setTouchy(String touchy) throws Exception {
-		if (touchy.indexOf('.') != -1) {
-			throw new Exception("Can't contain a .");
-		}
-		if (touchy.indexOf(',') != -1) {
-			throw new NumberFormatException("Number format exception: contains a ,");
-		}
-		this.touchy = touchy;
-	}
-
-	public String getCountry() {
-		return country;
-	}
-
-	public void setCountry(String country) {
-		this.country = country;
-	}
-
-	public String[] getStringArray() {
-		return stringArray;
-	}
-
-	public void setStringArray(String[] stringArray) {
-		this.stringArray = stringArray;
-	}
-
-	public Integer[] getSomeIntegerArray() {
-		return someIntegerArray;
-	}
-
-	public void setSomeIntegerArray(Integer[] someIntegerArray) {
-		this.someIntegerArray = someIntegerArray;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public Float getMyFloat() {
-		return myFloat;
-	}
-
-	public void setMyFloat(Float myFloat) {
-		this.myFloat = myFloat;
-	}
-
-	public Collection getFriends() {
-		return friends;
-	}
-
-	public void setFriends(Collection friends) {
-		this.friends = friends;
-	}
-
-	public Set getSomeSet() {
-		return someSet;
-	}
-
-	public void setSomeSet(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public Map getSomeMap() {
-		return someMap;
-	}
-
-	public void setSomeMap(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public List getSomeList() {
-		return someList;
-	}
-
-	public void setSomeList(List someList) {
-		this.someList = someList;
-	}
-
-	public Properties getSomeProperties() {
-		return someProperties;
-	}
-
-	public void setSomeProperties(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-	public INestedTestBean getDoctor() {
-		return doctor;
-	}
-
-	public void setDoctor(INestedTestBean doctor) {
-		this.doctor = doctor;
-	}
-
-	public INestedTestBean getLawyer() {
-		return lawyer;
-	}
-
-	public void setLawyer(INestedTestBean lawyer) {
-		this.lawyer = lawyer;
-	}
-
-	public Number getSomeNumber() {
-		return someNumber;
-	}
-
-	public void setSomeNumber(Number someNumber) {
-		this.someNumber = someNumber;
-	}
-
-	public Colour getFavouriteColour() {
-		return favouriteColour;
-	}
-
-	public void setFavouriteColour(Colour favouriteColour) {
-		this.favouriteColour = favouriteColour;
-	}
-
-	public Boolean getSomeBoolean() {
-		return someBoolean;
-	}
-
-	public void setSomeBoolean(Boolean someBoolean) {
-		this.someBoolean = someBoolean;
-	}
-
-	public IndexedTestBean getNestedIndexedBean() {
-		return nestedIndexedBean;
-	}
-
-	public void setNestedIndexedBean(IndexedTestBean nestedIndexedBean) {
-		this.nestedIndexedBean = nestedIndexedBean;
-	}
-
-	public List getOtherColours() {
-		return otherColours;
-	}
-
-	public void setOtherColours(List otherColours) {
-		this.otherColours = otherColours;
-	}
-
-	public List getPets() {
-		return pets;
-	}
-
-	public void setPets(List pets) {
-		this.pets = pets;
-	}
-
-
-	/**
-	 * @see org.springframework.beans.ITestBean#exceptional(Throwable)
-	 */
-	public void exceptional(Throwable t) throws Throwable {
-		if (t != null) {
-			throw t;
-		}
-	}
-
-	public void unreliableFileOperation() throws IOException {
-		throw new IOException();
-	}
-	/**
-	 * @see org.springframework.beans.ITestBean#returnsThis()
-	 */
-	public Object returnsThis() {
-		return this;
-	}
-
-	/**
-	 * @see org.springframework.beans.IOther#absquatulate()
-	 */
-	public void absquatulate() {
-	}
-
-	public int haveBirthday() {
-		return age++;
-	}
-
-
-	public void destroy() {
-		this.destroyed = true;
-	}
-
-	public boolean wasDestroyed() {
-		return destroyed;
-	}
-
-
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (other == null || !(other instanceof TestBean)) {
-			return false;
-		}
-		TestBean tb2 = (TestBean) other;
-		return (ObjectUtils.nullSafeEquals(this.name, tb2.name) && this.age == tb2.age);
-	}
-
-	public int hashCode() {
-		return this.age;
-	}
-
-	public int compareTo(Object other) {
-		if (this.name != null && other instanceof TestBean) {
-			return this.name.compareTo(((TestBean) other).getName());
-		}
-		else {
-			return 1;
-		}
-	}
-
-	public String toString() {
-		return this.name;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java
index 73f37a8f9eb..6ff04cf7b87 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java
+++ b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/AbstractBeanConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ import junit.framework.TestCase;
 
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.UnsatisfiedDependencyException;
 import org.springframework.beans.factory.annotation.Autowire;
diff --git a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests-beans.xml b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests-beans.xml
index 89aa3964eae..bd6439bb546 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests-beans.xml
+++ b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests-beans.xml
@@ -37,7 +37,7 @@
 			autowire-candidate="false"/>
 
 	
-	
+	
 		
 		
 	
diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractAnnotationTest.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractAnnotationTest.java
deleted file mode 100644
index 3771a21b9f7..00000000000
--- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractAnnotationTest.java
+++ /dev/null
@@ -1,596 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cache.aspectj;
-
-import static org.junit.Assert.*;
-
-import java.util.Collection;
-import java.util.UUID;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.cache.config.AnnotatedClassCacheableService;
-import org.springframework.cache.config.CacheableService;
-import org.springframework.context.ApplicationContext;
-
-/**
- * Abstract annotation test (containing several reusable methods).
- *
- * @author Costin Leau
- * @author Chris Beams
- */
-public abstract class AbstractAnnotationTest {
-
-	protected ApplicationContext ctx;
-
-	protected CacheableService cs;
-
-	protected CacheableService ccs;
-
-	protected CacheManager cm;
-
-	/** @return a refreshed application context */
-	protected abstract ApplicationContext getApplicationContext();
-
-	@Before
-	public void setup() {
-		ctx = getApplicationContext();
-		cs = ctx.getBean("service", CacheableService.class);
-		ccs = ctx.getBean("classService", CacheableService.class);
-		cm = ctx.getBean(CacheManager.class);
-		Collection cn = cm.getCacheNames();
-		assertTrue(cn.contains("default"));
-	}
-
-	public void testCacheable(CacheableService service) throws Exception {
-		Object o1 = new Object();
-
-		Object r1 = service.cache(o1);
-		Object r2 = service.cache(o1);
-		Object r3 = service.cache(o1);
-
-		assertSame(r1, r2);
-		assertSame(r1, r3);
-	}
-
-	public void testEvict(CacheableService service) throws Exception {
-		Object o1 = new Object();
-
-		Object r1 = service.cache(o1);
-		Object r2 = service.cache(o1);
-
-		assertSame(r1, r2);
-		service.invalidate(o1);
-		Object r3 = service.cache(o1);
-		Object r4 = service.cache(o1);
-		assertNotSame(r1, r3);
-		assertSame(r3, r4);
-	}
-
-	public void testEvictEarly(CacheableService service) throws Exception {
-		Object o1 = new Object();
-
-		Object r1 = service.cache(o1);
-		Object r2 = service.cache(o1);
-
-		assertSame(r1, r2);
-		try {
-			service.evictEarly(o1);
-		} catch (RuntimeException ex) {
-			// expected
-		}
-
-		Object r3 = service.cache(o1);
-		Object r4 = service.cache(o1);
-		assertNotSame(r1, r3);
-		assertSame(r3, r4);
-	}
-
-	public void testEvictException(CacheableService service) throws Exception {
-		Object o1 = new Object();
-
-		Object r1 = service.cache(o1);
-		Object r2 = service.cache(o1);
-
-		assertSame(r1, r2);
-		try {
-			service.evictWithException(o1);
-		} catch (RuntimeException ex) {
-			// expected
-		}
-		// exception occurred, eviction skipped, data should still be in the cache
-		Object r3 = service.cache(o1);
-		assertSame(r1, r3);
-	}
-
-	public void testEvictWKey(CacheableService service) throws Exception {
-		Object o1 = new Object();
-
-		Object r1 = service.cache(o1);
-		Object r2 = service.cache(o1);
-
-		assertSame(r1, r2);
-		service.evict(o1, null);
-		Object r3 = service.cache(o1);
-		Object r4 = service.cache(o1);
-		assertNotSame(r1, r3);
-		assertSame(r3, r4);
-	}
-
-	public void testEvictWKeyEarly(CacheableService service) throws Exception {
-		Object o1 = new Object();
-
-		Object r1 = service.cache(o1);
-		Object r2 = service.cache(o1);
-
-		assertSame(r1, r2);
-
-		try {
-			service.invalidateEarly(o1, null);
-		} catch (Exception ex) {
-			// expected
-		}
-		Object r3 = service.cache(o1);
-		Object r4 = service.cache(o1);
-		assertNotSame(r1, r3);
-		assertSame(r3, r4);
-	}
-
-	public void testEvictAll(CacheableService service) throws Exception {
-		Object o1 = new Object();
-
-		Object r1 = service.cache(o1);
-		Object r2 = service.cache(o1);
-
-		Object o2 = new Object();
-		Object r10 = service.cache(o2);
-
-		assertSame(r1, r2);
-		assertNotSame(r1, r10);
-		service.evictAll(new Object());
-		Cache cache = cm.getCache("default");
-		assertNull(cache.get(o1));
-		assertNull(cache.get(o2));
-
-		Object r3 = service.cache(o1);
-		Object r4 = service.cache(o1);
-		assertNotSame(r1, r3);
-		assertSame(r3, r4);
-	}
-
-	public void testConditionalExpression(CacheableService service) throws Exception {
-		Object r1 = service.conditional(4);
-		Object r2 = service.conditional(4);
-
-		assertNotSame(r1, r2);
-
-		Object r3 = service.conditional(3);
-		Object r4 = service.conditional(3);
-
-		assertSame(r3, r4);
-	}
-
-	public void testKeyExpression(CacheableService service) throws Exception {
-		Object r1 = service.key(5, 1);
-		Object r2 = service.key(5, 2);
-
-		assertSame(r1, r2);
-
-		Object r3 = service.key(1, 5);
-		Object r4 = service.key(2, 5);
-
-		assertNotSame(r3, r4);
-	}
-
-	public void testNullValue(CacheableService service) throws Exception {
-		Object key = new Object();
-		assertNull(service.nullValue(key));
-		int nr = service.nullInvocations().intValue();
-		assertNull(service.nullValue(key));
-		assertEquals(nr, service.nullInvocations().intValue());
-		assertNull(service.nullValue(new Object()));
-		assertEquals(nr + 1, service.nullInvocations().intValue());
-	}
-
-	public void testMethodName(CacheableService service, String keyName) throws Exception {
-		Object key = new Object();
-		Object r1 = service.name(key);
-		assertSame(r1, service.name(key));
-		Cache cache = cm.getCache("default");
-		// assert the method name is used
-		assertNotNull(cache.get(keyName));
-	}
-
-	public void testCheckedThrowable(CacheableService service) throws Exception {
-		String arg = UUID.randomUUID().toString();
-		try {
-			service.throwChecked(arg);
-			fail("Excepted exception");
-		} catch (Exception ex) {
-			assertEquals(arg, ex.getMessage());
-		}
-	}
-
-	public void testUncheckedThrowable(CacheableService service) throws Exception {
-		try {
-			service.throwUnchecked(Long.valueOf(1));
-			fail("Excepted exception");
-		} catch (RuntimeException ex) {
-			assertTrue("Excepted different exception type and got " + ex.getClass(),
-					ex instanceof UnsupportedOperationException);
-			// expected
-		}
-	}
-
-	public void testNullArg(CacheableService service) {
-		Object r1 = service.cache(null);
-		assertSame(r1, service.cache(null));
-	}
-
-	public void testCacheUpdate(CacheableService service) {
-		Object o = new Object();
-		Cache cache = cm.getCache("default");
-		assertNull(cache.get(o));
-		Object r1 = service.update(o);
-		assertSame(r1, cache.get(o).get());
-
-		o = new Object();
-		assertNull(cache.get(o));
-		Object r2 = service.update(o);
-		assertSame(r2, cache.get(o).get());
-	}
-
-	public void testConditionalCacheUpdate(CacheableService service) {
-		Integer one = Integer.valueOf(1);
-		Integer three = Integer.valueOf(3);
-
-		Cache cache = cm.getCache("default");
-		assertEquals(one, Integer.valueOf(service.conditionalUpdate(one).toString()));
-		assertNull(cache.get(one));
-
-		assertEquals(three, Integer.valueOf(service.conditionalUpdate(three).toString()));
-		assertEquals(three, Integer.valueOf(cache.get(three).get().toString()));
-	}
-
-	public void testMultiCache(CacheableService service) {
-		Object o1 = new Object();
-		Object o2 = new Object();
-
-		Cache primary = cm.getCache("primary");
-		Cache secondary = cm.getCache("secondary");
-
-		assertNull(primary.get(o1));
-		assertNull(secondary.get(o1));
-		Object r1 = service.multiCache(o1);
-		assertSame(r1, primary.get(o1).get());
-		assertSame(r1, secondary.get(o1).get());
-
-		Object r2 = service.multiCache(o1);
-		Object r3 = service.multiCache(o1);
-
-		assertSame(r1, r2);
-		assertSame(r1, r3);
-
-		assertNull(primary.get(o2));
-		assertNull(secondary.get(o2));
-		Object r4 = service.multiCache(o2);
-		assertSame(r4, primary.get(o2).get());
-		assertSame(r4, secondary.get(o2).get());
-	}
-
-	public void testMultiEvict(CacheableService service) {
-		Object o1 = new Object();
-
-		Object r1 = service.multiCache(o1);
-		Object r2 = service.multiCache(o1);
-
-		Cache primary = cm.getCache("primary");
-		Cache secondary = cm.getCache("secondary");
-
-		assertSame(r1, r2);
-		assertSame(r1, primary.get(o1).get());
-		assertSame(r1, secondary.get(o1).get());
-
-		service.multiEvict(o1);
-		assertNull(primary.get(o1));
-		assertNull(secondary.get(o1));
-
-		Object r3 = service.multiCache(o1);
-		Object r4 = service.multiCache(o1);
-		assertNotSame(r1, r3);
-		assertSame(r3, r4);
-
-		assertSame(r3, primary.get(o1).get());
-		assertSame(r4, secondary.get(o1).get());
-	}
-
-	public void testMultiPut(CacheableService service) {
-		Object o = Integer.valueOf(1);
-
-		Cache primary = cm.getCache("primary");
-		Cache secondary = cm.getCache("secondary");
-
-		assertNull(primary.get(o));
-		assertNull(secondary.get(o));
-		Object r1 = service.multiUpdate(o);
-		assertSame(r1, primary.get(o).get());
-		assertSame(r1, secondary.get(o).get());
-
-		o = Integer.valueOf(2);
-		assertNull(primary.get(o));
-		assertNull(secondary.get(o));
-		Object r2 = service.multiUpdate(o);
-		assertSame(r2, primary.get(o).get());
-		assertSame(r2, secondary.get(o).get());
-	}
-
-	public void testMultiCacheAndEvict(CacheableService service) {
-		String methodName = "multiCacheAndEvict";
-
-		Cache primary = cm.getCache("primary");
-		Cache secondary = cm.getCache("secondary");
-		Object key = Integer.valueOf(1);
-
-		secondary.put(key, key);
-
-		assertNull(secondary.get(methodName));
-		assertSame(key, secondary.get(key).get());
-
-		Object r1 = service.multiCacheAndEvict(key);
-		assertSame(r1, service.multiCacheAndEvict(key));
-
-		// assert the method name is used
-		assertSame(r1, primary.get(methodName).get());
-		assertNull(secondary.get(methodName));
-		assertNull(secondary.get(key));
-	}
-
-	public void testMultiConditionalCacheAndEvict(CacheableService service) {
-		Cache primary = cm.getCache("primary");
-		Cache secondary = cm.getCache("secondary");
-		Object key = Integer.valueOf(1);
-
-		secondary.put(key, key);
-
-		assertNull(primary.get(key));
-		assertSame(key, secondary.get(key).get());
-
-		Object r1 = service.multiConditionalCacheAndEvict(key);
-		Object r3 = service.multiConditionalCacheAndEvict(key);
-
-		assertTrue(!r1.equals(r3));
-		assertNull(primary.get(key));
-
-		Object key2 = Integer.valueOf(3);
-		Object r2 = service.multiConditionalCacheAndEvict(key2);
-		assertSame(r2, service.multiConditionalCacheAndEvict(key2));
-
-		// assert the method name is used
-		assertSame(r2, primary.get(key2).get());
-		assertNull(secondary.get(key2));
-	}
-
-	@Test
-	public void testCacheable() throws Exception {
-		testCacheable(cs);
-	}
-
-	@Test
-	public void testInvalidate() throws Exception {
-		testEvict(cs);
-	}
-
-	@Test
-	public void testEarlyInvalidate() throws Exception {
-		testEvictEarly(cs);
-	}
-
-	@Test
-	public void testEvictWithException() throws Exception {
-		testEvictException(cs);
-	}
-
-	@Test
-	public void testEvictAll() throws Exception {
-		testEvictAll(cs);
-	}
-
-	@Test
-	public void testInvalidateWithKey() throws Exception {
-		testEvictWKey(cs);
-	}
-
-	@Test
-	public void testEarlyInvalidateWithKey() throws Exception {
-		testEvictWKeyEarly(cs);
-	}
-
-	@Test
-	public void testConditionalExpression() throws Exception {
-		testConditionalExpression(cs);
-	}
-
-	@Test
-	public void testKeyExpression() throws Exception {
-		testKeyExpression(cs);
-	}
-
-	@Test
-	public void testClassCacheCacheable() throws Exception {
-		testCacheable(ccs);
-	}
-
-	@Test
-	public void testClassCacheInvalidate() throws Exception {
-		testEvict(ccs);
-	}
-
-	@Test
-	public void testClassEarlyInvalidate() throws Exception {
-		testEvictEarly(ccs);
-	}
-
-	@Test
-	public void testClassEvictAll() throws Exception {
-		testEvictAll(ccs);
-	}
-
-	@Test
-	public void testClassEvictWithException() throws Exception {
-		testEvictException(ccs);
-	}
-
-	@Test
-	public void testClassCacheInvalidateWKey() throws Exception {
-		testEvictWKey(ccs);
-	}
-
-	@Test
-	public void testClassEarlyInvalidateWithKey() throws Exception {
-		testEvictWKeyEarly(ccs);
-	}
-
-	@Test
-	public void testNullValue() throws Exception {
-		testNullValue(cs);
-	}
-
-	@Test
-	public void testClassNullValue() throws Exception {
-		Object key = new Object();
-		assertNull(ccs.nullValue(key));
-		int nr = ccs.nullInvocations().intValue();
-		assertNull(ccs.nullValue(key));
-		assertEquals(nr, ccs.nullInvocations().intValue());
-		assertNull(ccs.nullValue(new Object()));
-		// the check method is also cached
-		assertEquals(nr, ccs.nullInvocations().intValue());
-		assertEquals(nr + 1, AnnotatedClassCacheableService.nullInvocations.intValue());
-	}
-
-	@Test
-	public void testMethodName() throws Exception {
-		testMethodName(cs, "name");
-	}
-
-	@Test
-	public void testClassMethodName() throws Exception {
-		testMethodName(ccs, "namedefault");
-	}
-
-	@Test
-	public void testNullArg() throws Exception {
-		testNullArg(cs);
-	}
-
-	@Test
-	public void testClassNullArg() throws Exception {
-		testNullArg(ccs);
-	}
-
-	@Test
-	public void testCheckedException() throws Exception {
-		testCheckedThrowable(cs);
-	}
-
-	@Test
-	public void testClassCheckedException() throws Exception {
-		testCheckedThrowable(ccs);
-	}
-
-	@Test
-	public void testUncheckedException() throws Exception {
-		testUncheckedThrowable(cs);
-	}
-
-	@Test
-	public void testClassUncheckedException() throws Exception {
-		testUncheckedThrowable(ccs);
-	}
-
-	@Test
-	public void testUpdate() {
-		testCacheUpdate(cs);
-	}
-
-	@Test
-	public void testClassUpdate() {
-		testCacheUpdate(ccs);
-	}
-
-	@Test
-	public void testConditionalUpdate() {
-		testConditionalCacheUpdate(cs);
-	}
-
-	@Test
-	public void testClassConditionalUpdate() {
-		testConditionalCacheUpdate(ccs);
-	}
-
-	@Test
-	public void testMultiCache() {
-		testMultiCache(cs);
-	}
-
-	@Test
-	public void testClassMultiCache() {
-		testMultiCache(ccs);
-	}
-
-	@Test
-	public void testMultiEvict() {
-		testMultiEvict(cs);
-	}
-
-	@Test
-	public void testClassMultiEvict() {
-		testMultiEvict(ccs);
-	}
-
-	@Test
-	public void testMultiPut() {
-		testMultiPut(cs);
-	}
-
-	@Test
-	public void testClassMultiPut() {
-		testMultiPut(ccs);
-	}
-
-	@Test
-	public void testMultiCacheAndEvict() {
-		testMultiCacheAndEvict(cs);
-	}
-
-	@Test
-	public void testClassMultiCacheAndEvict() {
-		testMultiCacheAndEvict(ccs);
-	}
-
-	@Test
-	public void testMultiConditionalCacheAndEvict() {
-		testMultiConditionalCacheAndEvict(cs);
-	}
-
-	@Test
-	public void testClassMultiConditionalCacheAndEvict() {
-		testMultiConditionalCacheAndEvict(ccs);
-	}
-}
\ No newline at end of file
diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTest.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTests.java
similarity index 56%
rename from spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTest.java
rename to spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTests.java
index df237674754..43af45e80df 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTest.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTests.java
@@ -16,8 +16,15 @@
 
 package org.springframework.cache.aspectj;
 
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+
 import org.junit.Assert;
 import org.junit.Test;
+import org.springframework.cache.Cache;
+import org.springframework.cache.config.AbstractAnnotationTests;
+import org.springframework.cache.config.CacheableService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.GenericXmlApplicationContext;
 
@@ -25,7 +32,7 @@ import org.springframework.context.support.GenericXmlApplicationContext;
 /**
  * @author Costin Leau
  */
-public class AspectJAnnotationTest extends AbstractAnnotationTest {
+public class AspectJAnnotationTests extends AbstractAnnotationTests {
 
 
 	@Override
@@ -38,4 +45,30 @@ public class AspectJAnnotationTest extends AbstractAnnotationTest {
 		AnnotationCacheAspect aspect = ctx.getBean("org.springframework.cache.config.internalCacheAspect", AnnotationCacheAspect.class);
 		Assert.assertSame(ctx.getBean("keyGenerator"), aspect.getKeyGenerator());
 	}
+
+	public void testMultiEvict(CacheableService service) {
+		Object o1 = new Object();
+
+		Object r1 = service.multiCache(o1);
+		Object r2 = service.multiCache(o1);
+
+		Cache primary = cm.getCache("primary");
+		Cache secondary = cm.getCache("secondary");
+
+		assertSame(r1, r2);
+		assertSame(r1, primary.get(o1).get());
+		assertSame(r1, secondary.get(o1).get());
+
+		service.multiEvict(o1);
+		assertNull(primary.get(o1));
+		assertNull(secondary.get(o1));
+
+		Object r3 = service.multiCache(o1);
+		Object r4 = service.multiCache(o1);
+		assertNotSame(r1, r3);
+		assertSame(r3, r4);
+
+		assertSame(r3, primary.get(o1).get());
+		assertSame(r4, secondary.get(o1).get());
+	}
 }
diff --git a/spring-aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java b/spring-aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
index 95edbcd9d64..6d83d91c02d 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,83 +33,100 @@ public class DefaultCacheableService implements CacheableService {
 	private final AtomicLong counter = new AtomicLong();
 	private final AtomicLong nullInvocations = new AtomicLong();
 
+	@Override
 	@Cacheable("default")
 	public Long cache(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@CacheEvict("default")
 	public void invalidate(Object arg1) {
 	}
 
+	@Override
 	@CacheEvict("default")
 	public void evictWithException(Object arg1) {
 		throw new RuntimeException("exception thrown - evict should NOT occur");
 	}
 
+	@Override
 	@CacheEvict(value = "default", allEntries = true)
 	public void evictAll(Object arg1) {
 	}
 
+	@Override
 	@CacheEvict(value = "default", beforeInvocation = true)
 	public void evictEarly(Object arg1) {
 		throw new RuntimeException("exception thrown - evict should still occur");
 	}
 
+	@Override
 	@CacheEvict(value = "default", key = "#p0")
 	public void evict(Object arg1, Object arg2) {
 	}
 
+	@Override
 	@CacheEvict(value = "default", key = "#p0", beforeInvocation = true)
 	public void invalidateEarly(Object arg1, Object arg2) {
 		throw new RuntimeException("exception thrown - evict should still occur");
 	}
 
+	@Override
 	@Cacheable(value = "default", condition = "#classField == 3")
 	public Long conditional(int classField) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Cacheable(value = "default", key = "#p0")
 	public Long key(Object arg1, Object arg2) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Cacheable(value = "default", key = "#root.methodName")
 	public Long name(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Cacheable(value = "default", key = "#root.methodName + #root.method.name + #root.targetClass + #root.target")
 	public Long rootVars(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@CachePut("default")
 	public Long update(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@CachePut(value = "default", condition = "#arg.equals(3)")
 	public Long conditionalUpdate(Object arg) {
 		return Long.valueOf(arg.toString());
 	}
 
+	@Override
 	@Cacheable("default")
 	public Long nullValue(Object arg1) {
 		nullInvocations.incrementAndGet();
 		return null;
 	}
 
+	@Override
 	public Number nullInvocations() {
 		return nullInvocations.get();
 	}
 
+	@Override
 	@Cacheable("default")
 	public Long throwChecked(Object arg1) throws Exception {
 		throw new Exception(arg1.toString());
 	}
 
+	@Override
 	@Cacheable("default")
 	public Long throwUnchecked(Object arg1) {
 		throw new UnsupportedOperationException(arg1.toString());
@@ -117,28 +134,34 @@ public class DefaultCacheableService implements CacheableService {
 
 	// multi annotations
 
+	@Override
 	@Caching(cacheable = { @Cacheable("primary"), @Cacheable("secondary") })
 	public Long multiCache(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
+//FIXME	@Caching(evict = { @CacheEvict("primary"), @CacheEvict(value = "secondary", key = "#p0"), @CacheEvict(value = "primary", key = "#p0 + 'A'") })
 	@Caching(evict = { @CacheEvict("primary"), @CacheEvict(value = "secondary", key = "#p0") })
 	public Long multiEvict(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Caching(cacheable = { @Cacheable(value = "primary", key = "#root.methodName") }, evict = { @CacheEvict("secondary") })
 	public Long multiCacheAndEvict(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Caching(cacheable = { @Cacheable(value = "primary", condition = "#p0 == 3") }, evict = { @CacheEvict("secondary") })
 	public Long multiConditionalCacheAndEvict(Object arg1) {
 		return counter.getAndIncrement();
 	}
 
+	@Override
 	@Caching(put = { @CachePut("primary"), @CachePut("secondary") })
 	public Long multiUpdate(Object arg1) {
 		return Long.valueOf(arg1.toString());
 	}
-}
\ No newline at end of file
+}
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
deleted file mode 100644
index 969cf90a8fb..00000000000
--- a/spring-aspects/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.transaction;
-
-import org.springframework.transaction.support.AbstractPlatformTransactionManager;
-import org.springframework.transaction.support.DefaultTransactionStatus;
-
-/**
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-@SuppressWarnings("serial")
-public class CallCountingTransactionManager extends AbstractPlatformTransactionManager {
-
-	public TransactionDefinition lastDefinition;
-	public int begun;
-	public int commits;
-	public int rollbacks;
-	public int inflight;
-
-	protected Object doGetTransaction() {
-		return new Object();
-	}
-
-	protected void doBegin(Object transaction, TransactionDefinition definition) {
-		this.lastDefinition = definition;
-		++begun;
-		++inflight;
-	}
-
-	protected void doCommit(DefaultTransactionStatus status) {
-		++commits;
-		--inflight;
-	}
-
-	protected void doRollback(DefaultTransactionStatus status) {
-		++rollbacks;
-		--inflight;
-	}
-
-	public void clear() {
-		begun = commits = rollbacks = inflight = 0;
-	}
-
-}
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests-context.xml b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests-context.xml
index 6af0f02db37..0d08cdcb56f 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests-context.xml
+++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests-context.xml
@@ -3,7 +3,7 @@
 
 
 
-	
+	
 
 	
 		
diff --git a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java
index be562b2585b..70892e39493 100644
--- a/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java
+++ b/spring-aspects/src/test/java/org/springframework/transaction/aspectj/TransactionAspectTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import java.lang.reflect.Method;
 import junit.framework.AssertionFailedError;
 
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
-import org.springframework.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.transaction.interceptor.TransactionAttribute;
diff --git a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java b/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java
index a7a38f2c480..97e77c5740f 100644
--- a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java
+++ b/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,8 +37,7 @@ public class ComponentBeanDefinitionParserTest {
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
 		bf = new DefaultListableBeanFactory();
-		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
-				new ClassPathResource("com/foo/component-config.xml"));
+		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(new ClassPathResource("com/foo/component-config.xml"));
 	}
 
 	@AfterClass
diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
index f49f63182cf..9d53409e73f 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,10 +29,10 @@ import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceEditor;
+import org.springframework.tests.sample.beans.DerivedTestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.DerivedTestBean;
-import test.beans.ITestBean;
-import test.beans.TestBean;
 
 /**
  * Unit tests for {@link BeanUtils}.
diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java
index 3946cccb25e..8c7d8da1e89 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperEnumTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
 package org.springframework.beans;
 
 import org.junit.Test;
-import test.beans.CustomEnum;
-import test.beans.GenericBean;
+import org.springframework.tests.sample.beans.CustomEnum;
+import org.springframework.tests.sample.beans.GenericBean;
 
 import static org.junit.Assert.*;
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
index a1752458c42..3d310bdc686 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,15 +30,15 @@ import java.util.Set;
 
 import static org.junit.Assert.*;
 import org.junit.Test;
-import test.beans.GenericBean;
-import test.beans.GenericIntegerBean;
-import test.beans.GenericSetOfIntegerBean;
-import test.beans.TestBean;
 
 import org.springframework.beans.propertyeditors.CustomNumberEditor;
 import org.springframework.beans.propertyeditors.StringTrimmerEditor;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
+import org.springframework.tests.sample.beans.GenericBean;
+import org.springframework.tests.sample.beans.GenericIntegerBean;
+import org.springframework.tests.sample.beans.GenericSetOfIntegerBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
index 29e282c0a27..9d4e022a64a 100644
--- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,6 +51,11 @@ import org.springframework.beans.propertyeditors.StringTrimmerEditor;
 import org.springframework.beans.support.DerivedFromProtectedBaseBean;
 import org.springframework.tests.Assume;
 import org.springframework.tests.TestGroup;
+import org.springframework.tests.sample.beans.BooleanTestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.IndexedTestBean;
+import org.springframework.tests.sample.beans.NumberTestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.support.DefaultConversionService;
@@ -58,11 +63,6 @@ import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.util.StopWatch;
 import org.springframework.util.StringUtils;
 
-import test.beans.BooleanTestBean;
-import test.beans.ITestBean;
-import test.beans.IndexedTestBean;
-import test.beans.NumberTestBean;
-import test.beans.TestBean;
 
 /**
  * @author Rod Johnson
diff --git a/spring-beans/src/test/java/org/springframework/beans/CachedIntrospectionResultsTests.java b/spring-beans/src/test/java/org/springframework/beans/CachedIntrospectionResultsTests.java
index 4675d22dbff..a4fe92acc96 100644
--- a/spring-beans/src/test/java/org/springframework/beans/CachedIntrospectionResultsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/CachedIntrospectionResultsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@ import java.beans.PropertyDescriptor;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import org.junit.Test;
-import test.beans.TestBean;
 
 import org.springframework.core.OverridingClassLoader;
+import org.springframework.tests.sample.beans.TestBean;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -44,7 +44,7 @@ public final class CachedIntrospectionResultsTests {
 		assertTrue(CachedIntrospectionResults.classCache.containsKey(TestBean.class));
 
 		ClassLoader child = new OverridingClassLoader(getClass().getClassLoader());
-		Class tbClass = child.loadClass("test.beans.TestBean");
+		Class tbClass = child.loadClass("org.springframework.tests.sample.beans.TestBean");
 		assertFalse(CachedIntrospectionResults.classCache.containsKey(tbClass));
 		CachedIntrospectionResults.acceptClassLoader(child);
 		bw = new BeanWrapperImpl(tbClass);
diff --git a/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java b/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
index 44062a9107b..aaf6e56092d 100644
--- a/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,9 +27,9 @@ import java.lang.reflect.Method;
 import org.junit.Test;
 
 import org.springframework.core.JdkVersion;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.ClassUtils;
 
-import test.beans.TestBean;
 
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.lessThan;
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml
index bf756e1bbc5..71586ad8d36 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-leaf.xml
@@ -3,7 +3,7 @@
 
 
 
-	
+	
 		custom
 		25
 	
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-middle.xml b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-middle.xml
index 2d124050745..c5fa5b28581 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-middle.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-middle.xml
@@ -4,17 +4,16 @@
 
 
 	
-		
+	
 		custom
 		666
 	
-	
+
 	
-	
+	
+
+
 
-		
-	
-	
\ No newline at end of file
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-root.xml b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-root.xml
index ff33aa02125..28f8d652776 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-root.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests-root.xml
@@ -6,19 +6,19 @@
 	
-	
+	
 
-	
+	
 
 	
-	
+	
 		custom
 		25
 	
 
-	
+	
 
-	
+	
 		false
 	
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java
index d05f7ba577d..553f9cef46d 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.springframework.beans.factory;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static test.util.TestResourceUtils.qualifiedResource;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 import java.util.Arrays;
 import java.util.List;
@@ -33,12 +33,12 @@ import org.springframework.beans.factory.support.StaticListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.cglib.proxy.NoOp;
 import org.springframework.core.io.Resource;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.IndexedTestBean;
+import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.tests.sample.beans.factory.DummyFactory;
 import org.springframework.util.ObjectUtils;
 
-import test.beans.DummyFactory;
-import test.beans.ITestBean;
-import test.beans.IndexedTestBean;
-import test.beans.TestBean;
 
 /**
  * @author Rod Johnson
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
index 96eeb3b01f8..5ec91dddeee 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ package org.springframework.beans.factory;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
-import static test.util.TestResourceUtils.qualifiedResource;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -39,6 +38,10 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.core.io.Resource;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
+
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 /**
  * @author Guillaume Poirier
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
index 0e474fadaed..acf9f65a05a 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,17 @@
 
 package org.springframework.beans.factory;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.io.Closeable;
 import java.lang.reflect.Field;
 import java.net.MalformedURLException;
@@ -32,19 +43,13 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+
 import javax.security.auth.Subject;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.Ignore;
 import org.junit.Test;
-import test.beans.DerivedTestBean;
-import test.beans.DummyFactory;
-import test.beans.ITestBean;
-import test.beans.LifecycleBean;
-import test.beans.NestedTestBean;
-import test.beans.TestBean;
-
 import org.springframework.beans.BeansException;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.NotWritablePropertyException;
@@ -70,21 +75,25 @@ import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.support.PropertiesBeanDefinitionReader;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.ConstructorDependenciesBean;
-import org.springframework.beans.factory.xml.DependenciesBean;
 import org.springframework.beans.propertyeditors.CustomNumberEditor;
-import org.springframework.tests.Assume;
-import org.springframework.tests.TestGroup;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
+import org.springframework.tests.sample.beans.DependenciesBean;
+import org.springframework.tests.sample.beans.DerivedTestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.LifecycleBean;
+import org.springframework.tests.sample.beans.NestedTestBean;
+import org.springframework.tests.sample.beans.SideEffectBean;
+import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.tests.sample.beans.factory.DummyFactory;
 import org.springframework.util.StopWatch;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-
 /**
  * Tests properties population and autowire behavior.
  *
@@ -2600,29 +2609,6 @@ public class DefaultListableBeanFactoryTests {
 		}
 	}
 
-	/**
-	 * Bean that changes state on a business invocation, so that
-	 * we can check whether it's been invoked
-	 * @author Rod Johnson
-	 */
-	private static class SideEffectBean {
-
-		private int count;
-
-		public void setCount(int count) {
-			this.count = count;
-		}
-
-		public int getCount() {
-			return this.count;
-		}
-
-		public void doWork() {
-			++count;
-		}
-
-	}
-
 	private static class KnowsIfInstantiated {
 
 		private static boolean instantiated;
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java
index bccb33a9781..62c85b60b2b 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ package org.springframework.beans.factory;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
-import static test.util.TestResourceUtils.qualifiedResource;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 import org.junit.Test;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java
index c5f365f7997..e422accf4b7 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@ import java.util.Arrays;
 import org.junit.Test;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.support.DefaultSingletonBeanRegistry;
+import org.springframework.tests.sample.beans.DerivedTestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.DerivedTestBean;
-import test.beans.TestBean;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/access/beans1.xml b/spring-beans/src/test/java/org/springframework/beans/factory/access/beans1.xml
similarity index 100%
rename from spring-context/src/test/java/org/springframework/beans/factory/access/beans1.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/access/beans1.xml
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/access/beans2.xml b/spring-beans/src/test/java/org/springframework/beans/factory/access/beans2.xml
similarity index 100%
rename from spring-context/src/test/java/org/springframework/beans/factory/access/beans2.xml
rename to spring-beans/src/test/java/org/springframework/beans/factory/access/beans2.xml
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
index 5acfcca8b6f..7181f0b8a12 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,12 +43,12 @@ import org.springframework.beans.factory.support.AutowireCandidateQualifier;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
 import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.IndexedTestBean;
+import org.springframework.tests.sample.beans.NestedTestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.SerializationTestUtils;
 
-import test.beans.ITestBean;
-import test.beans.IndexedTestBean;
-import test.beans.NestedTestBean;
-import test.beans.TestBean;
 
 /**
  * Unit tests for {@link AutowiredAnnotationBeanPostProcessor}.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java
index f9295e4ee61..4fbb7b8cb1d 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/CustomAutowireConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package org.springframework.beans.factory.annotation;
 
 import static org.junit.Assert.assertEquals;
-import static test.util.TestResourceUtils.qualifiedResource;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 import org.junit.Test;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
index 4cfba96615d..a18a25e05ae 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/InjectAnnotationBeanPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,10 +24,6 @@ import javax.inject.Named;
 import javax.inject.Provider;
 
 import org.junit.Test;
-import test.beans.ITestBean;
-import test.beans.IndexedTestBean;
-import test.beans.NestedTestBean;
-import test.beans.TestBean;
 
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanFactory;
@@ -38,6 +34,10 @@ import org.springframework.beans.factory.support.AutowireCandidateQualifier;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
 import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.IndexedTestBean;
+import org.springframework.tests.sample.beans.NestedTestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.SerializationTestUtils;
 
 import static org.junit.Assert.*;
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
index c5c49d9b3bd..252ee0ddb80 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ import java.util.Map;
 
 import static org.junit.Assert.*;
 import org.junit.Test;
-import test.beans.TestBean;
 
 import org.springframework.beans.FatalBeanException;
 import org.springframework.beans.MutablePropertyValues;
@@ -36,6 +35,7 @@ import org.springframework.beans.PropertyEditorRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * Unit tests for {@link CustomEditorConfigurer}.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests-context.xml
index b9c8625b2f8..2e2d9fd435f 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests-context.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests-context.xml
@@ -3,7 +3,7 @@
 
 
 
-	
+	
 		
 			
 				
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java
index d5569c3fd3c..66226340aa4 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package org.springframework.beans.factory.config;
 
 import static org.junit.Assert.assertEquals;
-import static test.util.TestResourceUtils.qualifiedResource;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 import java.sql.Connection;
 
@@ -25,8 +25,8 @@ import org.junit.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.TestBean;
 
 /**
  * Unit tests for {@link FieldRetrievingFactoryBean}.
@@ -119,7 +119,7 @@ public final class FieldRetrievingFactoryBeanTests {
 	@Test
 	public void testWithConstantOnClassWithPackageLevelVisibility() throws Exception {
 		FieldRetrievingFactoryBean fr = new FieldRetrievingFactoryBean();
-		fr.setBeanName("test.beans.PackageLevelVisibleBean.CONSTANT");
+		fr.setBeanName("org.springframework.tests.sample.beans.PackageLevelVisibleBean.CONSTANT");
 		fr.afterPropertiesSet();
 		assertEquals("Wuby", fr.getObject());
 	}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
index a7faf0cc085..dc56161776d 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
-import static test.util.TestResourceUtils.qualifiedResource;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 import java.util.Date;
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java
index 409e3f8325d..cc43afb4da0 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package org.springframework.beans.factory.config;
 
 import static org.junit.Assert.*;
-import static test.util.TestResourceUtils.qualifiedResource;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 import java.util.Properties;
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml
index b33b3c9c65a..490aab87909 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests-context.xml
@@ -3,19 +3,19 @@
 
 
 
-	
+	
 		10
 		
-			
+			
 				11
 			
 		
   
 	
-	
+	
 		98
 		
-			
+			
 				99
 			
 		
@@ -23,7 +23,7 @@
 
 	
 		
-			
+			
 				12
 			
 		
@@ -46,10 +46,10 @@
 	
 		tb
 		spouse
-		test.beans.TestBean
+		org.springframework.tests.sample.beans.TestBean
 	
 
-	
+	
 		
 		
 			
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
index 6ec0c706e64..ce21ee90954 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,15 +20,15 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
-import static test.util.TestResourceUtils.qualifiedResource;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 import org.junit.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.ITestBean;
-import test.beans.TestBean;
 
 /**
  * Unit tests for {@link PropertyPathFactoryBean}.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.java
index c0c65711bc2..63e49fb18bf 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,8 +36,8 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.TestBean;
 
 
 /**
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
index ab67af35a3a..1212913cb1b 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.genericBeanDefinition;
-import static test.util.TestResourceUtils.qualifiedResource;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -48,9 +48,9 @@ import org.springframework.beans.factory.support.ManagedMap;
 import org.springframework.beans.factory.support.ManagedSet;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.core.io.Resource;
+import org.springframework.tests.sample.beans.IndexedTestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.IndexedTestBean;
-import test.beans.TestBean;
 
 /**
  * Unit tests for various {@link PropertyResourceConfigurer} implementations including:
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests-context.xml
index f6f4f4a0a23..1c1978456ca 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests-context.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests-context.xml
@@ -5,6 +5,6 @@
 	     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
 
-	
+	
 
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java
index 861cafa68d2..0a561dd3360 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package org.springframework.beans.factory.config;
 
 import static org.junit.Assert.*;
-import static test.util.TestResourceUtils.qualifiedResource;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -28,8 +28,8 @@ import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.TestBean;
 
 /**
  * Simple test to illustrate and verify scope usage.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests-context.xml
index d0c52278445..c2cc486e9da 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests-context.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests-context.xml
@@ -6,7 +6,7 @@
 
 	
 
-	
+	
 		
 			
 				
@@ -14,9 +14,9 @@
 		
 	
 
-	
+	
 		
-			
+			
 				
 				    
 				        
@@ -26,5 +26,5 @@
 		
 	
 
-	
+	
 
\ No newline at end of file
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java
index 82a35dc064f..20bdd506544 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 package org.springframework.beans.factory.parsing;
 
 import static org.junit.Assert.*;
-import static test.util.TestResourceUtils.qualifiedResource;
+import static org.springframework.tests.TestResourceUtils.qualifiedResource;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,8 +27,8 @@ import org.junit.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.Resource;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.TestBean;
 
 /**
  * @author Rob Harrop
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java
index 365ae6b9581..48bd97d15b1 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@ import java.util.Arrays;
 import junit.framework.TestCase;
 
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.TestBean;
 
 /**
  * @author Rod Johnson
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java
index c761254fdae..11aed3fa64c 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import junit.framework.TestCase;
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.TestBean;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
index b3516282d43..1afd0c52810 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,10 +45,13 @@ import org.springframework.beans.propertyeditors.CustomNumberEditor;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.UrlResource;
 
-import test.beans.GenericBean;
-import test.beans.GenericIntegerBean;
-import test.beans.GenericSetOfIntegerBean;
-import test.beans.TestBean;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
+import org.springframework.tests.sample.beans.GenericBean;
+import org.springframework.tests.sample.beans.GenericIntegerBean;
+import org.springframework.tests.sample.beans.GenericSetOfIntegerBean;
+import org.springframework.tests.sample.beans.TestBean;
+
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java
index 2e4025d304a..f9f1beba04a 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import junit.framework.TestCase;
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.TestBean;
 
 /**
  * @author Rob Harrop
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java
index 51e8dd70122..d62e43d0601 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ package org.springframework.beans.factory.support;
 
 import junit.framework.TestCase;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.TestBean;
 
 /**
  * @author Rob Harrop
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/genericBeanTests.xml b/spring-beans/src/test/java/org/springframework/beans/factory/support/genericBeanTests.xml
index 6c9d11f210a..3e9a6577b55 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/support/genericBeanTests.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/support/genericBeanTests.xml
@@ -3,7 +3,7 @@
 
 
 
-	
+	
 		
 			
 				
@@ -43,7 +43,7 @@
 			autowire="constructor">
 	
 
-  
+  
     
     
       
@@ -53,7 +53,7 @@
     
   
 
-  
+  
     
     
       
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java
index ded4bb5eaef..625e8c7085e 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,8 @@ import junit.framework.TestCase;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.TestBean;
 
 /**
  * @author Rick Evans
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java
index 490d0a7e1bf..4510487801a 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,13 +27,13 @@ import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanIsNotAFactoryException;
 import org.springframework.beans.factory.BeanNotOfRequiredTypeException;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.tests.sample.beans.LifecycleBean;
+import org.springframework.tests.sample.beans.MustBeInitialized;
+import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.tests.sample.beans.factory.DummyFactory;
 
-import test.beans.DummyFactory;
-import test.beans.LifecycleBean;
-import test.beans.TestBean;
 
 /**
  * Subclasses must implement setUp() to initialize bean factory
@@ -336,32 +336,3 @@ public abstract class AbstractBeanFactoryTests extends TestCase {
 	}
 
 }
-
-
-/**
- * Simple test of BeanFactory initialization
- * @author Rod Johnson
- * @since 12.03.2003
- */
-class MustBeInitialized implements InitializingBean {
-
-	private boolean inited;
-
-	/**
-	 * @see InitializingBean#afterPropertiesSet()
-	 */
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		this.inited = true;
-	}
-
-	/**
-	 * Dummy business method that will fail unless the factory
-	 * managed the bean's lifecycle correctly
-	 */
-	public void businessMethod() {
-		if (!this.inited)
-			throw new RuntimeException("Factory didn't call afterPropertiesSet() on MustBeInitialized object");
-	}
-
-}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractListableBeanFactoryTests.java
index 6a04c540743..4c1ac580bb9 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractListableBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AbstractListableBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ package org.springframework.beans.factory.xml;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.ListableBeanFactory;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.TestBean;
 
 /**
  * @author Rod Johnson
@@ -51,13 +51,13 @@ public abstract class AbstractListableBeanFactoryTests extends AbstractBeanFacto
 
 	public void assertTestBeanCount(int count) {
 		String[] defNames = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, false);
-		assertTrue("We should have " + count + " beans for class org.springframework.beans.TestBean, not " +
+		assertTrue("We should have " + count + " beans for class org.springframework.tests.sample.beans.TestBean, not " +
 				defNames.length, defNames.length == count);
 
 		int countIncludingFactoryBeans = count + 2;
 		String[] names = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, true);
 		assertTrue("We should have " + countIncludingFactoryBeans +
-				" beans for class org.springframework.beans.TestBean, not " + names.length,
+				" beans for class org.springframework.tests.sample.beans.TestBean, not " + names.length,
 				names.length == countIncludingFactoryBeans);
 	}
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java
index 9cc414ee651..ae6232f40ff 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@ import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.TestBean;
 
 /**
  * @author Rob Harrop
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java
index 72de2d65d11..a9294e05fd1 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,8 +27,8 @@ import junit.framework.TestCase;
 import org.springframework.beans.factory.support.BeanDefinitionReader;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.TestBean;
 
 /**
  * Unit and integration tests for the collection merging support.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java
index f57b78d2591..3a88ab9fa8f 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@ import java.util.Map;
 import org.junit.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.TestBean;
 
 /**
  * @author Rob Harrop
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java
index 6a31f91e1a3..082fc418b0e 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,9 @@ package org.springframework.beans.factory.xml;
 
 import java.io.Serializable;
 
-import test.beans.IndexedTestBean;
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.IndexedTestBean;
+import org.springframework.tests.sample.beans.TestBean;
+
 
 /**
  * Simple bean used to check constructor dependency checking.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java
index 75bcc94d84b..7b02d0bed29 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/CountingFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
 package org.springframework.beans.factory.xml;
 
 import org.springframework.beans.factory.FactoryBean;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.TestBean;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java
index d1449fdb0b7..a0d4f722e15 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
 package org.springframework.beans.factory.xml;
 
 
-import test.beans.DummyFactory;
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.tests.sample.beans.factory.DummyFactory;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml
index b897d98858a..8e53cee2934 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml
@@ -4,12 +4,12 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 		http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
-	
+	
 		
 	
 
 	
-		
+		
 			
 		
 	
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml
index e8bf2b4469a..12a2fb08602 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml
@@ -4,12 +4,12 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 		http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
-	
+	
 		
 	
 
 	
-	
+	
 		
 	
 
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java
index 58c392ddcaa..bd92b0c3916 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/DuplicateBeanIdTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@ import static org.junit.Assert.fail;
 import org.junit.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.TestBean;
 
 
 /**
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java
index 62f4e654b65..ff691358a44 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@ import org.springframework.beans.factory.parsing.ImportDefinition;
 import org.springframework.beans.factory.parsing.PassThroughSourceExtractor;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.tests.beans.CollectingReaderEventListener;
 
 /**
  * @author Rob Harrop
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java
index 696ab6c0afe..0d67448bc05 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,12 +23,12 @@ import java.util.Properties;
 
 import static org.junit.Assert.*;
 import org.junit.Test;
-import test.beans.TestBean;
 
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java
index 1623cf3ac52..a5ef87cb1f6 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,8 @@ package org.springframework.beans.factory.xml;
 import java.util.Collections;
 import java.util.List;
 
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
+
 
 /**
  * Test class for Spring's ability to create objects using static
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java
index 25ab86c6416..6c8872054e1 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.beans.factory.xml;
 
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * Test class for Spring's ability to create objects using
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java
index a6feaedcec6..5b9ddc18e66 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@ import org.junit.Test;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.TestBean;
 
 /**
  * Tests for propagating enclosing beans element defaults to nested beans elements.
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SchemaValidationTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SchemaValidationTests.java
index 8344d0b5298..17552b1d591 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SchemaValidationTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SchemaValidationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@ import org.xml.sax.SAXParseException;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.TestBean;
 
 /**
  * @author Rob Harrop
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java
index f9416028884..601afa44fbe 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimpleConstructorNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@ import org.junit.Test;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.tests.sample.beans.DummyBean;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.DummyBean;
-import test.beans.TestBean;
 
 /**
  * @author Costin Leau
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerTests.java
index badce0656bd..45e89564e72 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@ import org.junit.Test;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.ITestBean;
-import test.beans.TestBean;
 
 /**
  * @author Rob Harrop
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java
index 438a4b7e9e3..849da031cc3 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.beans.factory.xml;
 
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * Test class for Spring's ability to create
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java
index d042952a88e..3bb04d4c593 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,6 @@ import java.util.TreeMap;
 import java.util.Arrays;
 
 import junit.framework.TestCase;
-import test.beans.CustomEnum;
-import test.beans.TestBean;
 
 import org.springframework.beans.factory.config.FieldRetrievingFactoryBean;
 import org.springframework.beans.factory.config.PropertiesFactoryBean;
@@ -34,6 +32,9 @@ import org.springframework.beans.factory.parsing.ComponentDefinition;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.tests.beans.CollectingReaderEventListener;
+import org.springframework.tests.sample.beans.CustomEnum;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * @author Rob Harrop
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java
index 18f616eb14d..6960653ea6e 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -34,7 +33,6 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
-import java.util.concurrent.CopyOnWriteArraySet;
 
 import org.junit.Test;
 import org.springframework.beans.factory.BeanCreationException;
@@ -44,8 +42,9 @@ import org.springframework.beans.factory.config.MapFactoryBean;
 import org.springframework.beans.factory.config.SetFactoryBean;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.tests.sample.beans.HasMap;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.TestBean;
 
 /**
  * Tests for collections in XML bean definitions.
@@ -452,94 +451,3 @@ public class XmlBeanCollectionTests {
 		}
 	}
 }
-
-
-/**
- * Bean exposing a map. Used for bean factory tests.
- *
- * @author Rod Johnson
- * @since 05.06.2003
- */
-class HasMap {
-
-	private Map map;
-
-	private IdentityHashMap identityMap;
-
-	private Set set;
-
-	private CopyOnWriteArraySet concurrentSet;
-
-	private Properties props;
-
-	private Object[] objectArray;
-
-	private Class[] classArray;
-
-	private Integer[] intArray;
-
-	public Map getMap() {
-		return map;
-	}
-
-	public void setMap(Map map) {
-		this.map = map;
-	}
-
-	public IdentityHashMap getIdentityMap() {
-		return identityMap;
-	}
-
-	public void setIdentityMap(IdentityHashMap identityMap) {
-		this.identityMap = identityMap;
-	}
-
-	public Set getSet() {
-		return set;
-	}
-
-	public void setSet(Set set) {
-		this.set = set;
-	}
-
-	public CopyOnWriteArraySet getConcurrentSet() {
-		return concurrentSet;
-	}
-
-	public void setConcurrentSet(CopyOnWriteArraySet concurrentSet) {
-		this.concurrentSet = concurrentSet;
-	}
-
-	public Properties getProps() {
-		return props;
-	}
-
-	public void setProps(Properties props) {
-		this.props = props;
-	}
-
-	public Object[] getObjectArray() {
-		return objectArray;
-	}
-
-	public void setObjectArray(Object[] objectArray) {
-		this.objectArray = objectArray;
-	}
-
-	public Class[] getClassArray() {
-		return classArray;
-	}
-
-	public void setClassArray(Class[] classArray) {
-		this.classArray = classArray;
-	}
-
-	public Integer[] getIntegerArray() {
-		return intArray;
-	}
-
-	public void setIntegerArray(Integer[] is) {
-		intArray = is;
-	}
-
-}
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java
index 76baf7366fe..c5da99f0e4c 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,8 +28,8 @@ import org.springframework.beans.factory.support.SimpleBeanDefinitionRegistry;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.core.io.Resource;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.TestBean;
 
 /**
  * @author Rick Evans
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
index 5b6e88a1555..2fd60f7a0e0 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,11 +28,11 @@ import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.LifecycleBean;
+import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.tests.sample.beans.factory.DummyFactory;
 
-import test.beans.DummyFactory;
-import test.beans.ITestBean;
-import test.beans.LifecycleBean;
-import test.beans.TestBean;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
index ca477008cd2..d2052916203 100644
--- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,12 +44,12 @@ import org.springframework.beans.BeanWrapperImpl;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.PropertyValue;
+import org.springframework.tests.sample.beans.BooleanTestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.IndexedTestBean;
+import org.springframework.tests.sample.beans.NumberTestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.beans.BooleanTestBean;
-import test.beans.ITestBean;
-import test.beans.IndexedTestBean;
-import test.beans.NumberTestBean;
-import test.beans.TestBean;
 
 /**
  * Unit tests for the various PropertyEditors in Spring.
@@ -592,9 +592,9 @@ public class CustomEditorTests {
 	@Test
 	public void testClassEditorWithArray() {
 		PropertyEditor classEditor = new ClassEditor();
-		classEditor.setAsText("test.beans.TestBean[]");
+		classEditor.setAsText("org.springframework.tests.sample.beans.TestBean[]");
 		assertEquals(TestBean[].class, classEditor.getValue());
-		assertEquals("test.beans.TestBean[]", classEditor.getAsText());
+		assertEquals("org.springframework.tests.sample.beans.TestBean[]", classEditor.getAsText());
 	}
 
 	/*
diff --git a/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java b/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
index ef036076581..14c28820268 100644
--- a/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
+++ b/spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,18 @@
 
 package org.springframework.beans.support;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import java.util.ArrayList;
 import java.util.List;
+
 import junit.framework.TestCase;
 
-import test.beans.TestBean;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java b/spring-beans/src/test/java/org/springframework/tests/beans/CollectingReaderEventListener.java
similarity index 98%
rename from spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java
rename to spring-beans/src/test/java/org/springframework/tests/beans/CollectingReaderEventListener.java
index 1924dac82e6..8779f9ed5ed 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/CollectingReaderEventListener.java
+++ b/spring-beans/src/test/java/org/springframework/tests/beans/CollectingReaderEventListener.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.factory.xml;
+package org.springframework.tests.beans;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/spring-beans/src/test/java/test/beans/BooleanTestBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/BooleanTestBean.java
similarity index 95%
rename from spring-beans/src/test/java/test/beans/BooleanTestBean.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/BooleanTestBean.java
index 4ea2f67d3bb..92484b7d1aa 100644
--- a/spring-beans/src/test/java/test/beans/BooleanTestBean.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/BooleanTestBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.beans;
+package org.springframework.tests.sample.beans;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-context-support/src/test/java/org/springframework/beans/Colour.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/Colour.java
similarity index 95%
rename from spring-context-support/src/test/java/org/springframework/beans/Colour.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/Colour.java
index a992a2ebfc6..a4a7d9740b4 100644
--- a/spring-context-support/src/test/java/org/springframework/beans/Colour.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/Colour.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans;
+package org.springframework.tests.sample.beans;
 
 import org.springframework.core.enums.ShortCodedLabeledEnum;
 
diff --git a/spring-aop/src/test/java/test/beans/CountingTestBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/CountingTestBean.java
similarity index 94%
rename from spring-aop/src/test/java/test/beans/CountingTestBean.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/CountingTestBean.java
index 50657647656..e5f6947de5a 100644
--- a/spring-aop/src/test/java/test/beans/CountingTestBean.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/CountingTestBean.java
@@ -1,7 +1,3 @@
-/*
- *	$Id$
- */
-
 /*
  * Copyright 2002-2005 the original author or authors.
  *
@@ -18,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.beans;
+package org.springframework.tests.sample.beans;
 
 
 /**
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/CustomEnum.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/CustomEnum.java
similarity index 94%
rename from spring-webmvc/src/test/java/org/springframework/beans/CustomEnum.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/CustomEnum.java
index 1e43492191b..66a863772ff 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/CustomEnum.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/CustomEnum.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans;
+package org.springframework.tests.sample.beans;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/DependenciesBean.java
similarity index 95%
rename from spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/DependenciesBean.java
index 8bed2eeeab0..b17d1028cc5 100644
--- a/spring-beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/DependenciesBean.java
@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.factory.xml;
+package org.springframework.tests.sample.beans;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 
-import test.beans.TestBean;
-
 /**
  * Simple bean used to test dependency checking.
  *
diff --git a/spring-beans/src/test/java/test/beans/DerivedTestBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/DerivedTestBean.java
similarity index 97%
rename from spring-beans/src/test/java/test/beans/DerivedTestBean.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/DerivedTestBean.java
index c0f63181aba..91416208a2b 100644
--- a/spring-beans/src/test/java/test/beans/DerivedTestBean.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/DerivedTestBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.beans;
+package org.springframework.tests.sample.beans;
 
 import java.io.Serializable;
 
diff --git a/spring-beans/src/test/java/test/beans/DummyBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/DummyBean.java
similarity index 96%
rename from spring-beans/src/test/java/test/beans/DummyBean.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/DummyBean.java
index a8428c7f780..cb5767eef59 100644
--- a/spring-beans/src/test/java/test/beans/DummyBean.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/DummyBean.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package test.beans;
+package org.springframework.tests.sample.beans;
 
 /**
  * @author Costin Leau
diff --git a/spring-beans/src/test/java/test/beans/DummyFactory.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/DummyFactory.java
similarity index 97%
rename from spring-beans/src/test/java/test/beans/DummyFactory.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/DummyFactory.java
index 60f7966d9a0..dc08778c536 100644
--- a/spring-beans/src/test/java/test/beans/DummyFactory.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/DummyFactory.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.beans;
+package org.springframework.tests.sample.beans;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
@@ -24,6 +24,7 @@ import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
+import org.springframework.tests.sample.beans.TestBean;
 
 
 /**
diff --git a/spring-beans/src/test/java/test/beans/GenericBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericBean.java
similarity index 95%
rename from spring-beans/src/test/java/test/beans/GenericBean.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericBean.java
index 12ff808dc84..c192382a1b7 100644
--- a/spring-beans/src/test/java/test/beans/GenericBean.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2010 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.beans;
+package org.springframework.tests.sample.beans;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -37,6 +37,8 @@ public class GenericBean {
 
 	private Set numberSet;
 
+	private Set testBeanSet;
+
 	private List resourceList;
 
 	private List testBeanList;
@@ -69,6 +71,7 @@ public class GenericBean {
 
 	private List genericListProperty;
 
+
 	public GenericBean() {
 	}
 
@@ -121,6 +124,14 @@ public class GenericBean {
 		this.numberSet = numberSet;
 	}
 
+	public Set getTestBeanSet() {
+		return testBeanSet;
+	}
+
+	public void setTestBeanSet(Set testBeanSet) {
+		this.testBeanSet = testBeanSet;
+	}
+
 	public List getResourceList() {
 		return resourceList;
 	}
@@ -284,4 +295,4 @@ public class GenericBean {
 		return new GenericBean(someFlag, collectionMap);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-beans/src/test/java/test/beans/GenericIntegerBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericIntegerBean.java
similarity index 93%
rename from spring-beans/src/test/java/test/beans/GenericIntegerBean.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericIntegerBean.java
index 43b6465df08..b7465b1bfa1 100644
--- a/spring-beans/src/test/java/test/beans/GenericIntegerBean.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericIntegerBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.beans;
+package org.springframework.tests.sample.beans;
 
 
 /**
diff --git a/spring-beans/src/test/java/test/beans/GenericSetOfIntegerBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericSetOfIntegerBean.java
similarity index 93%
rename from spring-beans/src/test/java/test/beans/GenericSetOfIntegerBean.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericSetOfIntegerBean.java
index 021c0cd1c16..a0fee60195d 100644
--- a/spring-beans/src/test/java/test/beans/GenericSetOfIntegerBean.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/GenericSetOfIntegerBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.beans;
+package org.springframework.tests.sample.beans;
 
 import java.util.Set;
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/HasMap.java
similarity index 75%
rename from spring-context/src/test/java/org/springframework/beans/factory/HasMap.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/HasMap.java
index 73fe70276e2..4639050b2a6 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/HasMap.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/HasMap.java
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.factory;
+package org.springframework.tests.sample.beans;
 
+import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
 
 /**
  * Bean exposing a map. Used for bean factory tests.
@@ -40,6 +42,10 @@ public class HasMap {
 
 	private Integer[] intArray;
 
+	private IdentityHashMap identityMap;
+
+	private CopyOnWriteArraySet concurrentSet;
+
 	private HasMap() {
 	}
 
@@ -91,4 +97,20 @@ public class HasMap {
 		intArray = is;
 	}
 
+	public IdentityHashMap getIdentityMap() {
+		return identityMap;
+	}
+
+	public void setIdentityMap(IdentityHashMap identityMap) {
+		this.identityMap = identityMap;
+	}
+
+	public CopyOnWriteArraySet getConcurrentSet() {
+		return concurrentSet;
+	}
+
+	public void setConcurrentSet(CopyOnWriteArraySet concurrentSet) {
+		this.concurrentSet = concurrentSet;
+	}
+
 }
diff --git a/spring-aspects/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/INestedTestBean.java
similarity index 93%
rename from spring-aspects/src/test/java/org/springframework/beans/INestedTestBean.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/INestedTestBean.java
index e0ae5f20a3f..58c4b9d502d 100644
--- a/spring-aspects/src/test/java/org/springframework/beans/INestedTestBean.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/INestedTestBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans;
+package org.springframework.tests.sample.beans;
 
 public interface INestedTestBean {
 
diff --git a/spring-beans/src/test/java/test/beans/IOther.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/IOther.java
similarity index 93%
rename from spring-beans/src/test/java/test/beans/IOther.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/IOther.java
index f3c6263261e..694f32d2759 100644
--- a/spring-beans/src/test/java/test/beans/IOther.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/IOther.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package test.beans;
+package org.springframework.tests.sample.beans;
 
 public interface IOther {
 
diff --git a/spring-web/src/test/java/org/springframework/beans/ITestBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/ITestBean.java
similarity index 90%
rename from spring-web/src/test/java/org/springframework/beans/ITestBean.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/ITestBean.java
index 526c3dacfb5..b467348a93d 100644
--- a/spring-web/src/test/java/org/springframework/beans/ITestBean.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/ITestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2007 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.beans;
+package org.springframework.tests.sample.beans;
 
 import java.io.IOException;
 
 /**
- * Interface used for {@link org.springframework.beans.TestBean}.
+ * Interface used for {@link org.springframework.tests.sample.beans.TestBean}.
  *
  * 
Two methods are the same as on Person, but if this
  * extends person it breaks quite a few tests..
@@ -84,4 +84,4 @@ public interface ITestBean {
 
 	void unreliableFileOperation() throws IOException;
 
-}
\ No newline at end of file
+}
diff --git a/spring-beans/src/test/java/test/beans/IndexedTestBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/IndexedTestBean.java
similarity index 98%
rename from spring-beans/src/test/java/test/beans/IndexedTestBean.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/IndexedTestBean.java
index bd2a72662f6..d319bbd0eda 100644
--- a/spring-beans/src/test/java/test/beans/IndexedTestBean.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/IndexedTestBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.beans;
+package org.springframework.tests.sample.beans;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/spring-beans/src/test/java/test/beans/LifecycleBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/LifecycleBean.java
similarity index 99%
rename from spring-beans/src/test/java/test/beans/LifecycleBean.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/LifecycleBean.java
index cd1dcd6e5e0..1a81d10340a 100644
--- a/spring-beans/src/test/java/test/beans/LifecycleBean.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/LifecycleBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.beans;
+package org.springframework.tests.sample.beans;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/MustBeInitialized.java
similarity index 92%
rename from spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/MustBeInitialized.java
index 959861e6b47..cc83d69d833 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/MustBeInitialized.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.factory;
+package org.springframework.tests.sample.beans;
+
+import org.springframework.beans.factory.InitializingBean;
 
 /**
  * Simple test of BeanFactory initialization
diff --git a/spring-beans/src/test/java/test/beans/NestedTestBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/NestedTestBean.java
similarity index 96%
rename from spring-beans/src/test/java/test/beans/NestedTestBean.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/NestedTestBean.java
index edc145ad7d2..844c5ea6921 100644
--- a/spring-beans/src/test/java/test/beans/NestedTestBean.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/NestedTestBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.beans;
+package org.springframework.tests.sample.beans;
 
 /**
  * Simple nested test bean used for testing bean factories, AOP framework etc.
diff --git a/spring-beans/src/test/java/test/beans/NumberTestBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/NumberTestBean.java
similarity index 98%
rename from spring-beans/src/test/java/test/beans/NumberTestBean.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/NumberTestBean.java
index cdd80bd27b2..489c9335091 100644
--- a/spring-beans/src/test/java/test/beans/NumberTestBean.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/NumberTestBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.beans;
+package org.springframework.tests.sample.beans;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/spring-beans/src/test/java/test/beans/PackageLevelVisibleBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/PackageLevelVisibleBean.java
similarity index 94%
rename from spring-beans/src/test/java/test/beans/PackageLevelVisibleBean.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/PackageLevelVisibleBean.java
index eeb4b7325db..142a5da2d26 100644
--- a/spring-beans/src/test/java/test/beans/PackageLevelVisibleBean.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/PackageLevelVisibleBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.beans;
+package org.springframework.tests.sample.beans;
 
 /**
  * @see org.springframework.beans.factory.config.FieldRetrievingFactoryBeanTests
diff --git a/spring-test/src/test/java/org/springframework/beans/Pet.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/Pet.java
similarity index 96%
rename from spring-test/src/test/java/org/springframework/beans/Pet.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/Pet.java
index eb78f612fb0..61563f0dd8a 100644
--- a/spring-test/src/test/java/org/springframework/beans/Pet.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/Pet.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans;
+package org.springframework.tests.sample.beans;
 
 /**
  * @author Rob Harrop
diff --git a/spring-aop/src/test/java/test/beans/SideEffectBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/SideEffectBean.java
similarity index 95%
rename from spring-aop/src/test/java/test/beans/SideEffectBean.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/SideEffectBean.java
index 621ecbc3a2c..9477a5e5488 100644
--- a/spring-aop/src/test/java/test/beans/SideEffectBean.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/SideEffectBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.beans;
+package org.springframework.tests.sample.beans;
 
 /**
  * Bean that changes state on a business invocation, so that
diff --git a/spring-context/src/test/java/org/springframework/beans/TestBean.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/TestBean.java
similarity index 89%
rename from spring-context/src/test/java/org/springframework/beans/TestBean.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/TestBean.java
index c050b64856c..cb276da9cbd 100644
--- a/spring-context/src/test/java/org/springframework/beans/TestBean.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/TestBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans;
+package org.springframework.tests.sample.beans;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -58,7 +58,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 
 	private boolean jedi;
 
-	private ITestBean[] spouses;
+	protected ITestBean[] spouses;
 
 	private String touchy;
 
@@ -66,6 +66,12 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 
 	private Integer[] someIntegerArray;
 
+	private Integer[][] nestedIntegerArray;
+
+	private int[] someIntArray;
+
+	private int[][] nestedIntArray;
+
 	private Date date = new Date();
 
 	private Float myFloat = new Float(0.0);
@@ -257,6 +263,36 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		this.someIntegerArray = someIntegerArray;
 	}
 
+	@Override
+	public Integer[][] getNestedIntegerArray() {
+		return nestedIntegerArray;
+	}
+
+	@Override
+	public void setNestedIntegerArray(Integer[][] nestedIntegerArray) {
+		this.nestedIntegerArray = nestedIntegerArray;
+	}
+
+	@Override
+	public int[] getSomeIntArray() {
+		return someIntArray;
+	}
+
+	@Override
+	public void setSomeIntArray(int[] someIntArray) {
+		this.someIntArray = someIntArray;
+	}
+
+	@Override
+	public int[][] getNestedIntArray() {
+		return nestedIntArray;
+	}
+
+	@Override
+	public void setNestedIntArray(int[][] nestedIntArray) {
+		this.nestedIntArray = nestedIntArray;
+	}
+
 	public Date getDate() {
 		return date;
 	}
@@ -382,7 +418,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 
 
 	/**
-	 * @see org.springframework.beans.ITestBean#exceptional(Throwable)
+	 * @see org.springframework.tests.sample.beans.ITestBean#exceptional(Throwable)
 	 */
 	@Override
 	public void exceptional(Throwable t) throws Throwable {
@@ -396,7 +432,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		throw new IOException();
 	}
 	/**
-	 * @see org.springframework.beans.ITestBean#returnsThis()
+	 * @see org.springframework.tests.sample.beans.ITestBean#returnsThis()
 	 */
 	@Override
 	public Object returnsThis() {
@@ -404,7 +440,7 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 	}
 
 	/**
-	 * @see org.springframework.beans.IOther#absquatulate()
+	 * @see org.springframework.tests.sample.beans.IOther#absquatulate()
 	 */
 	@Override
 	public void absquatulate() {
@@ -454,4 +490,4 @@ public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOt
 		return this.name;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/factory/DummyFactory.java
similarity index 87%
rename from spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java
rename to spring-beans/src/test/java/org/springframework/tests/sample/beans/factory/DummyFactory.java
index f9c4f273826..b562f569fa0 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/DummyFactory.java
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/factory/DummyFactory.java
@@ -14,11 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.factory;
+package org.springframework.tests.sample.beans.factory;
 
 import org.springframework.beans.BeansException;
-import org.springframework.beans.TestBean;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
+import org.springframework.beans.factory.BeanNameAware;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
+import org.springframework.tests.sample.beans.TestBean;
+
 
 /**
  * Simple factory to allow testing of FactoryBean support in AbstractBeanFactory.
@@ -29,6 +36,7 @@ import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
  * factories get this lifecycle callback if they want.
  *
  * @author Rod Johnson
+ * @author Chris Beams
  * @since 10.03.2003
  */
 public class DummyFactory
@@ -72,7 +80,7 @@ public class DummyFactory
 
 	/**
 	 * Return if the bean managed by this factory is a singleton.
-	 * @see org.springframework.beans.factory.FactoryBean#isSingleton()
+	 * @see FactoryBean#isSingleton()
 	 */
 	@Override
 	public boolean isSingleton() {
@@ -146,7 +154,7 @@ public class DummyFactory
 	/**
 	 * Return the managed object, supporting both singleton
 	 * and prototype mode.
-	 * @see org.springframework.beans.factory.FactoryBean#getObject()
+	 * @see FactoryBean#getObject()
 	 */
 	@Override
 	public Object getObject() throws BeansException {
@@ -164,7 +172,7 @@ public class DummyFactory
 	}
 
 	@Override
-	public Class getObjectType() {
+	public Class getObjectType() {
 		return TestBean.class;
 	}
 
@@ -176,4 +184,4 @@ public class DummyFactory
 		}
 	}
 
-}
+}
\ No newline at end of file
diff --git a/spring-beans/src/test/java/org/springframework/tests/sample/beans/package-info.java b/spring-beans/src/test/java/org/springframework/tests/sample/beans/package-info.java
new file mode 100644
index 00000000000..575bd1933f9
--- /dev/null
+++ b/spring-beans/src/test/java/org/springframework/tests/sample/beans/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * General purpose sample beans that can be used with tests.
+ */
+package org.springframework.tests.sample.beans;
diff --git a/spring-beans/src/test/java/org/springframework/util/SerializationTestUtils.java b/spring-beans/src/test/java/org/springframework/util/SerializationTestUtils.java
deleted file mode 100644
index 9ae4f54ec24..00000000000
--- a/spring-beans/src/test/java/org/springframework/util/SerializationTestUtils.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2002-2009 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.NotSerializableException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-
-/**
- * Utilities for testing serializability of objects.
- * Exposes static methods for use in other test cases.
- *
- * @author Rod Johnson
- */
-public class SerializationTestUtils {
-
-	public static void testSerialization(Object o) throws IOException {
-		OutputStream baos = new ByteArrayOutputStream();
-		ObjectOutputStream oos = new ObjectOutputStream(baos);
-		oos.writeObject(o);
-	}
-
-	public static boolean isSerializable(Object o) throws IOException {
-		try {
-			testSerialization(o);
-			return true;
-		}
-		catch (NotSerializableException ex) {
-			return false;
-		}
-	}
-
-	public static Object serializeAndDeserialize(Object o) throws IOException, ClassNotFoundException {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ObjectOutputStream oos = new ObjectOutputStream(baos);
-		oos.writeObject(o);
-		oos.flush();
-		baos.flush();
-		byte[] bytes = baos.toByteArray();
-
-		ByteArrayInputStream is = new ByteArrayInputStream(bytes);
-		ObjectInputStream ois = new ObjectInputStream(is);
-		Object o2 = ois.readObject();
-		return o2;
-	}
-
-}
diff --git a/spring-beans/src/test/java/test/beans/Colour.java b/spring-beans/src/test/java/test/beans/Colour.java
deleted file mode 100644
index 533d0df36e3..00000000000
--- a/spring-beans/src/test/java/test/beans/Colour.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-import org.springframework.core.enums.ShortCodedLabeledEnum;
-
-/**
- * @author Rob Harrop
- */
-@SuppressWarnings("serial")
-public class Colour extends ShortCodedLabeledEnum {
-
-	public static final Colour RED = new Colour(0, "RED");
-	public static final Colour BLUE = new Colour(1, "BLUE");
-	public static final Colour GREEN = new Colour(2, "GREEN");
-	public static final Colour PURPLE = new Colour(3, "PURPLE");
-
-	private Colour(int code, String label) {
-		super(code, label);
-	}
-
-}
diff --git a/spring-beans/src/test/java/test/beans/CustomEnum.java b/spring-beans/src/test/java/test/beans/CustomEnum.java
deleted file mode 100644
index d7404bc6786..00000000000
--- a/spring-beans/src/test/java/test/beans/CustomEnum.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2002-2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-/**
- * @author Juergen Hoeller
- */
-public enum CustomEnum {
-
-	VALUE_1, VALUE_2;
-
-	public String toString() {
-		return "CustomEnum: " + name();
-	}
-
-}
\ No newline at end of file
diff --git a/spring-beans/src/test/java/test/beans/INestedTestBean.java b/spring-beans/src/test/java/test/beans/INestedTestBean.java
deleted file mode 100644
index 56c9d829ee3..00000000000
--- a/spring-beans/src/test/java/test/beans/INestedTestBean.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-public interface INestedTestBean {
-
-	public String getCompany();
-
-}
\ No newline at end of file
diff --git a/spring-beans/src/test/java/test/beans/ITestBean.java b/spring-beans/src/test/java/test/beans/ITestBean.java
deleted file mode 100644
index 9397b175503..00000000000
--- a/spring-beans/src/test/java/test/beans/ITestBean.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2002-2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-import java.io.IOException;
-
-/**
- * Interface used for {@link test.beans.TestBean}.
- *
- * 
Two methods are the same as on Person, but if this
- * extends person it breaks quite a few tests..
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public interface ITestBean {
-
-	int getAge();
-
-	void setAge(int age);
-
-	String getName();
-
-	void setName(String name);
-
-	ITestBean getSpouse();
-
-	void setSpouse(ITestBean spouse);
-
-	ITestBean[] getSpouses();
-
-	String[] getStringArray();
-
-	void setStringArray(String[] stringArray);
-
-	/**
-	 * Throws a given (non-null) exception.
-	 */
-	void exceptional(Throwable t) throws Throwable;
-
-	Object returnsThis();
-
-	INestedTestBean getDoctor();
-
-	INestedTestBean getLawyer();
-
-	IndexedTestBean getNestedIndexedBean();
-
-	/**
-	 * Increment the age by one.
-	 * @return the previous age
-	 */
-	int haveBirthday();
-
-	void unreliableFileOperation() throws IOException;
-
-}
\ No newline at end of file
diff --git a/spring-beans/src/test/java/test/beans/TestBean.java b/spring-beans/src/test/java/test/beans/TestBean.java
deleted file mode 100644
index 5b94f078b5d..00000000000
--- a/spring-beans/src/test/java/test/beans/TestBean.java
+++ /dev/null
@@ -1,457 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.util.ObjectUtils;
-
-/**
- * Simple test bean used for testing bean factories, the AOP framework etc.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @since 15 April 2001
- */
-public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOther, Comparable {
-
-	private String beanName;
-
-	private String country;
-
-	private BeanFactory beanFactory;
-
-	private boolean postProcessed;
-
-	private String name;
-
-	private String sex;
-
-	private int age;
-
-	private boolean jedi;
-
-	private ITestBean[] spouses;
-
-	private String touchy;
-
-	private String[] stringArray;
-
-	private Integer[] someIntegerArray;
-
-	private Date date = new Date();
-
-	private Float myFloat = new Float(0.0);
-
-	private Collection friends = new LinkedList();
-
-	private Set someSet = new HashSet();
-
-	private Map someMap = new HashMap();
-
-	private List someList = new ArrayList();
-
-	private Properties someProperties = new Properties();
-
-	private INestedTestBean doctor = new NestedTestBean();
-
-	private INestedTestBean lawyer = new NestedTestBean();
-
-	private IndexedTestBean nestedIndexedBean;
-
-	private boolean destroyed;
-
-	private Number someNumber;
-
-	private Colour favouriteColour;
-
-	private Boolean someBoolean;
-
-	private List otherColours;
-
-	private List pets;
-
-
-	public TestBean() {
-	}
-
-	public TestBean(String name) {
-		this.name = name;
-	}
-
-	public TestBean(ITestBean spouse) {
-		this.spouses = new ITestBean[] {spouse};
-	}
-
-	public TestBean(String name, int age) {
-		this.name = name;
-		this.age = age;
-	}
-
-	public TestBean(ITestBean spouse, Properties someProperties) {
-		this.spouses = new ITestBean[] {spouse};
-		this.someProperties = someProperties;
-	}
-
-	public TestBean(List someList) {
-		this.someList = someList;
-	}
-
-	public TestBean(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public TestBean(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public TestBean(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-
-	@Override
-	public void setBeanName(String beanName) {
-		this.beanName = beanName;
-	}
-
-	public String getBeanName() {
-		return beanName;
-	}
-
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) {
-		this.beanFactory = beanFactory;
-	}
-
-	public BeanFactory getBeanFactory() {
-		return beanFactory;
-	}
-
-	public void setPostProcessed(boolean postProcessed) {
-		this.postProcessed = postProcessed;
-	}
-
-	public boolean isPostProcessed() {
-		return postProcessed;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getSex() {
-		return sex;
-	}
-
-	public void setSex(String sex) {
-		this.sex = sex;
-		if (this.name == null) {
-			this.name = sex;
-		}
-	}
-
-	@Override
-	public int getAge() {
-		return age;
-	}
-
-	@Override
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-	public boolean isJedi() {
-		return jedi;
-	}
-
-	public void setJedi(boolean jedi) {
-		this.jedi = jedi;
-	}
-
-	@Override
-	public void setSpouse(ITestBean spouse) {
-		this.spouses = new ITestBean[] {spouse};
-	}
-
-	@Override
-	public ITestBean getSpouse() {
-		return (spouses != null ? spouses[0] : null);
-	}
-
-	@Override
-	public ITestBean[] getSpouses() {
-		return spouses;
-	}
-
-	public String getTouchy() {
-		return touchy;
-	}
-
-	public void setTouchy(String touchy) throws Exception {
-		if (touchy.indexOf('.') != -1) {
-			throw new Exception("Can't contain a .");
-		}
-		if (touchy.indexOf(',') != -1) {
-			throw new NumberFormatException("Number format exception: contains a ,");
-		}
-		this.touchy = touchy;
-	}
-
-	public String getCountry() {
-		return country;
-	}
-
-	public void setCountry(String country) {
-		this.country = country;
-	}
-
-	@Override
-	public String[] getStringArray() {
-		return stringArray;
-	}
-
-	@Override
-	public void setStringArray(String[] stringArray) {
-		this.stringArray = stringArray;
-	}
-
-	public Integer[] getSomeIntegerArray() {
-		return someIntegerArray;
-	}
-
-	public void setSomeIntegerArray(Integer[] someIntegerArray) {
-		this.someIntegerArray = someIntegerArray;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public Float getMyFloat() {
-		return myFloat;
-	}
-
-	public void setMyFloat(Float myFloat) {
-		this.myFloat = myFloat;
-	}
-
-	public Collection getFriends() {
-		return friends;
-	}
-
-	public void setFriends(Collection friends) {
-		this.friends = friends;
-	}
-
-	public Set getSomeSet() {
-		return someSet;
-	}
-
-	public void setSomeSet(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public Map getSomeMap() {
-		return someMap;
-	}
-
-	public void setSomeMap(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public List getSomeList() {
-		return someList;
-	}
-
-	public void setSomeList(List someList) {
-		this.someList = someList;
-	}
-
-	public Properties getSomeProperties() {
-		return someProperties;
-	}
-
-	public void setSomeProperties(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-	@Override
-	public INestedTestBean getDoctor() {
-		return doctor;
-	}
-
-	public void setDoctor(INestedTestBean doctor) {
-		this.doctor = doctor;
-	}
-
-	@Override
-	public INestedTestBean getLawyer() {
-		return lawyer;
-	}
-
-	public void setLawyer(INestedTestBean lawyer) {
-		this.lawyer = lawyer;
-	}
-
-	public Number getSomeNumber() {
-		return someNumber;
-	}
-
-	public void setSomeNumber(Number someNumber) {
-		this.someNumber = someNumber;
-	}
-
-	public Colour getFavouriteColour() {
-		return favouriteColour;
-	}
-
-	public void setFavouriteColour(Colour favouriteColour) {
-		this.favouriteColour = favouriteColour;
-	}
-
-	public Boolean getSomeBoolean() {
-		return someBoolean;
-	}
-
-	public void setSomeBoolean(Boolean someBoolean) {
-		this.someBoolean = someBoolean;
-	}
-
-	@Override
-	public IndexedTestBean getNestedIndexedBean() {
-		return nestedIndexedBean;
-	}
-
-	public void setNestedIndexedBean(IndexedTestBean nestedIndexedBean) {
-		this.nestedIndexedBean = nestedIndexedBean;
-	}
-
-	public List getOtherColours() {
-		return otherColours;
-	}
-
-	public void setOtherColours(List otherColours) {
-		this.otherColours = otherColours;
-	}
-
-	public List getPets() {
-		return pets;
-	}
-
-	public void setPets(List pets) {
-		this.pets = pets;
-	}
-
-
-	/**
-	 * @see ITestBean#exceptional(Throwable)
-	 */
-	@Override
-	public void exceptional(Throwable t) throws Throwable {
-		if (t != null) {
-			throw t;
-		}
-	}
-
-	@Override
-	public void unreliableFileOperation() throws IOException {
-		throw new IOException();
-	}
-	/**
-	 * @see ITestBean#returnsThis()
-	 */
-	@Override
-	public Object returnsThis() {
-		return this;
-	}
-
-	/**
-	 * @see IOther#absquatulate()
-	 */
-	@Override
-	public void absquatulate() {
-	}
-
-	@Override
-	public int haveBirthday() {
-		return age++;
-	}
-
-
-	public void destroy() {
-		this.destroyed = true;
-	}
-
-	public boolean wasDestroyed() {
-		return destroyed;
-	}
-
-
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (other == null || !(other instanceof TestBean)) {
-			return false;
-		}
-		TestBean tb2 = (TestBean) other;
-		return (ObjectUtils.nullSafeEquals(this.name, tb2.name) && this.age == tb2.age);
-	}
-
-	public int hashCode() {
-		return this.age;
-	}
-
-	@Override
-	public int compareTo(Object other) {
-		if (this.name != null && other instanceof TestBean) {
-			return this.name.compareTo(((TestBean) other).getName());
-		}
-		else {
-			return 1;
-		}
-	}
-
-	public String toString() {
-		return this.name;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-beans/src/test/java/test/util/TestResourceUtils.java b/spring-beans/src/test/java/test/util/TestResourceUtils.java
deleted file mode 100644
index 4843151231b..00000000000
--- a/spring-beans/src/test/java/test/util/TestResourceUtils.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.util;
-
-import static java.lang.String.format;
-
-import org.springframework.core.io.ClassPathResource;
-
-/**
- * Convenience utilities for common operations with test resources.
- *
- * @author Chris Beams
- */
-public class TestResourceUtils {
-
-		/**
-		 * Loads a {@link ClassPathResource} qualified by the simple name of clazz,
-		 * and relative to the package for clazz.
-		 *
-		 * 
Example: given a clazz 'com.foo.BarTests' and a resourceSuffix of 'context.xml',
-		 * this method will return a ClassPathResource representing com/foo/BarTests-context.xml
-		 *
-		 * 
Intended for use loading context configuration XML files within JUnit tests.
-		 *
-		 * @param clazz
-		 * @param resourceSuffix
-		 */
-		public static ClassPathResource qualifiedResource(Class clazz, String resourceSuffix) {
-				return new ClassPathResource(format("%s-%s", clazz.getSimpleName(), resourceSuffix), clazz);
-		}
-
-}
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/support/multiConstructorArgs.properties b/spring-beans/src/test/resources/org/springframework/beans/factory/support/multiConstructorArgs.properties
index 5beaf6d5982..8d5f74fc31a 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/support/multiConstructorArgs.properties
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/support/multiConstructorArgs.properties
@@ -1,3 +1,3 @@
-testBean.(class)=test.beans.TestBean
+testBean.(class)=org.springframework.tests.sample.beans.TestBean
 testBean.$0=Rob Harrop
-testBean.$1=23
\ No newline at end of file
+testBean.$1=23
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/support/refConstructorArg.properties b/spring-beans/src/test/resources/org/springframework/beans/factory/support/refConstructorArg.properties
index c33326c8574..4d3723c7de8 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/support/refConstructorArg.properties
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/support/refConstructorArg.properties
@@ -1,5 +1,5 @@
-sally.(class)=test.beans.TestBean
+sally.(class)=org.springframework.tests.sample.beans.TestBean
 sally.name=Sally
 
-rob.(class)=test.beans.TestBean
-rob.$0(ref)=sally
\ No newline at end of file
+rob.(class)=org.springframework.tests.sample.beans.TestBean
+rob.$0(ref)=sally
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/support/simpleConstructorArg.properties b/spring-beans/src/test/resources/org/springframework/beans/factory/support/simpleConstructorArg.properties
index be6700e1423..d0f1eea3266 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/support/simpleConstructorArg.properties
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/support/simpleConstructorArg.properties
@@ -1,2 +1,2 @@
-testBean.(class)=test.beans.TestBean
-testBean.$0=Rob Harrop
\ No newline at end of file
+testBean.(class)=org.springframework.tests.sample.beans.TestBean
+testBean.$0=Rob Harrop
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-merge-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-merge-context.xml
index 12dbc607928..2edadb511eb 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-merge-context.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-merge-context.xml
@@ -5,7 +5,7 @@
 		http://www.springframework.org/schema/beans/spring-beans-3.1.xsd"
 		default-merge="false">
 
-	
+	
 		
 			
 				alpha
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml
index 6363230a06c..2fcb1179545 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml
@@ -3,9 +3,9 @@
 
 
 
-	
+	
 
-	
+	
 
 	
 	  
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml
index 3f32de8aee3..a2e966aab98 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml
@@ -3,9 +3,9 @@
 
 
 
-	
+	
 
-	
+	
 
 	
 	  
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml
index e32686f27f7..9b93a16810d 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml
@@ -4,9 +4,9 @@
 		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
 		default-autowire-candidates="">
 
-	
+	
 
-	
+	
 
 	
 	  
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml
index 2883bd2383a..089517cd427 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml
@@ -4,9 +4,9 @@
 		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
 		default-autowire-candidates="props*,*ly">
 
-	
+	
 
-	
+	
 
 	
 	  
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml
index 22168ca8c8c..7e262a0a0d4 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml
@@ -10,22 +10,22 @@
 
 	
 
-	
+	
 		
 		
 			
 		
 		
-			
+			
 				
 			
 		
 	
 
-	
+	
 		
 		
-			
+			
 				
 			
 		
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml
index a614172a897..d8fc1db88ea 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml
@@ -3,7 +3,7 @@
 
 
 
-	
+	
 		
 			
 				Rob Harrop
@@ -23,12 +23,12 @@
 	
 		
 			
-				
+				
 			
 		
 	
 
-	
+	
 		
 			
 				Rob Harrop
@@ -47,14 +47,14 @@
 	
 		
 			
-				
+				
 					
 				
 			
 		
 	
 
-	
+	
 		
 			
 				
@@ -76,7 +76,7 @@
 		
 			
 				
-					
+					
 						
 					
 				
@@ -84,7 +84,7 @@
 		
 	
 
-	
+	
 		
 			
 				Sall
@@ -103,7 +103,7 @@
 	
 
 
-	
+	
 		
 			
 				Rob Harrop
@@ -123,12 +123,12 @@
 	
 		
 			
-				
+				
 			
 		
 	
 
-	
+	
 		
 			
 				Rob Harrop
@@ -147,14 +147,14 @@
 	
 		
 			
-				
+				
 					
 				
 			
 		
 	
 
-	
+	
 		
 			
 				
@@ -176,7 +176,7 @@
 		
 			
 				
-					
+					
 						
 					
 				
@@ -184,7 +184,7 @@
 		
 	
 
-	
+	
 		
 			
 				Sall
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml
index 44bd0b92dc9..974ae6c3d9c 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml
@@ -3,7 +3,7 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
-		
+	
 		Jenny
 		30
 		
@@ -11,8 +11,8 @@
 			
 		
 	
-	
-		
+
+	
 		
 			Simple bean, without any collections.
 		
@@ -22,8 +22,8 @@
 		
 		27
 	
-	
-		
+
+	
 		Rod
 		32
 		
@@ -34,8 +34,8 @@
 			
 		
 	
-	
-	
+
+	
 		Jenny
 		30
 		
@@ -44,13 +44,13 @@
 		
 	
 
-	
+	
 		David
 		27
 		
 	
 
-	
+	
 		Rod
 		32
 		
@@ -64,7 +64,7 @@
 	
-		
+	
 		loner
 		26
 		
@@ -74,7 +74,7 @@
 			
 		
 	
-	
+
 	
 		
 			
@@ -89,7 +89,7 @@
 			
 		
 	
-	
+
 	
 		
 			
@@ -102,26 +102,26 @@
 		
 	
 
-	
+	
 		verbose
 	
-	
-		
+
+	
 		
 	
 
-		
+	
 		
 	
 
-	
+	
 		
 			
 			
 		
 	
-	
-		
+
+	
 		
 			
 				
@@ -131,7 +131,7 @@
 		
 	
 
-	
+	
 		
 			
 				
@@ -158,7 +158,7 @@
 	
 
 	
-	
+	
 		
 			
 				
@@ -177,7 +177,7 @@
 		
 	
 
-	
+	
 		
 			
 				
@@ -186,7 +186,7 @@
 		
 	
 
-	
+	
 		
 			
 				
@@ -217,15 +217,15 @@
 			
 		
 	
-	
-	
+
+	
 		
 			
 			
 		
 	
 
-	
+	
 		
 			
 				bar
@@ -235,7 +235,7 @@
 		
 	
 
-	
+	
 		
 			
 				bar
@@ -245,7 +245,7 @@
 		
 	
 
-	
+	
 		
 			
 				
@@ -254,15 +254,15 @@
 		
 	
 
-	
+	
 		
 			
 			
 		
 	
-	
-	
-		
+
+
+	
 		
 			
 				bar
@@ -270,8 +270,8 @@
 			
 		
 	
-	
-	
+
+	
 		
 			
 				
@@ -280,7 +280,7 @@
 		
 	
 
-	
+	
 		
 			
 				one
@@ -288,8 +288,8 @@
 			
 		
 	
-	
-		
+
+	
 		
 			
 				java.lang.String
@@ -297,8 +297,8 @@
 			
 		
 	
-	
-	
+
+	
 		
 			
 				0
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml
index 7cd04cc145a..8a31ff86962 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml
@@ -3,7 +3,7 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-	
+	
 		
 			
 				1
@@ -28,7 +28,7 @@
 		
 	
 
-	
+	
 		
 			
 				
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml
index f97701759b6..4ff20b3d591 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml
@@ -102,7 +102,7 @@
 	
 
-	
+	
 		Juergen
 	
 
@@ -127,7 +127,7 @@
 	
 	
 
-	
+	
 		
 			
 				
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml
index 33cbb8dd8d6..7802a4c935b 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml
@@ -3,16 +3,16 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	
+	
 
-	
+	
 		
-			
+			
 		
 		
 			
-				
-				
+				
+				
 			
 		
 	
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml
index f245c964dd0..d9616443011 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml
@@ -5,43 +5,43 @@
 		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
  	
-	
+	
 
 
-	
+	
 
 	
 		
 	
 	
 	
-	
+	
 
 
-	
+	
 	
-	
+	
 	
-	
+	
  
-	
+	
 
 
\ No newline at end of file
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTestsWithErrors.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTestsWithErrors.xml
index 7c10f7a32f6..1773a1c9c61 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTestsWithErrors.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTestsWithErrors.xml
@@ -4,7 +4,7 @@
 		xmlns:p="http://www.springframework.org/schema/c"
 		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	
+	
 		
 	
 
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTests.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTests.xml
index e44a8c961c5..8dd70708d3d 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTests.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTests.xml
@@ -8,20 +8,20 @@
 				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
 				http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
 
-	
+	
 		
 	
 
-	
+	
 
-	
+	
 		
-			
+			
 				
 			
 		
 	
 
-	
+	
 
 
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTestsWithErrors.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTestsWithErrors.xml
index d82595bac7a..384171fdc03 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTestsWithErrors.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerTestsWithErrors.xml
@@ -8,10 +8,10 @@
 				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
 				http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
 
-	
+	
 		
 	
 
-	
+	
 
 
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/test.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/test.xml
index 9d1d1f7adb8..933e66b7d00 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/test.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/test.xml
@@ -3,7 +3,7 @@
 
 
 
-	
+	
 		
 			I have no properties and I'm happy without them.
 		
@@ -12,7 +12,7 @@
 	
-	
+	
 		aliased
 	
 
@@ -20,17 +20,17 @@
 
 	
 
-	
+	
 		aliased
 	
 
 	
 
-	
+	
 		aliased
 	
 
-	
+	
 		
 	
 
@@ -40,7 +40,7 @@
 
 	
 
-	
+	
 		Rod
 		31
 		
@@ -52,29 +52,29 @@
 		
 	
 
-	
+	
 		Kerry
 		34
 		
 		
 	
 
-	
+	
 		Kathy
 		28
 		
 	
 
-	
+	
 		typeMismatch
 		34x
 		
 	
 
 	
-	
+	
 
-	
 		true
 	
@@ -85,10 +85,10 @@
 	
 
 	
-	
+	
 	
 
-	
+	
 		false
 	
 
@@ -113,14 +113,14 @@
 		
 	
 
-	
+	
 		listenerVeto
 		66
 	
 
-	
+	
 
-	
+	
 	  this is a ]]>
 	
 
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml
index 8426c5d95ee..25f20439fa2 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml
@@ -17,7 +17,7 @@
 			name
   "/>
 
-	
+	
 		
 			
 		
@@ -26,13 +26,13 @@
 		
 	
 
-	
+	
 		
 			
 		
 	
 
-	
+	
 		
 	
 
@@ -67,7 +67,7 @@
 		Rob Harrop
 	
 
-	
+	
 		
 			
 				foo
@@ -89,13 +89,13 @@
 		
 	
 
-	
+	
 		
 		
 		
 	
 
-	
+	
 		
 			
 				
@@ -111,13 +111,13 @@
 			
 				
 					min
-					
+					
 				
 			
 	  
 	
 
-	
+	
 		
 			
 				
@@ -147,7 +147,7 @@
 		
 	
 
-	
+	
 		
 		
 		
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithDtd.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithDtd.xml
index fab962d4dde..3cca869dbff 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithDtd.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithDtd.xml
@@ -9,5 +9,5 @@ This is a top level block comment
   
 
 
-	
+	
 
\ No newline at end of file
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithXsd.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithXsd.xml
index 324fb483ff4..20aa0f53740 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithXsd.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithXsd.xml
@@ -7,5 +7,5 @@ This is a top level block comment
 				the parser now --> 
 
-	
+	
 
\ No newline at end of file
diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml
index 7cb0723a4c2..05c47afa53a 100644
--- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml
+++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml
@@ -4,15 +4,15 @@
 		xmlns:spring="http://www.springframework.org/schema/beans"
 		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	
+	
 		
 	
 
-	
+	
 		
 	
 
-	
+	
 	  
 			
 		
diff --git a/spring-context-support/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-context-support/src/test/java/org/springframework/beans/INestedTestBean.java
deleted file mode 100644
index e0ae5f20a3f..00000000000
--- a/spring-context-support/src/test/java/org/springframework/beans/INestedTestBean.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-public interface INestedTestBean {
-
-	public String getCompany();
-
-}
\ No newline at end of file
diff --git a/spring-context-support/src/test/java/org/springframework/beans/IOther.java b/spring-context-support/src/test/java/org/springframework/beans/IOther.java
deleted file mode 100644
index d7fb346185a..00000000000
--- a/spring-context-support/src/test/java/org/springframework/beans/IOther.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-public interface IOther {
-
-	void absquatulate();
-
-}
\ No newline at end of file
diff --git a/spring-context-support/src/test/java/org/springframework/beans/ITestBean.java b/spring-context-support/src/test/java/org/springframework/beans/ITestBean.java
deleted file mode 100644
index cdf5ef510dd..00000000000
--- a/spring-context-support/src/test/java/org/springframework/beans/ITestBean.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2002-2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.IOException;
-
-/**
- * Interface used for {@link org.springframework.beans.TestBean}.
- *
- * 
Two methods are the same as on Person, but if this
- * extends person it breaks quite a few tests..
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public interface ITestBean {
-
-	int getAge();
-
-	void setAge(int age);
-
-	String getName();
-
-	void setName(String name);
-
-	ITestBean getSpouse();
-
-	void setSpouse(ITestBean spouse);
-
-	ITestBean[] getSpouses();
-
-	String[] getStringArray();
-
-	void setStringArray(String[] stringArray);
-
-	/**
-	 * Throws a given (non-null) exception.
-	 */
-	void exceptional(Throwable t) throws Throwable;
-
-	Object returnsThis();
-
-	INestedTestBean getDoctor();
-
-	INestedTestBean getLawyer();
-
-	IndexedTestBean getNestedIndexedBean();
-
-	/**
-	 * Increment the age by one.
-	 * @return the previous age
-	 */
-	int haveBirthday();
-
-	void unreliableFileOperation() throws IOException;
-
-}
\ No newline at end of file
diff --git a/spring-context-support/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-context-support/src/test/java/org/springframework/beans/IndexedTestBean.java
deleted file mode 100644
index ddb091770ee..00000000000
--- a/spring-context-support/src/test/java/org/springframework/beans/IndexedTestBean.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2002-2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-/**
- * @author Juergen Hoeller
- * @since 11.11.2003
- */
-public class IndexedTestBean {
-
-	private TestBean[] array;
-
-	private Collection collection;
-
-	private List list;
-
-	private Set set;
-
-	private SortedSet sortedSet;
-
-	private Map map;
-
-	private SortedMap sortedMap;
-
-
-	public IndexedTestBean() {
-		this(true);
-	}
-
-	public IndexedTestBean(boolean populate) {
-		if (populate) {
-			populate();
-		}
-	}
-
-	public void populate() {
-		TestBean tb0 = new TestBean("name0", 0);
-		TestBean tb1 = new TestBean("name1", 0);
-		TestBean tb2 = new TestBean("name2", 0);
-		TestBean tb3 = new TestBean("name3", 0);
-		TestBean tb4 = new TestBean("name4", 0);
-		TestBean tb5 = new TestBean("name5", 0);
-		TestBean tb6 = new TestBean("name6", 0);
-		TestBean tb7 = new TestBean("name7", 0);
-		TestBean tbX = new TestBean("nameX", 0);
-		TestBean tbY = new TestBean("nameY", 0);
-		this.array = new TestBean[] {tb0, tb1};
-		this.list = new ArrayList();
-		this.list.add(tb2);
-		this.list.add(tb3);
-		this.set = new TreeSet();
-		this.set.add(tb6);
-		this.set.add(tb7);
-		this.map = new HashMap();
-		this.map.put("key1", tb4);
-		this.map.put("key2", tb5);
-		this.map.put("key.3", tb5);
-		List list = new ArrayList();
-		list.add(tbX);
-		list.add(tbY);
-		this.map.put("key4", list);
-	}
-
-
-	public TestBean[] getArray() {
-		return array;
-	}
-
-	public void setArray(TestBean[] array) {
-		this.array = array;
-	}
-
-	public Collection getCollection() {
-		return collection;
-	}
-
-	public void setCollection(Collection collection) {
-		this.collection = collection;
-	}
-
-	public List getList() {
-		return list;
-	}
-
-	public void setList(List list) {
-		this.list = list;
-	}
-
-	public Set getSet() {
-		return set;
-	}
-
-	public void setSet(Set set) {
-		this.set = set;
-	}
-
-	public SortedSet getSortedSet() {
-		return sortedSet;
-	}
-
-	public void setSortedSet(SortedSet sortedSet) {
-		this.sortedSet = sortedSet;
-	}
-
-	public Map getMap() {
-		return map;
-	}
-
-	public void setMap(Map map) {
-		this.map = map;
-	}
-
-	public SortedMap getSortedMap() {
-		return sortedMap;
-	}
-
-	public void setSortedMap(SortedMap sortedMap) {
-		this.sortedMap = sortedMap;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java
deleted file mode 100644
index 412891c439b..00000000000
--- a/spring-context-support/src/test/java/org/springframework/beans/NestedTestBean.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-/**
- * Simple nested test bean used for testing bean factories, AOP framework etc.
- *
- * @author Trevor D. Cook
- * @since 30.09.2003
- */
-public class NestedTestBean implements INestedTestBean {
-
-	private String company = "";
-
-	public NestedTestBean() {
-	}
-
-	public NestedTestBean(String company) {
-		setCompany(company);
-	}
-
-	public void setCompany(String company) {
-		this.company = (company != null ? company : "");
-	}
-
-	@Override
-	public String getCompany() {
-		return company;
-	}
-
-	public boolean equals(Object obj) {
-		if (!(obj instanceof NestedTestBean)) {
-			return false;
-		}
-		NestedTestBean ntb = (NestedTestBean) obj;
-		return this.company.equals(ntb.company);
-	}
-
-	public int hashCode() {
-		return this.company.hashCode();
-	}
-
-	public String toString() {
-		return "NestedTestBean: " + this.company;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-context-support/src/test/java/org/springframework/beans/TestBean.java b/spring-context-support/src/test/java/org/springframework/beans/TestBean.java
deleted file mode 100644
index 6d71de75764..00000000000
--- a/spring-context-support/src/test/java/org/springframework/beans/TestBean.java
+++ /dev/null
@@ -1,457 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.util.ObjectUtils;
-
-/**
- * Simple test bean used for testing bean factories, the AOP framework etc.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @since 15 April 2001
- */
-public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOther, Comparable {
-
-	private String beanName;
-
-	private String country;
-
-	private BeanFactory beanFactory;
-
-	private boolean postProcessed;
-
-	private String name;
-
-	private String sex;
-
-	private int age;
-
-	private boolean jedi;
-
-	private ITestBean[] spouses;
-
-	private String touchy;
-
-	private String[] stringArray;
-
-	private Integer[] someIntegerArray;
-
-	private Date date = new Date();
-
-	private Float myFloat = new Float(0.0);
-
-	private Collection friends = new LinkedList();
-
-	private Set someSet = new HashSet();
-
-	private Map someMap = new HashMap();
-
-	private List someList = new ArrayList();
-
-	private Properties someProperties = new Properties();
-
-	private INestedTestBean doctor = new NestedTestBean();
-
-	private INestedTestBean lawyer = new NestedTestBean();
-
-	private IndexedTestBean nestedIndexedBean;
-
-	private boolean destroyed;
-
-	private Number someNumber;
-
-	private Colour favouriteColour;
-
-	private Boolean someBoolean;
-
-	private List otherColours;
-
-	private List pets;
-
-
-	public TestBean() {
-	}
-
-	public TestBean(String name) {
-		this.name = name;
-	}
-
-	public TestBean(ITestBean spouse) {
-		this.spouses = new ITestBean[] {spouse};
-	}
-
-	public TestBean(String name, int age) {
-		this.name = name;
-		this.age = age;
-	}
-
-	public TestBean(ITestBean spouse, Properties someProperties) {
-		this.spouses = new ITestBean[] {spouse};
-		this.someProperties = someProperties;
-	}
-
-	public TestBean(List someList) {
-		this.someList = someList;
-	}
-
-	public TestBean(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public TestBean(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public TestBean(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-
-	@Override
-	public void setBeanName(String beanName) {
-		this.beanName = beanName;
-	}
-
-	public String getBeanName() {
-		return beanName;
-	}
-
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) {
-		this.beanFactory = beanFactory;
-	}
-
-	public BeanFactory getBeanFactory() {
-		return beanFactory;
-	}
-
-	public void setPostProcessed(boolean postProcessed) {
-		this.postProcessed = postProcessed;
-	}
-
-	public boolean isPostProcessed() {
-		return postProcessed;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getSex() {
-		return sex;
-	}
-
-	public void setSex(String sex) {
-		this.sex = sex;
-		if (this.name == null) {
-			this.name = sex;
-		}
-	}
-
-	@Override
-	public int getAge() {
-		return age;
-	}
-
-	@Override
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-	public boolean isJedi() {
-		return jedi;
-	}
-
-	public void setJedi(boolean jedi) {
-		this.jedi = jedi;
-	}
-
-	@Override
-	public ITestBean getSpouse() {
-		return (spouses != null ? spouses[0] : null);
-	}
-
-	@Override
-	public void setSpouse(ITestBean spouse) {
-		this.spouses = new ITestBean[] {spouse};
-	}
-
-	@Override
-	public ITestBean[] getSpouses() {
-		return spouses;
-	}
-
-	public String getTouchy() {
-		return touchy;
-	}
-
-	public void setTouchy(String touchy) throws Exception {
-		if (touchy.indexOf('.') != -1) {
-			throw new Exception("Can't contain a .");
-		}
-		if (touchy.indexOf(',') != -1) {
-			throw new NumberFormatException("Number format exception: contains a ,");
-		}
-		this.touchy = touchy;
-	}
-
-	public String getCountry() {
-		return country;
-	}
-
-	public void setCountry(String country) {
-		this.country = country;
-	}
-
-	@Override
-	public String[] getStringArray() {
-		return stringArray;
-	}
-
-	@Override
-	public void setStringArray(String[] stringArray) {
-		this.stringArray = stringArray;
-	}
-
-	public Integer[] getSomeIntegerArray() {
-		return someIntegerArray;
-	}
-
-	public void setSomeIntegerArray(Integer[] someIntegerArray) {
-		this.someIntegerArray = someIntegerArray;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public Float getMyFloat() {
-		return myFloat;
-	}
-
-	public void setMyFloat(Float myFloat) {
-		this.myFloat = myFloat;
-	}
-
-	public Collection getFriends() {
-		return friends;
-	}
-
-	public void setFriends(Collection friends) {
-		this.friends = friends;
-	}
-
-	public Set getSomeSet() {
-		return someSet;
-	}
-
-	public void setSomeSet(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public Map getSomeMap() {
-		return someMap;
-	}
-
-	public void setSomeMap(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public List getSomeList() {
-		return someList;
-	}
-
-	public void setSomeList(List someList) {
-		this.someList = someList;
-	}
-
-	public Properties getSomeProperties() {
-		return someProperties;
-	}
-
-	public void setSomeProperties(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-	@Override
-	public INestedTestBean getDoctor() {
-		return doctor;
-	}
-
-	public void setDoctor(INestedTestBean doctor) {
-		this.doctor = doctor;
-	}
-
-	@Override
-	public INestedTestBean getLawyer() {
-		return lawyer;
-	}
-
-	public void setLawyer(INestedTestBean lawyer) {
-		this.lawyer = lawyer;
-	}
-
-	public Number getSomeNumber() {
-		return someNumber;
-	}
-
-	public void setSomeNumber(Number someNumber) {
-		this.someNumber = someNumber;
-	}
-
-	public Colour getFavouriteColour() {
-		return favouriteColour;
-	}
-
-	public void setFavouriteColour(Colour favouriteColour) {
-		this.favouriteColour = favouriteColour;
-	}
-
-	public Boolean getSomeBoolean() {
-		return someBoolean;
-	}
-
-	public void setSomeBoolean(Boolean someBoolean) {
-		this.someBoolean = someBoolean;
-	}
-
-	@Override
-	public IndexedTestBean getNestedIndexedBean() {
-		return nestedIndexedBean;
-	}
-
-	public void setNestedIndexedBean(IndexedTestBean nestedIndexedBean) {
-		this.nestedIndexedBean = nestedIndexedBean;
-	}
-
-	public List getOtherColours() {
-		return otherColours;
-	}
-
-	public void setOtherColours(List otherColours) {
-		this.otherColours = otherColours;
-	}
-
-	public List getPets() {
-		return pets;
-	}
-
-	public void setPets(List pets) {
-		this.pets = pets;
-	}
-
-
-	/**
-	 * @see org.springframework.beans.ITestBean#exceptional(Throwable)
-	 */
-	@Override
-	public void exceptional(Throwable t) throws Throwable {
-		if (t != null) {
-			throw t;
-		}
-	}
-
-	@Override
-	public void unreliableFileOperation() throws IOException {
-		throw new IOException();
-	}
-	/**
-	 * @see org.springframework.beans.ITestBean#returnsThis()
-	 */
-	@Override
-	public Object returnsThis() {
-		return this;
-	}
-
-	/**
-	 * @see org.springframework.beans.IOther#absquatulate()
-	 */
-	@Override
-	public void absquatulate() {
-	}
-
-	@Override
-	public int haveBirthday() {
-		return age++;
-	}
-
-
-	public void destroy() {
-		this.destroyed = true;
-	}
-
-	public boolean wasDestroyed() {
-		return destroyed;
-	}
-
-
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (other == null || !(other instanceof TestBean)) {
-			return false;
-		}
-		TestBean tb2 = (TestBean) other;
-		return (ObjectUtils.nullSafeEquals(this.name, tb2.name) && this.age == tb2.age);
-	}
-
-	public int hashCode() {
-		return this.age;
-	}
-
-	@Override
-	public int compareTo(Object other) {
-		if (this.name != null && other instanceof TestBean) {
-			return this.name.compareTo(((TestBean) other).getName());
-		}
-		else {
-			return 1;
-		}
-	}
-
-	public String toString() {
-		return this.name;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/TestMethodInvokingTask.java b/spring-context-support/src/test/java/org/springframework/scheduling/TestMethodInvokingTask.java
deleted file mode 100644
index a95a2408b54..00000000000
--- a/spring-context-support/src/test/java/org/springframework/scheduling/TestMethodInvokingTask.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2002-2005 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.scheduling;
-
-/**
- * @author Juergen Hoeller
- * @since 09.10.2004
- */
-public class TestMethodInvokingTask {
-
-	public int counter = 0;
-
-	private Object lock = new Object();
-
-	public void doSomething() {
-		this.counter++;
-	}
-
-	public void doWait() {
-		this.counter++;
-		// wait until stop is called
-		synchronized (this.lock) {
-			try {
-				this.lock.wait();
-			}
-			catch (InterruptedException e) {
-				// fall through
-			}
-		}
-	}
-
-	public void stop() {
-		synchronized(this.lock) {
-			this.lock.notify();
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
index dfe6d48aa70..5c0cc1c0e3c 100644
--- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
+++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
@@ -51,7 +51,8 @@ import org.quartz.Trigger;
 import org.quartz.TriggerListener;
 import org.quartz.impl.SchedulerRepository;
 import org.quartz.spi.JobFactory;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.context.TestMethodInvokingTask;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -63,7 +64,6 @@ import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.core.io.FileSystemResourceLoader;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.scheduling.TestMethodInvokingTask;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java
index 0e9f634bd43..364d5415920 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@ import org.junit.Test;
 import org.springframework.aop.aspectj.AdviceBindingTestAspect.AdviceBindingCollaborator;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml
index 9a55cc823e3..66d0e85228a 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml
@@ -19,6 +19,6 @@
 
 	
 
-	
+	
 
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
index a2f1054e9e4..c04a54f8e64 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,8 @@ import org.junit.Test;
 import org.springframework.aop.aspectj.AfterReturningAdviceBindingTestAspect.AfterReturningAdviceBindingCollaborator;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml
index 197afbf0695..97c02b34523 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml
@@ -18,7 +18,7 @@
 			
 			
 			
+					pointcut="execution(org.springframework.tests.sample.beans.ITestBean[] *(..))"/>
 			
 			
@@ -30,6 +30,6 @@
 
 	
 
-	
+	
 
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java
index e57c4df2172..07605079249 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import static org.mockito.Mockito.verify;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.aop.aspectj.AfterThrowingAdviceBindingTestAspect.AfterThrowingAdviceBindingCollaborator;
-import org.springframework.beans.ITestBean;
+import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml
index 9152fe1853e..77dd0c36247 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml
@@ -37,6 +37,6 @@
 	
 	
 	
-	
+	
 	
 
\ No newline at end of file
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java
index 67195904dc8..879e846b2bd 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,8 @@ import org.junit.Test;
 import org.springframework.aop.aspectj.AroundAdviceBindingTestAspect.AroundAdviceBindingCollaborator;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml
index 91ca7c6540c..2198e32f49c 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml
@@ -17,6 +17,6 @@
 
 	
 
-	
+	
 
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml
index 7f947101837..e00fa847a7d 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml
@@ -17,11 +17,11 @@
 
 	
 
-	
+	
 		
 	
 
-	
+	
 		
 	
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java
index 5b606689acd..585d1806950 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.aop.MethodBeforeAdvice;
-import org.springframework.beans.ITestBean;
+import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.core.Ordered;
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml
index 6dae894ae62..038614eccf4 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml
@@ -85,6 +85,6 @@
 
 	
 
-	
+	
 	
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java
index b88de9c97db..2b363cab83b 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.beans.ITestBean;
+import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml
index 8a23b5ad4d5..9ec75d75aab 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml
@@ -5,11 +5,11 @@
 
 	
 
-	
+	
 
 	
 		
+				value="execution(org.springframework.tests.sample.beans.ITestBean[] org.springframework.tests.sample.beans.ITestBean.*(..))"/>
 		
 	
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java
index e43cc579883..4ab6a830646 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@ import org.aspectj.lang.annotation.Before;
 import org.junit.Test;
 import org.springframework.aop.aspectj.annotation.AspectJProxyFactory;
 import org.springframework.aop.framework.Advised;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml
index 987a8b852cf..b446755d57b 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml
@@ -6,10 +6,10 @@
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	
-	
-	
-		
-	
+
+	
+	
+	
 
 	
-
\ No newline at end of file
+
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java
index 53a81f6e5a7..7c225060489 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.aop.MethodBeforeAdvice;
 import org.springframework.aop.framework.Advised;
-import org.springframework.beans.ITestBean;
+import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.xml
index 66ccb584951..42dafc3e90d 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutTests.xml
@@ -21,13 +21,13 @@
 		
 	
 
-	
+	
 
-	
+	
 
-	
+	
 		
-			
+			
 		
 	
 
@@ -53,9 +53,9 @@
      
 	 
 
-	
+	
 
-	
+	
 	
 	
 	
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java
index 4df2dc36337..94e6e43f8ab 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@ import org.junit.Test;
 import org.springframework.aop.aspectj.AdviceBindingTestAspect.AdviceBindingCollaborator;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml
index d12031f34eb..4aac362c73e 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml
@@ -26,7 +26,7 @@
 
 	
 
-	
+	
 
 	
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
index 59a3136fdce..145617f07a4 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
@@ -22,8 +22,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml
index d8b4887fe66..fc449b6943c 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.xml
@@ -8,7 +8,7 @@
 	
 		
 			
@@ -17,11 +17,11 @@
 					pointcut="execution(* set*(*)) and this(mixin)"
 					arg-names="mixin"
 			/>
-				
+		
 	
 
 	
 
-	
+	
 
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java
index 0e7435362af..f9d810c6262 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.junit.Test;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
@@ -39,7 +39,7 @@ public final class ImplicitJPArgumentMatchingAtAspectJTests {
 
 	@Aspect
 	static class CounterAtAspectJAspect {
-		@Around(value="execution(* org.springframework.beans.TestBean.*(..)) and this(bean) and args(argument)",
+		@Around(value="execution(* org.springframework.tests.sample.beans.TestBean.*(..)) and this(bean) and args(argument)",
 				argNames="bean,argument")
 		public void increment(ProceedingJoinPoint pjp, TestBean bean, Object argument) throws Throwable {
 			pjp.proceed();
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml
index 01bd862dd1b..c88962cd533 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml
@@ -5,7 +5,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
-	
+	
 		
 	
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml
index 1c10ec952fe..6a4a56e7f01 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml
@@ -8,12 +8,12 @@
 	
 		
 			
+				expression="execution(* org.springframework.tests.sample.beans.TestBean.*(..)) and this(bean) and args(argument)"/>
 			
 		
 	
 	
-	
+	
 		
 	
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml
index 3268b8ccecc..f8ca001d0de 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml
@@ -15,6 +15,6 @@
 	
 	
 	
-	
+	
 	
 
\ No newline at end of file
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.xml
index 57f3f9dd4d7..94725cb5e31 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/OverloadedAdviceTests.xml
@@ -16,6 +16,6 @@
 	
 	
 	
-	
+	
 	
 
\ No newline at end of file
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml
index 7d846604000..6490decb219 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml
@@ -13,7 +13,7 @@
 		
 	
 	
-	
+	
 
 	
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java
index 361809558b4..9b6a0b61740 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import static org.junit.Assert.*;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.junit.Test;
 import org.springframework.aop.framework.Advised;
-import org.springframework.beans.ITestBean;
+import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java
index f609c08b3e7..7ca3e87e15a 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ package org.springframework.aop.aspectj.autoproxy;
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml
index 3eedc35b006..da15419d113 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml
@@ -23,11 +23,11 @@
 		
 	
 
-	
+	
 		
 	
 
-	
+	
 		
 	
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsPlusAdvisor.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsPlusAdvisor.xml
index 8a399d03618..2b23fab3029 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsPlusAdvisor.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsPlusAdvisor.xml
@@ -9,17 +9,17 @@
 		
 	
 
-	
+	
 		
 		
 	
 
-	
+	
 		
 		
 	
 
-	
+	
 		
 	
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithAbstractBean.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithAbstractBean.xml
index c1c8376b305..88907c1b6c4 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithAbstractBean.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithAbstractBean.xml
@@ -20,7 +20,7 @@
 		
 	
 
-	
+	
 		
 	
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml
index a299f40e300..53c2a50c662 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml
@@ -17,7 +17,7 @@
 
 	
 
-	
+	
 		
 		
 	
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml
index e02baf027b8..efb221722a0 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml
@@ -10,12 +10,12 @@
 		
 	
 		
-	
+	
 		
 		
 	
 	
-	
+	
 		
 		
 	
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-perthis.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-perthis.xml
index 408c5477395..25f545b5425 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-perthis.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-perthis.xml
@@ -7,7 +7,7 @@
 
 	
 
-	
+	
 		
 		
 	
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspect.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspect.xml
index a916c5a1e51..e00377721c4 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspect.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspect.xml
@@ -7,7 +7,7 @@
 
 	
 
-	
+	
 		
 		
 	
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspectPrototype.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspectPrototype.xml
index 047ef0daafe..9505a844d7f 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspectPrototype.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-twoAdviceAspectPrototype.xml
@@ -8,7 +8,7 @@
 	
 
-	
+	
 		
 		
 	
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesInclude.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesInclude.xml
index c6da3d6ea83..16293b388e0 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesInclude.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesInclude.xml
@@ -18,7 +18,7 @@
 		
 	
 
-	
+	
 		
 		
 	
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesJoinPointAspect.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesJoinPointAspect.xml
index 44bc1872f6a..462d8bcdc65 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesJoinPointAspect.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-usesJoinPointAspect.xml
@@ -7,7 +7,7 @@
 
 	
 
-	
+	
 		
 		
 	
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
index e26835163f3..2306641f0e5 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeFalse;
 
 import java.lang.reflect.Method;
 
@@ -41,11 +40,11 @@ import org.springframework.aop.config.AopConfigUtils;
 import org.springframework.aop.framework.ProxyConfig;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.support.StaticMethodMatcherPointcutAdvisor;
-import org.springframework.beans.INestedTestBean;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.NestedTestBean;
+import org.springframework.tests.sample.beans.INestedTestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.NestedTestBean;
 import org.springframework.beans.PropertyValue;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.config.MethodInvokingFactoryBean;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml
index d585ce96211..b35902d133f 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests-context.xml
@@ -6,7 +6,7 @@
 
 	
 
-	
+	
 
 	
 	
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests.java
index 0c6b68d805f..b5c5b065d5f 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AtAspectJAfterThrowingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import static org.junit.Assert.*;
 import org.aspectj.lang.annotation.AfterThrowing;
 import org.aspectj.lang.annotation.Aspect;
 import org.junit.Test;
-import org.springframework.beans.ITestBean;
+import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
@@ -63,7 +63,7 @@ class ExceptionHandlingAspect {
 
 	public IOException lastException;
 
-	@AfterThrowing(pointcut = "within(org.springframework.beans.ITestBean+)", throwing = "ex")
+	@AfterThrowing(pointcut = "within(org.springframework.tests.sample.beans.ITestBean+)", throwing = "ex")
 	public void handleIOException(IOException ex) {
 		handled++;
 		lastException = ex;
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml
index 8b0975e8a93..759e4c89447 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-aspectj.xml
@@ -22,7 +22,7 @@
 		class="org.springframework.aop.aspectj.autoproxy.benchmark.TraceAspect" >
 	
 		
-	
+	
 		
 		
 	
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-springAop.xml b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-springAop.xml
index d6c4cccceec..453d22ccaf2 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-springAop.xml
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests-springAop.xml
@@ -31,7 +31,7 @@
 
 	
 
-	
+	
 		
 		
 	
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java
index a988324a003..c750e8ae574 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/benchmark/BenchmarkTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.aop.support.StaticMethodMatcherPointcut;
-import org.springframework.beans.ITestBean;
+import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.util.StopWatch;
 
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests.java
index 24ce7bcf1fe..ea160ca1130 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/generic/AfterReturningGenericTypeMatchingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,10 +26,10 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import test.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 
 /**
  * Tests ensuring that after-returning advice for generic parameters bound to
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml
index 1761a3552e4..7abc4287b71 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-error.xml
@@ -15,11 +15,11 @@
 
 	
 
-	
+	
 
-	
+	
 
-	
+	
 
 	
 
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml
index 68681cf9fbd..a68195265dc 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml
@@ -16,11 +16,11 @@
 		
 	
 
-	
+	
 
-	
+	
 
-	
+	
 
 	
 
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml
index 2a83b2078a5..f2b1e064721 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-error.xml
@@ -12,11 +12,11 @@
 		
 	
 
-	
+	
 
-	
+	
 
-	
+	
 
 	
 
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml
index 88cad34d9aa..4e098059b53 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests-ok.xml
@@ -12,11 +12,11 @@
 		
 	
 
-	
+	
 
-	
+	
 
-	
+	
 
 	
 
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml
index 38f9d7b6201..855bda381c5 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests-context.xml
@@ -19,11 +19,11 @@
 
 	
 
-	
+	
 
-	
+	
 
-	
+	
 
 	
 
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests.java
index 417512a71ef..3632c978038 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.framework.Advised;
-import org.springframework.beans.ITestBean;
+import org.springframework.tests.sample.beans.ITestBean;
 
 /**
  * @author Rob Harrop
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml
index 1f84e8edac2..9df36d7a387 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-error.xml
@@ -11,11 +11,11 @@
 		
 	
 
-	
+	
 
-	
+	
 
-	
+	
 
 	
 
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml
index 3fe28a8663d..c9238290990 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests-ok.xml
@@ -11,11 +11,11 @@
 		
 	
 
-	
+	
 
-	
+	
 
-	
+	
 
 	
 
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml
index 90ead2afe56..5fc378d78f6 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests-context.xml
@@ -19,11 +19,11 @@
 
 	
 
-	
+	
 
-	
+	
 
-	
+	
 
 	
 
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java
index 09d3dacd844..4896d143b26 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,20 +16,20 @@
 
 package org.springframework.aop.config;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.junit.Before;
 import org.junit.Test;
-import test.advice.CountingBeforeAdvice;
-
 import org.springframework.aop.Advisor;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import static org.junit.Assert.*;
+import org.springframework.tests.aop.advice.CountingBeforeAdvice;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * Unit tests for aop namespace.
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml
index 73ed03922c3..1ddb6b9a005 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-error.xml
@@ -11,11 +11,11 @@
 		
 	
 
-	
+	
 
-	
+	
 
-	
+	
 
 	
 
diff --git a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml
index 85080527360..051d281260e 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests-ok.xml
@@ -11,11 +11,11 @@
 		
 	
 
-	
+	
 
-	
+	
 
-	
+	
 
 	
 
diff --git a/spring-context/src/test/java/org/springframework/aop/config/PrototypeProxyTests-context.xml b/spring-context/src/test/java/org/springframework/aop/config/PrototypeProxyTests-context.xml
index 0ca26dd9534..b1327c8bdb1 100644
--- a/spring-context/src/test/java/org/springframework/aop/config/PrototypeProxyTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/config/PrototypeProxyTests-context.xml
@@ -5,22 +5,22 @@
 		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
-	
+	
 
-	
+	
 		
 	
 
-	
+	
 		
 	
 
-	
+	
 
 	
 
 	 
-		
+		
 		
 	
 
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
index 51b63bd7d6c..9fd4e9fa07c 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,14 @@
 
 package org.springframework.aop.framework;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -29,25 +37,13 @@ import java.util.List;
 import java.util.Map;
 
 import junit.framework.TestCase;
+
 import org.aopalliance.aop.Advice;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import test.advice.CountingAfterReturningAdvice;
-import test.advice.CountingBeforeAdvice;
-import test.advice.MethodCounter;
-import test.advice.MyThrowsHandler;
-import test.interceptor.NopInterceptor;
-import test.interceptor.SerializableNopInterceptor;
-import test.interceptor.TimestampIntroductionInterceptor;
-import test.mixin.LockMixin;
-import test.mixin.LockMixinAdvisor;
-import test.mixin.Lockable;
-import test.mixin.LockedException;
-import test.util.TimeStamped;
-
 import org.springframework.aop.Advisor;
 import org.springframework.aop.AfterReturningAdvice;
 import org.springframework.aop.DynamicIntroductionAdvice;
@@ -66,15 +62,26 @@ import org.springframework.aop.support.Pointcuts;
 import org.springframework.aop.support.StaticMethodMatcherPointcutAdvisor;
 import org.springframework.aop.target.HotSwappableTargetSource;
 import org.springframework.aop.target.SingletonTargetSource;
-import org.springframework.beans.IOther;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.Person;
-import org.springframework.beans.SerializablePerson;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.TimeStamped;
+import org.springframework.tests.aop.advice.CountingAfterReturningAdvice;
+import org.springframework.tests.aop.advice.CountingBeforeAdvice;
+import org.springframework.tests.aop.advice.MethodCounter;
+import org.springframework.tests.aop.advice.MyThrowsHandler;
+import org.springframework.tests.aop.interceptor.NopInterceptor;
+import org.springframework.tests.aop.interceptor.SerializableNopInterceptor;
+import org.springframework.tests.aop.interceptor.TimestampIntroductionInterceptor;
+import org.springframework.tests.sample.beans.IOther;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.Person;
+import org.springframework.tests.sample.beans.SerializablePerson;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.SerializationTestUtils;
 import org.springframework.util.StopWatch;
 
-import static org.junit.Assert.*;
+import test.mixin.LockMixin;
+import test.mixin.LockMixinAdvisor;
+import test.mixin.Lockable;
+import test.mixin.LockedException;
 
 /**
  * @author Rod Johnson
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java
index d600115868a..9b423759f79 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,30 +17,31 @@
 package org.springframework.aop.framework;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.Serializable;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
-
 import org.junit.Test;
-
-import org.springframework.cglib.core.CodeGenerationException;
-
 import org.springframework.aop.ClassFilter;
 import org.springframework.aop.MethodMatcher;
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.cglib.core.CodeGenerationException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextException;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.tests.aop.advice.CountingBeforeAdvice;
+import org.springframework.tests.aop.interceptor.NopInterceptor;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
-import test.advice.CountingBeforeAdvice;
-import test.interceptor.NopInterceptor;
 import test.mixin.LockMixinAdvisor;
 
 /**
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
index 911e4d51542..77101f6cc90 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,9 +27,9 @@ import org.aopalliance.intercept.MethodInvocation;
 
 import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
 import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.IOther;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.IOther;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * @since 13.03.2003
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml
index 27e7988a7a7..3cda6a7921a 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-autowiring.xml
@@ -3,12 +3,12 @@
 
 
 
-	
+	
 
 	
 		
 		
-			
+			
 		
 		
 	
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml
index 8c0a313a7c3..7675fe6e0e4 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-context.xml
@@ -4,19 +4,19 @@
 
 
 	
-		
+	
 		custom
 		666
 	
 
-	
+	
 
 	
-		org.springframework.beans.ITestBean
+		org.springframework.tests.sample.beans.ITestBean
 		
-		debugInterceptor		
+		debugInterceptor
 	
-	
+
 	
-		org.springframework.beans.ITestBean
-		
+		org.springframework.tests.sample.beans.ITestBean
+
 		
 		global*,test
-		
+
 	
-	
+
 	
 		
 			
- 				org.springframework.beans.ITestBean
- 			
+				org.springframework.tests.sample.beans.ITestBean
+			
 		
 		false
 		test
 	
-	
+
 	
 		
 			
- 				org.springframework.beans.ITestBean
- 			
+				org.springframework.tests.sample.beans.ITestBean
+			
 		
 		false
 		test
 	
-	
+
 	
 		true
 		
@@ -74,7 +74,7 @@
 		testCircleTarget1
 	
 
-	
+	
 		custom
 		666
 		
@@ -85,18 +85,18 @@
 		testCircleTarget2
 	
 
-	
+	
 		custom
 		666
 		
 	
 
 	
-		org.springframework.beans.ITestBean
+		org.springframework.tests.sample.beans.ITestBean
 		pointcutForVoid
 		test
 	
-	
+
 	
 
 	
 	
-	
+
 	
 		org.springframework.context.ApplicationListener
 		debugInterceptor,global*,target2
@@ -137,10 +137,10 @@
 
 	
 
-	
+	
 
 	
-		org.springframework.beans.ITestBean
+		org.springframework.tests.sample.beans.ITestBean
 		false
 		
 			
@@ -155,7 +155,7 @@
 	
 		
 			
-				org.springframework.beans.ITestBean
+				org.springframework.tests.sample.beans.ITestBean
 				test.mixin.Lockable
 			
 		
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml
index 795cea64182..dde1f91017d 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-double-targetsource.xml
@@ -10,13 +10,13 @@
 	
 	
 		
-			
+			
 				Eve
 			
 		
 	
 	
-	
+	
 		Adam
 	
 	
@@ -27,12 +27,12 @@
 	
 	
 	
 	
 	 
-		org.springframework.beans.ITestBean
+		org.springframework.tests.sample.beans.ITestBean
 		
 		countingBeforeAdvice,adamTargetSource
 		
@@ -42,7 +42,7 @@
 	
 	 
-		org.springframework.beans.ITestBean
+		org.springframework.tests.sample.beans.ITestBean
 		
 		adam
 		
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml
index 45a4c2707b7..d0f5a89896c 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-frozen.xml
@@ -4,25 +4,25 @@
 
 
 	
-		
+	
 		custom
 		666
-		
+	
+
 
-	
-	
+	
 	
-	
-		
-		org.springframework.beans.ITestBean		
-		
-			
-		debugInterceptor		
+	>
+		org.springframework.tests.sample.beans.ITestBean
+
+		
+		debugInterceptor
 		true
 		true
-		
+
 	
 
 
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml
index 92faa57c4fc..e59244c49cb 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-inner-bean-target.xml
@@ -9,31 +9,30 @@
 
 
 
-	
+	
 	
-	
+
 	 
+	>
 			
-					
+				
 					innerBeanTarget
 				
 			
-			
+
 			
 				nopInterceptor
 			
 	
-	
-	
-	
-	
-		
-	
-	
\ No newline at end of file
+
+
+
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-invalid.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-invalid.xml
index de65fec0fe1..fd46c5552fd 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-invalid.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-invalid.xml
@@ -5,7 +5,7 @@
 
 	
 	
-		org.springframework.beans.ITestBean
+		org.springframework.tests.sample.beans.ITestBean
 		
 	
 
@@ -14,7 +14,7 @@
 		Must have target after *.
 	-->
 	
-		org.springframework.beans.ITestBean
+		org.springframework.tests.sample.beans.ITestBean
 		global*
 	
 
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml
index 92ef595c55c..47cd14f94d4 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-notlast-targetsource.xml
@@ -9,12 +9,12 @@
 
 	
 	
-	
+	
 		Adam
 	
 	
 	
 	
 	 
 	 
-		org.springframework.beans.ITestBean
+		org.springframework.tests.sample.beans.ITestBean
 		
 		adam,countingBeforeAdvice
 		
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml
index f437df5edf0..291385ce50a 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-prototype.xml
@@ -7,15 +7,15 @@
 
 
 	
-	
+	
 		10
 	
 	
-	
+	
 		10
 	
 
-	
+	
 
 	
 		debugInterceptor,test
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml
index 4131b85d785..396bfada125 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-serialization.xml
@@ -6,35 +6,35 @@
 -->
 
 
-	
+	
 
-	
+	
 
 	
-		serializableNopInterceptor	
-		org.springframework.beans.Person		
+		serializableNopInterceptor
+		org.springframework.tests.sample.beans.Person
 		
-			
+			
 				serializableSingleton
 			
 		
 	
 
-	
+	
 		serializablePrototype
 	
 
 	
-		serializableNopInterceptor,prototypeTarget		
-		org.springframework.beans.Person	
+		serializableNopInterceptor,prototypeTarget
+		org.springframework.tests.sample.beans.Person
 		false
 	
 
 	
 		nopInterceptor
 		
-			
+			
 		
 	
 
-		
+
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml
index 4e9ab797adc..07f2825c1fc 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-targetsource.xml
@@ -8,18 +8,18 @@
 
 
 	
-		
+	
 		
 		Adam
 	
-	
-	
+
+	
 	
-	
+
 	
-	
+
 	
 	 
-		org.springframework.beans.ITestBean
+		class="org.springframework.aop.framework.ProxyFactoryBean">
+		org.springframework.tests.sample.beans.ITestBean
 		nopInterceptor,unsupportedInterceptor
 	
 
-		
-	
-	
+
+
+
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-throws-advice.xml b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-throws-advice.xml
index 1efb2ae3053..036dac321fa 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-throws-advice.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests-throws-advice.xml
@@ -9,18 +9,18 @@
 
 
 	
-		
-	
-	
-	
-	
-	
-		
-
-	 
+	
+
+	
+
+	
+
+	
+
+	
 			
 				countingBeforeAdvice,nopInterceptor,throwsAdvice,target
 			
 	
-	
+
 
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
index b6e0f6853e8..f55c1a41b30 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/ProxyFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,9 +47,6 @@ import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.support.DefaultIntroductionAdvisor;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.aop.support.DynamicMethodMatcherPointcut;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.Person;
-import org.springframework.beans.TestBean;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.FactoryBean;
@@ -60,16 +57,19 @@ import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.TestListener;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.tests.TimeStamped;
+import org.springframework.tests.aop.advice.CountingBeforeAdvice;
+import org.springframework.tests.aop.advice.MyThrowsHandler;
+import org.springframework.tests.aop.interceptor.NopInterceptor;
+import org.springframework.tests.aop.interceptor.TimestampIntroductionInterceptor;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.Person;
+import org.springframework.tests.sample.beans.SideEffectBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.SerializationTestUtils;
 
-import test.advice.CountingBeforeAdvice;
-import test.advice.MyThrowsHandler;
-import test.beans.SideEffectBean;
-import test.interceptor.NopInterceptor;
-import test.interceptor.TimestampIntroductionInterceptor;
 import test.mixin.Lockable;
 import test.mixin.LockedException;
-import test.util.TimeStamped;
 
 /**
  * @since 13.03.2003
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml b/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml
index 0aa3b46d648..a58e040b67d 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-with-bpp.xml
@@ -3,7 +3,7 @@
 
 
 
-	
+	
 	
 	
 	
@@ -12,7 +12,7 @@
 	
    	
 	
-		org.springframework.beans.ITestBean
+		org.springframework.tests.sample.beans.ITestBean
 		simpleBeforeAdviceAdvisor,testBeanTarget
 	
 	
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml b/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml
index 36718003309..69bd476f3b2 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests-without-bpp.xml
@@ -3,7 +3,7 @@
 
 
 	
-	
+	
 	
 	
 	
@@ -12,7 +12,7 @@
 	
    	
 	
-		org.springframework.beans.ITestBean
+		org.springframework.tests.sample.beans.ITestBean
 		simpleBeforeAdviceAdvisor,testBeanTarget
 	
 	
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests.java b/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests.java
index 57e8de81126..e708c9f1791 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/adapter/AdvisorAdapterRegistrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ import org.junit.Test;
 import org.springframework.aop.Advisor;
 import org.springframework.aop.BeforeAdvice;
 import org.springframework.aop.framework.Advised;
-import org.springframework.beans.ITestBean;
+import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml
index 286f8c840dd..c64c7e6ef74 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests-common-interceptors.xml
@@ -20,7 +20,7 @@
 		
 	
 
-	
+	
 
 	
-	
+	
 		Rod
 		
 	
 	
 	
-	
+	
 		Rod
 		
 	
 	
 	
-	
+	
 		Rod
 		
 	
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
index 83598caf9b8..bf1fc8b5a78 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,9 @@
 
 package org.springframework.aop.framework.autoproxy;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 
@@ -29,13 +31,13 @@ import org.springframework.aop.target.CommonsPoolTargetSource;
 import org.springframework.aop.target.LazyInitTargetSource;
 import org.springframework.aop.target.PrototypeTargetSource;
 import org.springframework.aop.target.ThreadLocalTargetSource;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.tests.aop.advice.CountingBeforeAdvice;
+import org.springframework.tests.aop.interceptor.NopInterceptor;
+import org.springframework.tests.sample.beans.CountingTestBean;
+import org.springframework.tests.sample.beans.ITestBean;
 
-import test.advice.CountingBeforeAdvice;
-import test.interceptor.NopInterceptor;
 import test.mixin.Lockable;
 
 /**
@@ -204,18 +206,6 @@ public final class AdvisorAutoProxyCreatorTests {
 
 }
 
-
-class CountingTestBean extends TestBean {
-
-	public static int count = 0;
-
-	public CountingTestBean() {
-		count++;
-	}
-
-}
-
-
 class SelectivePrototypeTargetSourceCreator extends AbstractBeanFactoryBasedTargetSourceCreator {
 
 	@Override
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java
index 4019d568d0c..d9a838ee2ab 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,11 +24,11 @@ import org.junit.Test;
 
 import org.springframework.aop.TargetSource;
 import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.IndexedTestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.IndexedTestBean;
 import org.springframework.beans.MutablePropertyValues;
-import org.springframework.beans.TestBean;
-import org.springframework.beans.factory.DummyFactory;
+import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.tests.sample.beans.factory.DummyFactory;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.support.RootBeanDefinition;
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml
index 53d945697e8..d53272f0d58 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests-context.xml
@@ -24,6 +24,6 @@
 		
 	
 
-	
+	
 
 		
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java
index 11805c6d5bb..49216292485 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorInitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import java.lang.reflect.Method;
 
 import org.junit.Test;
 import org.springframework.aop.MethodBeforeAdvice;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml
index 0f4b265b721..c9727ea856e 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/BeanNameAutoProxyCreatorTests-context.xml
@@ -59,7 +59,7 @@
 	  
 	
 
-	
+	
 
 	
-	
+	
 	
-	
+	
 
 		
 		prototypePerson
diff --git a/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java b/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java
index c0a695c452c..5ec8db261f8 100644
--- a/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/target/CommonsPoolTargetSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,15 +28,15 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.aop.framework.Advised;
-import org.springframework.beans.Person;
-import org.springframework.beans.SerializablePerson;
+import org.springframework.tests.sample.beans.Person;
+import org.springframework.tests.sample.beans.SerializablePerson;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.SerializationTestUtils;
 
-import test.beans.SideEffectBean;
+import org.springframework.tests.sample.beans.SideEffectBean;
 
 /**
  * Tests for pooling invoker interceptor.
diff --git a/spring-context/src/test/java/org/springframework/beans/Colour.java b/spring-context/src/test/java/org/springframework/beans/Colour.java
deleted file mode 100644
index a992a2ebfc6..00000000000
--- a/spring-context/src/test/java/org/springframework/beans/Colour.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import org.springframework.core.enums.ShortCodedLabeledEnum;
-
-/**
- * @author Rob Harrop
- */
-@SuppressWarnings("serial")
-public class Colour extends ShortCodedLabeledEnum {
-
-	public static final Colour RED = new Colour(0, "RED");
-	public static final Colour BLUE = new Colour(1, "BLUE");
-	public static final Colour GREEN = new Colour(2, "GREEN");
-	public static final Colour PURPLE = new Colour(3, "PURPLE");
-
-	private Colour(int code, String label) {
-		super(code, label);
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java
deleted file mode 100644
index c5360de5316..00000000000
--- a/spring-context/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.Serializable;
-
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.beans.factory.DisposableBean;
-
-/**
- * @author Juergen Hoeller
- * @since 21.08.2003
- */
-@SuppressWarnings("serial")
-public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean {
-
-	private String beanName;
-
-	private boolean initialized;
-
-	private boolean destroyed;
-
-
-	public DerivedTestBean() {
-	}
-
-	public DerivedTestBean(String[] names) {
-		if (names == null || names.length < 2) {
-			throw new IllegalArgumentException("Invalid names array");
-		}
-		setName(names[0]);
-		setBeanName(names[1]);
-	}
-
-	public static DerivedTestBean create(String[] names) {
-		return new DerivedTestBean(names);
-	}
-
-
-	@Override
-	public void setBeanName(String beanName) {
-		if (this.beanName == null || beanName == null) {
-			this.beanName = beanName;
-		}
-	}
-
-	@Override
-	public String getBeanName() {
-		return beanName;
-	}
-
-	public void setSpouseRef(String name) {
-		setSpouse(new TestBean(name));
-	}
-
-
-	public void initialize() {
-		this.initialized = true;
-	}
-
-	public boolean wasInitialized() {
-		return initialized;
-	}
-
-
-	@Override
-	public void destroy() {
-		this.destroyed = true;
-	}
-
-	@Override
-	public boolean wasDestroyed() {
-		return destroyed;
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/beans/FieldAccessBean.java b/spring-context/src/test/java/org/springframework/beans/FieldAccessBean.java
deleted file mode 100644
index 61f911902c7..00000000000
--- a/spring-context/src/test/java/org/springframework/beans/FieldAccessBean.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2002-2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-/**
- * @author Juergen Hoeller
- * @since 07.03.2006
- */
-public class FieldAccessBean {
-
-	public String name;
-
-	protected int age;
-
-	private TestBean spouse;
-
-
-	public String getName() {
-		return name;
-	}
-
-	public int getAge() {
-		return age;
-	}
-
-	public TestBean getSpouse() {
-		return spouse;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-context/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-context/src/test/java/org/springframework/beans/INestedTestBean.java
deleted file mode 100644
index e0ae5f20a3f..00000000000
--- a/spring-context/src/test/java/org/springframework/beans/INestedTestBean.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-public interface INestedTestBean {
-
-	public String getCompany();
-
-}
\ No newline at end of file
diff --git a/spring-context/src/test/java/org/springframework/beans/IOther.java b/spring-context/src/test/java/org/springframework/beans/IOther.java
deleted file mode 100644
index d7fb346185a..00000000000
--- a/spring-context/src/test/java/org/springframework/beans/IOther.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-public interface IOther {
-
-	void absquatulate();
-
-}
\ No newline at end of file
diff --git a/spring-context/src/test/java/org/springframework/beans/ITestBean.java b/spring-context/src/test/java/org/springframework/beans/ITestBean.java
deleted file mode 100644
index cdf5ef510dd..00000000000
--- a/spring-context/src/test/java/org/springframework/beans/ITestBean.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2002-2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.IOException;
-
-/**
- * Interface used for {@link org.springframework.beans.TestBean}.
- *
- * 
Two methods are the same as on Person, but if this
- * extends person it breaks quite a few tests..
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public interface ITestBean {
-
-	int getAge();
-
-	void setAge(int age);
-
-	String getName();
-
-	void setName(String name);
-
-	ITestBean getSpouse();
-
-	void setSpouse(ITestBean spouse);
-
-	ITestBean[] getSpouses();
-
-	String[] getStringArray();
-
-	void setStringArray(String[] stringArray);
-
-	/**
-	 * Throws a given (non-null) exception.
-	 */
-	void exceptional(Throwable t) throws Throwable;
-
-	Object returnsThis();
-
-	INestedTestBean getDoctor();
-
-	INestedTestBean getLawyer();
-
-	IndexedTestBean getNestedIndexedBean();
-
-	/**
-	 * Increment the age by one.
-	 * @return the previous age
-	 */
-	int haveBirthday();
-
-	void unreliableFileOperation() throws IOException;
-
-}
\ No newline at end of file
diff --git a/spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java
deleted file mode 100644
index 9f90cf15bb1..00000000000
--- a/spring-context/src/test/java/org/springframework/beans/IndexedTestBean.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-/**
- * @author Juergen Hoeller
- * @since 11.11.2003
- */
-public class IndexedTestBean {
-
-	private TestBean[] array;
-
-	private Collection collection;
-
-	private List list;
-
-	private Set set;
-
-	private SortedSet sortedSet;
-
-	private Map map;
-
-	private SortedMap sortedMap;
-
-
-	public IndexedTestBean() {
-		this(true);
-	}
-
-	public IndexedTestBean(boolean populate) {
-		if (populate) {
-			populate();
-		}
-	}
-
-	public void populate() {
-		TestBean tb0 = new TestBean("name0", 0);
-		TestBean tb1 = new TestBean("name1", 0);
-		TestBean tb2 = new TestBean("name2", 0);
-		TestBean tb3 = new TestBean("name3", 0);
-		TestBean tb4 = new TestBean("name4", 0);
-		TestBean tb5 = new TestBean("name5", 0);
-		TestBean tb6 = new TestBean("name6", 0);
-		TestBean tb7 = new TestBean("name7", 0);
-		TestBean tbX = new TestBean("nameX", 0);
-		TestBean tbY = new TestBean("nameY", 0);
-		this.array = new TestBean[] {tb0, tb1};
-		this.list = new ArrayList<>();
-		this.list.add(tb2);
-		this.list.add(tb3);
-		this.set = new TreeSet<>();
-		this.set.add(tb6);
-		this.set.add(tb7);
-		this.map = new HashMap<>();
-		this.map.put("key1", tb4);
-		this.map.put("key2", tb5);
-		this.map.put("key.3", tb5);
-		List list = new ArrayList<>();
-		list.add(tbX);
-		list.add(tbY);
-		this.map.put("key4", list);
-	}
-
-
-	public TestBean[] getArray() {
-		return array;
-	}
-
-	public void setArray(TestBean[] array) {
-		this.array = array;
-	}
-
-	public Collection getCollection() {
-		return collection;
-	}
-
-	public void setCollection(Collection collection) {
-		this.collection = collection;
-	}
-
-	public List getList() {
-		return list;
-	}
-
-	public void setList(List list) {
-		this.list = list;
-	}
-
-	public Set getSet() {
-		return set;
-	}
-
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public void setSet(Set set) {
-		this.set = set;
-	}
-
-	public SortedSet getSortedSet() {
-		return sortedSet;
-	}
-
-	public void setSortedSet(SortedSet sortedSet) {
-		this.sortedSet = sortedSet;
-	}
-
-	public Map getMap() {
-		return map;
-	}
-
-	public void setMap(Map map) {
-		this.map = map;
-	}
-
-	public SortedMap getSortedMap() {
-		return sortedMap;
-	}
-
-	public void setSortedMap(SortedMap sortedMap) {
-		this.sortedMap = sortedMap;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java
deleted file mode 100644
index 412891c439b..00000000000
--- a/spring-context/src/test/java/org/springframework/beans/NestedTestBean.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-/**
- * Simple nested test bean used for testing bean factories, AOP framework etc.
- *
- * @author Trevor D. Cook
- * @since 30.09.2003
- */
-public class NestedTestBean implements INestedTestBean {
-
-	private String company = "";
-
-	public NestedTestBean() {
-	}
-
-	public NestedTestBean(String company) {
-		setCompany(company);
-	}
-
-	public void setCompany(String company) {
-		this.company = (company != null ? company : "");
-	}
-
-	@Override
-	public String getCompany() {
-		return company;
-	}
-
-	public boolean equals(Object obj) {
-		if (!(obj instanceof NestedTestBean)) {
-			return false;
-		}
-		NestedTestBean ntb = (NestedTestBean) obj;
-		return this.company.equals(ntb.company);
-	}
-
-	public int hashCode() {
-		return this.company.hashCode();
-	}
-
-	public String toString() {
-		return "NestedTestBean: " + this.company;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-context/src/test/java/org/springframework/beans/Person.java b/spring-context/src/test/java/org/springframework/beans/Person.java
deleted file mode 100644
index 7c66f4b451b..00000000000
--- a/spring-context/src/test/java/org/springframework/beans/Person.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-/**
- *
- * @author Rod Johnson
- */
-public interface Person {
-
-	String getName();
-	void setName(String name);
-	int getAge();
-	void setAge(int i);
-
-	/**
-	 * Test for non-property method matching.
-	 * If the parameter is a Throwable, it will be thrown rather than
-	 * returned.
-	 */
-	Object echo(Object o) throws Throwable;
-}
\ No newline at end of file
diff --git a/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java
deleted file mode 100644
index dbe365f4937..00000000000
--- a/spring-context/src/test/java/org/springframework/beans/SerializablePerson.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.Serializable;
-
-import org.springframework.util.ObjectUtils;
-
-/**
- * Serializable implementation of the Person interface.
- *
- * @author Rod Johnson
- */
-@SuppressWarnings("serial")
-public class SerializablePerson implements Person, Serializable {
-
-	private String name;
-	private int age;
-
-	@Override
-	public int getAge() {
-		return age;
-	}
-
-	@Override
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	@Override
-	public Object echo(Object o) throws Throwable {
-		if (o instanceof Throwable) {
-			throw (Throwable) o;
-		}
-		return o;
-	}
-
-	public boolean equals(Object other) {
-		if (!(other instanceof SerializablePerson)) {
-			return false;
-		}
-		SerializablePerson p = (SerializablePerson) other;
-		return p.age == age && ObjectUtils.nullSafeEquals(name, p.name);
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
deleted file mode 100644
index d6911ee72f5..00000000000
--- a/spring-context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans.factory;
-
-import java.beans.PropertyEditorSupport;
-import java.util.StringTokenizer;
-
-import junit.framework.TestCase;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.PropertyBatchUpdateException;
-import org.springframework.beans.TestBean;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-
-/**
- * Subclasses must implement setUp() to initialize bean factory
- * and any other variables they need.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public abstract class AbstractBeanFactoryTests extends TestCase {
-
-	protected abstract BeanFactory getBeanFactory();
-
-	/**
-	 * Roderick beans inherits from rod, overriding name only.
-	 */
-	public void testInheritance() {
-		assertTrue(getBeanFactory().containsBean("rod"));
-		assertTrue(getBeanFactory().containsBean("roderick"));
-		TestBean rod = (TestBean) getBeanFactory().getBean("rod");
-		TestBean roderick = (TestBean) getBeanFactory().getBean("roderick");
-		assertTrue("not == ", rod != roderick);
-		assertTrue("rod.name is Rod", rod.getName().equals("Rod"));
-		assertTrue("rod.age is 31", rod.getAge() == 31);
-		assertTrue("roderick.name is Roderick", roderick.getName().equals("Roderick"));
-		assertTrue("roderick.age was inherited", roderick.getAge() == rod.getAge());
-	}
-
-	public void testGetBeanWithNullArg() {
-		try {
-			getBeanFactory().getBean((String) null);
-			fail("Can't get null bean");
-		}
-		catch (IllegalArgumentException ex) {
-			// OK
-		}
-	}
-
-	/**
-	 * Test that InitializingBean objects receive the afterPropertiesSet() callback
-	 */
-	public void testInitializingBeanCallback() {
-		MustBeInitialized mbi = (MustBeInitialized) getBeanFactory().getBean("mustBeInitialized");
-		// The dummy business method will throw an exception if the
-		// afterPropertiesSet() callback wasn't invoked
-		mbi.businessMethod();
-	}
-
-	/**
-	 * Test that InitializingBean/BeanFactoryAware/DisposableBean objects receive the
-	 * afterPropertiesSet() callback before BeanFactoryAware callbacks
-	 */
-	public void testLifecycleCallbacks() {
-		LifecycleBean lb = (LifecycleBean) getBeanFactory().getBean("lifecycle");
-		assertEquals("lifecycle", lb.getBeanName());
-		// The dummy business method will throw an exception if the
-		// necessary callbacks weren't invoked in the right order.
-		lb.businessMethod();
-		assertTrue("Not destroyed", !lb.isDestroyed());
-	}
-
-	public void testFindsValidInstance() {
-		try {
-			Object o = getBeanFactory().getBean("rod");
-			assertTrue("Rod bean is a TestBean", o instanceof TestBean);
-			TestBean rod = (TestBean) o;
-			assertTrue("rod.name is Rod", rod.getName().equals("Rod"));
-			assertTrue("rod.age is 31", rod.getAge() == 31);
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-			fail("Shouldn't throw exception on getting valid instance");
-		}
-	}
-
-	public void testGetInstanceByMatchingClass() {
-		try {
-			Object o = getBeanFactory().getBean("rod", TestBean.class);
-			assertTrue("Rod bean is a TestBean", o instanceof TestBean);
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-			fail("Shouldn't throw exception on getting valid instance with matching class");
-		}
-	}
-
-	public void testGetInstanceByNonmatchingClass() {
-		try {
-			Object o = getBeanFactory().getBean("rod", BeanFactory.class);
-			fail("Rod bean is not of type BeanFactory; getBeanInstance(rod, BeanFactory.class) should throw BeanNotOfRequiredTypeException");
-		}
-		catch (BeanNotOfRequiredTypeException ex) {
-			// So far, so good
-			assertTrue("Exception has correct bean name", ex.getBeanName().equals("rod"));
-			assertTrue("Exception requiredType must be BeanFactory.class", ex.getRequiredType().equals(BeanFactory.class));
-			assertTrue("Exception actualType as TestBean.class", TestBean.class.isAssignableFrom(ex.getActualType()));
-			assertTrue("Actual type is correct", ex.getActualType() == getBeanFactory().getBean("rod").getClass());
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-			fail("Shouldn't throw exception on getting valid instance");
-		}
-	}
-
-	public void testGetSharedInstanceByMatchingClass() {
-		try {
-			Object o = getBeanFactory().getBean("rod", TestBean.class);
-			assertTrue("Rod bean is a TestBean", o instanceof TestBean);
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-			fail("Shouldn't throw exception on getting valid instance with matching class");
-		}
-	}
-
-	public void testGetSharedInstanceByMatchingClassNoCatch() {
-		Object o = getBeanFactory().getBean("rod", TestBean.class);
-		assertTrue("Rod bean is a TestBean", o instanceof TestBean);
-	}
-
-	public void testGetSharedInstanceByNonmatchingClass() {
-		try {
-			Object o = getBeanFactory().getBean("rod", BeanFactory.class);
-			fail("Rod bean is not of type BeanFactory; getBeanInstance(rod, BeanFactory.class) should throw BeanNotOfRequiredTypeException");
-		}
-		catch (BeanNotOfRequiredTypeException ex) {
-			// So far, so good
-			assertTrue("Exception has correct bean name", ex.getBeanName().equals("rod"));
-			assertTrue("Exception requiredType must be BeanFactory.class", ex.getRequiredType().equals(BeanFactory.class));
-			assertTrue("Exception actualType as TestBean.class", TestBean.class.isAssignableFrom(ex.getActualType()));
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-			fail("Shouldn't throw exception on getting valid instance");
-		}
-	}
-
-	public void testSharedInstancesAreEqual() {
-		try {
-			Object o = getBeanFactory().getBean("rod");
-			assertTrue("Rod bean1 is a TestBean", o instanceof TestBean);
-			Object o1 = getBeanFactory().getBean("rod");
-			assertTrue("Rod bean2 is a TestBean", o1 instanceof TestBean);
-			assertTrue("Object equals applies", o == o1);
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-			fail("Shouldn't throw exception on getting valid instance");
-		}
-	}
-
-	public void testPrototypeInstancesAreIndependent() {
-		TestBean tb1 = (TestBean) getBeanFactory().getBean("kathy");
-		TestBean tb2 = (TestBean) getBeanFactory().getBean("kathy");
-		assertTrue("ref equal DOES NOT apply", tb1 != tb2);
-		assertTrue("object equal true", tb1.equals(tb2));
-		tb1.setAge(1);
-		tb2.setAge(2);
-		assertTrue("1 age independent = 1", tb1.getAge() == 1);
-		assertTrue("2 age independent = 2", tb2.getAge() == 2);
-		assertTrue("object equal now false", !tb1.equals(tb2));
-	}
-
-	public void testNotThere() {
-		assertFalse(getBeanFactory().containsBean("Mr Squiggle"));
-		try {
-			Object o = getBeanFactory().getBean("Mr Squiggle");
-			fail("Can't find missing bean");
-		}
-		catch (BeansException ex) {
-			//ex.printStackTrace();
-			//fail("Shouldn't throw exception on getting valid instance");
-		}
-	}
-
-	public void testValidEmpty() {
-		try {
-			Object o = getBeanFactory().getBean("validEmpty");
-			assertTrue("validEmpty bean is a TestBean", o instanceof TestBean);
-			TestBean ve = (TestBean) o;
-			assertTrue("Valid empty has defaults", ve.getName() == null && ve.getAge() == 0 && ve.getSpouse() == null);
-		}
-		catch (BeansException ex) {
-			ex.printStackTrace();
-			fail("Shouldn't throw exception on valid empty");
-		}
-	}
-
-	public void xtestTypeMismatch() {
-		try {
-			Object o = getBeanFactory().getBean("typeMismatch");
-			fail("Shouldn't succeed with type mismatch");
-		}
-		catch (BeanCreationException wex) {
-			assertEquals("typeMismatch", wex.getBeanName());
-			assertTrue(wex.getCause() instanceof PropertyBatchUpdateException);
-			PropertyBatchUpdateException ex = (PropertyBatchUpdateException) wex.getCause();
-			// Further tests
-			assertTrue("Has one error ", ex.getExceptionCount() == 1);
-			assertTrue("Error is for field age", ex.getPropertyAccessException("age") != null);
-			assertTrue("We have rejected age in exception", ex.getPropertyAccessException("age").getPropertyChangeEvent().getNewValue().equals("34x"));
-		}
-	}
-
-	public void testGrandparentDefinitionFoundInBeanFactory() throws Exception {
-		TestBean dad = (TestBean) getBeanFactory().getBean("father");
-		assertTrue("Dad has correct name", dad.getName().equals("Albert"));
-	}
-
-	public void testFactorySingleton() throws Exception {
-		assertTrue(getBeanFactory().isSingleton("&singletonFactory"));
-		assertTrue(getBeanFactory().isSingleton("singletonFactory"));
-		TestBean tb = (TestBean) getBeanFactory().getBean("singletonFactory");
-		assertTrue("Singleton from factory has correct name, not " + tb.getName(), tb.getName().equals(DummyFactory.SINGLETON_NAME));
-		DummyFactory factory = (DummyFactory) getBeanFactory().getBean("&singletonFactory");
-		TestBean tb2 = (TestBean) getBeanFactory().getBean("singletonFactory");
-		assertTrue("Singleton references ==", tb == tb2);
-		assertTrue("FactoryBean is BeanFactoryAware", factory.getBeanFactory() != null);
-	}
-
-	public void testFactoryPrototype() throws Exception {
-		assertTrue(getBeanFactory().isSingleton("&prototypeFactory"));
-		assertFalse(getBeanFactory().isSingleton("prototypeFactory"));
-		TestBean tb = (TestBean) getBeanFactory().getBean("prototypeFactory");
-		assertTrue(!tb.getName().equals(DummyFactory.SINGLETON_NAME));
-		TestBean tb2 = (TestBean) getBeanFactory().getBean("prototypeFactory");
-		assertTrue("Prototype references !=", tb != tb2);
-	}
-
-	/**
-	 * Check that we can get the factory bean itself.
-	 * This is only possible if we're dealing with a factory
-	 * @throws Exception
-	 */
-	public void testGetFactoryItself() throws Exception {
-		DummyFactory factory = (DummyFactory) getBeanFactory().getBean("&singletonFactory");
-		assertTrue(factory != null);
-	}
-
-	/**
-	 * Check that afterPropertiesSet gets called on factory
-	 * @throws Exception
-	 */
-	public void testFactoryIsInitialized() throws Exception {
-		TestBean tb = (TestBean) getBeanFactory().getBean("singletonFactory");
-		DummyFactory factory = (DummyFactory) getBeanFactory().getBean("&singletonFactory");
-		assertTrue("Factory was initialized because it implemented InitializingBean", factory.wasInitialized());
-	}
-
-	/**
-	 * It should be illegal to dereference a normal bean
-	 * as a factory
-	 */
-	public void testRejectsFactoryGetOnNormalBean() {
-		try {
-			getBeanFactory().getBean("&rod");
-			fail("Shouldn't permit factory get on normal bean");
-		}
-		catch (BeanIsNotAFactoryException ex) {
-			// Ok
-		}
-	}
-
-	// TODO: refactor in AbstractBeanFactory (tests for AbstractBeanFactory)
-	// and rename this class
-	public void testAliasing() {
-		BeanFactory bf = getBeanFactory();
-		if (!(bf instanceof ConfigurableBeanFactory)) {
-			return;
-		}
-		ConfigurableBeanFactory cbf = (ConfigurableBeanFactory) bf;
-
-		String alias = "rods alias";
-		try {
-			cbf.getBean(alias);
-			fail("Shouldn't permit factory get on normal bean");
-		}
-		catch (NoSuchBeanDefinitionException ex) {
-			// Ok
-			assertTrue(alias.equals(ex.getBeanName()));
-		}
-
-		// Create alias
-		cbf.registerAlias("rod", alias);
-		Object rod = getBeanFactory().getBean("rod");
-		Object aliasRod = getBeanFactory().getBean(alias);
-		assertTrue(rod == aliasRod);
-	}
-
-
-	public static class TestBeanEditor extends PropertyEditorSupport {
-
-		@Override
-		public void setAsText(String text) {
-			TestBean tb = new TestBean();
-			StringTokenizer st = new StringTokenizer(text, "_");
-			tb.setName(st.nextToken());
-			tb.setAge(Integer.parseInt(st.nextToken()));
-			setValue(tb);
-		}
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java
deleted file mode 100644
index 855f23af396..00000000000
--- a/spring-context/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans.factory;
-
-import org.springframework.beans.TestBean;
-
-/**
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public abstract class AbstractListableBeanFactoryTests extends AbstractBeanFactoryTests {
-
-	/** Subclasses must initialize this */
-	protected ListableBeanFactory getListableBeanFactory() {
-		BeanFactory bf = getBeanFactory();
-		if (!(bf instanceof ListableBeanFactory)) {
-			throw new IllegalStateException("ListableBeanFactory required");
-		}
-		return (ListableBeanFactory) bf;
-	}
-
-	/**
-	 * Subclasses can override this.
-	 */
-	public void testCount() {
-		assertCount(13);
-	}
-
-	protected final void assertCount(int count) {
-		String[] defnames = getListableBeanFactory().getBeanDefinitionNames();
-		assertTrue("We should have " + count + " beans, not " + defnames.length, defnames.length == count);
-	}
-
-	public void assertTestBeanCount(int count) {
-		String[] defNames = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, false);
-		assertTrue("We should have " + count + " beans for class org.springframework.beans.TestBean, not " +
-				defNames.length, defNames.length == count);
-
-		int countIncludingFactoryBeans = count + 2;
-		String[] names = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, true);
-		assertTrue("We should have " + countIncludingFactoryBeans +
-				" beans for class org.springframework.beans.TestBean, not " + names.length,
-				names.length == countIncludingFactoryBeans);
-	}
-
-	public void testGetDefinitionsForNoSuchClass() {
-		String[] defnames = getListableBeanFactory().getBeanNamesForType(String.class);
-		assertTrue("No string definitions", defnames.length == 0);
-	}
-
-	/**
-	 * Check that count refers to factory class, not bean class. (We don't know
-	 * what type factories may return, and it may even change over time.)
-	 */
-	public void testGetCountForFactoryClass() {
-		assertTrue("Should have 2 factories, not " +
-				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length,
-				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length == 2);
-
-		assertTrue("Should have 2 factories, not " +
-				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length,
-				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length == 2);
-	}
-
-	public void testContainsBeanDefinition() {
-		assertTrue(getListableBeanFactory().containsBeanDefinition("rod"));
-		assertTrue(getListableBeanFactory().containsBeanDefinition("roderick"));
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java
deleted file mode 100644
index 013a65a0e49..00000000000
--- a/spring-context/src/test/java/org/springframework/beans/factory/LifecycleBean.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans.factory;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-
-/**
- * Simple test of BeanFactory initialization and lifecycle callbacks.
- *
- * @author Rod Johnson
- * @author Colin Sampaleanu
- * @since 12.03.2003
- */
-public class LifecycleBean implements BeanNameAware, BeanFactoryAware, InitializingBean, DisposableBean {
-
-	protected boolean initMethodDeclared = false;
-
-	protected String beanName;
-
-	protected BeanFactory owningFactory;
-
-	protected boolean postProcessedBeforeInit;
-
-	protected boolean inited;
-
-	protected boolean initedViaDeclaredInitMethod;
-
-	protected boolean postProcessedAfterInit;
-
-	protected boolean destroyed;
-
-
-	public void setInitMethodDeclared(boolean initMethodDeclared) {
-		this.initMethodDeclared = initMethodDeclared;
-	}
-
-	public boolean isInitMethodDeclared() {
-		return initMethodDeclared;
-	}
-
-	@Override
-	public void setBeanName(String name) {
-		this.beanName = name;
-	}
-
-	public String getBeanName() {
-		return beanName;
-	}
-
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) {
-		this.owningFactory = beanFactory;
-	}
-
-	public void postProcessBeforeInit() {
-		if (this.inited || this.initedViaDeclaredInitMethod) {
-			throw new RuntimeException("Factory called postProcessBeforeInit after afterPropertiesSet");
-		}
-		if (this.postProcessedBeforeInit) {
-			throw new RuntimeException("Factory called postProcessBeforeInit twice");
-		}
-		this.postProcessedBeforeInit = true;
-	}
-
-	@Override
-	public void afterPropertiesSet() {
-		if (this.owningFactory == null) {
-			throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean");
-		}
-		if (!this.postProcessedBeforeInit) {
-			throw new RuntimeException("Factory didn't call postProcessBeforeInit before afterPropertiesSet on lifecycle bean");
-		}
-		if (this.initedViaDeclaredInitMethod) {
-			throw new RuntimeException("Factory initialized via declared init method before initializing via afterPropertiesSet");
-		}
-		if (this.inited) {
-			throw new RuntimeException("Factory called afterPropertiesSet twice");
-		}
-		this.inited = true;
-	}
-
-	public void declaredInitMethod() {
-		if (!this.inited) {
-			throw new RuntimeException("Factory didn't call afterPropertiesSet before declared init method");
-		}
-
-		if (this.initedViaDeclaredInitMethod) {
-			throw new RuntimeException("Factory called declared init method twice");
-		}
-		this.initedViaDeclaredInitMethod = true;
-	}
-
-	public void postProcessAfterInit() {
-		if (!this.inited) {
-			throw new RuntimeException("Factory called postProcessAfterInit before afterPropertiesSet");
-		}
-		if (this.initMethodDeclared && !this.initedViaDeclaredInitMethod) {
-			throw new RuntimeException("Factory called postProcessAfterInit before calling declared init method");
-		}
-		if (this.postProcessedAfterInit) {
-			throw new RuntimeException("Factory called postProcessAfterInit twice");
-		}
-		this.postProcessedAfterInit = true;
-	}
-
-	/**
-	 * Dummy business method that will fail unless the factory
-	 * managed the bean's lifecycle correctly
-	 */
-	public void businessMethod() {
-		if (!this.inited || (this.initMethodDeclared && !this.initedViaDeclaredInitMethod) ||
-				!this.postProcessedAfterInit) {
-			throw new RuntimeException("Factory didn't initialize lifecycle object correctly");
-		}
-	}
-
-	@Override
-	public void destroy() {
-		if (this.destroyed) {
-			throw new IllegalStateException("Already destroyed");
-		}
-		this.destroyed = true;
-	}
-
-	public boolean isDestroyed() {
-		return destroyed;
-	}
-
-
-	public static class PostProcessor implements BeanPostProcessor {
-
-		@Override
-		public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
-			if (bean instanceof LifecycleBean) {
-				((LifecycleBean) bean).postProcessBeforeInit();
-			}
-			return bean;
-		}
-
-		@Override
-		public Object postProcessAfterInitialization(Object bean, String name) throws BeansException {
-			if (bean instanceof LifecycleBean) {
-				((LifecycleBean) bean).postProcessAfterInit();
-			}
-			return bean;
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java b/spring-context/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
deleted file mode 100644
index 4b4d6980564..00000000000
--- a/spring-context/src/test/java/org/springframework/beans/factory/access/SingletonBeanFactoryLocatorTests.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans.factory.access;
-
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.util.ClassUtils;
-
-/**
- * @author Colin Sampaleanu
- * @author Chris Beams
- */
-public class SingletonBeanFactoryLocatorTests {
-
-	@Test
-	public void testBasicFunctionality() {
-		SingletonBeanFactoryLocator facLoc = new SingletonBeanFactoryLocator(
-				"classpath*:" + ClassUtils.addResourcePathToPackagePath(getClass(), "ref1.xml"));
-
-		basicFunctionalityTest(facLoc);
-	}
-
-	/**
-	 * Worker method so subclass can use it too.
-	 */
-	protected void basicFunctionalityTest(SingletonBeanFactoryLocator facLoc) {
-		BeanFactoryReference bfr = facLoc.useBeanFactory("a.qualified.name.of.some.sort");
-		BeanFactory fac = bfr.getFactory();
-		BeanFactoryReference bfr2 = facLoc.useBeanFactory("another.qualified.name");
-		fac = bfr2.getFactory();
-		// verify that the same instance is returned
-		TestBean tb = (TestBean) fac.getBean("beans1.bean1");
-		assertTrue(tb.getName().equals("beans1.bean1"));
-		tb.setName("was beans1.bean1");
-		BeanFactoryReference bfr3 = facLoc.useBeanFactory("another.qualified.name");
-		fac = bfr3.getFactory();
-		tb = (TestBean) fac.getBean("beans1.bean1");
-		assertTrue(tb.getName().equals("was beans1.bean1"));
-		BeanFactoryReference bfr4 = facLoc.useBeanFactory("a.qualified.name.which.is.an.alias");
-		fac = bfr4.getFactory();
-		tb = (TestBean) fac.getBean("beans1.bean1");
-		assertTrue(tb.getName().equals("was beans1.bean1"));
-		// Now verify that we can call release in any order.
-		// Unfortunately this doesn't validate complete release after the last one.
-		bfr2.release();
-		bfr3.release();
-		bfr.release();
-		bfr4.release();
-	}
-
-	/**
-	 * This test can run multiple times, but due to static keyed lookup of the locators,
-	 * 2nd and subsequent calls will actuall get back same locator instance. This is not
-	 * an issue really, since the contained beanfactories will still be loaded and released.
-	 */
-	@Test
-	public void testGetInstance() {
-		// Try with and without 'classpath*:' prefix, and with 'classpath:' prefix.
-		BeanFactoryLocator facLoc = SingletonBeanFactoryLocator.getInstance(
-				ClassUtils.addResourcePathToPackagePath(getClass(), "ref1.xml"));
-		getInstanceTest1(facLoc);
-
-		facLoc = SingletonBeanFactoryLocator.getInstance(
-				"classpath*:/" + ClassUtils.addResourcePathToPackagePath(getClass(), "ref1.xml"));
-		getInstanceTest2(facLoc);
-
-		// This will actually get another locator instance, as the key is the resource name.
-		facLoc = SingletonBeanFactoryLocator.getInstance(
-				"classpath:" + ClassUtils.addResourcePathToPackagePath(getClass(), "ref1.xml"));
-		getInstanceTest3(facLoc);
-
-	}
-
-	/**
-	 * Worker method so subclass can use it too
-	 */
-	protected void getInstanceTest1(BeanFactoryLocator facLoc) {
-		BeanFactoryReference bfr = facLoc.useBeanFactory("a.qualified.name.of.some.sort");
-		BeanFactory fac = bfr.getFactory();
-		BeanFactoryReference bfr2 = facLoc.useBeanFactory("another.qualified.name");
-		fac = bfr2.getFactory();
-		// verify that the same instance is returned
-		TestBean tb = (TestBean) fac.getBean("beans1.bean1");
-		assertTrue(tb.getName().equals("beans1.bean1"));
-		tb.setName("was beans1.bean1");
-		BeanFactoryReference bfr3 = facLoc.useBeanFactory("another.qualified.name");
-		fac = bfr3.getFactory();
-		tb = (TestBean) fac.getBean("beans1.bean1");
-		assertTrue(tb.getName().equals("was beans1.bean1"));
-
-		BeanFactoryReference bfr4 = facLoc.useBeanFactory("a.qualified.name.which.is.an.alias");
-		fac = bfr4.getFactory();
-		tb = (TestBean) fac.getBean("beans1.bean1");
-		assertTrue(tb.getName().equals("was beans1.bean1"));
-
-		bfr.release();
-		bfr3.release();
-		bfr2.release();
-		bfr4.release();
-	}
-
-	/**
-	 * Worker method so subclass can use it too
-	 */
-	protected void getInstanceTest2(BeanFactoryLocator facLoc) {
-		BeanFactoryReference bfr;
-		BeanFactory fac;
-		BeanFactoryReference bfr2;
-		TestBean tb;
-		BeanFactoryReference bfr3;
-		BeanFactoryReference bfr4;
-		bfr = facLoc.useBeanFactory("a.qualified.name.of.some.sort");
-		fac = bfr.getFactory();
-		bfr2 = facLoc.useBeanFactory("another.qualified.name");
-		fac = bfr2.getFactory();
-		// verify that the same instance is returned
-		tb = (TestBean) fac.getBean("beans1.bean1");
-		assertTrue(tb.getName().equals("beans1.bean1"));
-		tb.setName("was beans1.bean1");
-		bfr3 = facLoc.useBeanFactory("another.qualified.name");
-		fac = bfr3.getFactory();
-		tb = (TestBean) fac.getBean("beans1.bean1");
-		assertTrue(tb.getName().equals("was beans1.bean1"));
-		bfr4 = facLoc.useBeanFactory("a.qualified.name.which.is.an.alias");
-		fac = bfr4.getFactory();
-		tb = (TestBean) fac.getBean("beans1.bean1");
-		assertTrue(tb.getName().equals("was beans1.bean1"));
-		bfr.release();
-		bfr2.release();
-		bfr4.release();
-		bfr3.release();
-	}
-
-	/**
-	 * Worker method so subclass can use it too
-	 */
-	protected void getInstanceTest3(BeanFactoryLocator facLoc) {
-		BeanFactoryReference bfr;
-		BeanFactory fac;
-		BeanFactoryReference bfr2;
-		TestBean tb;
-		BeanFactoryReference bfr3;
-		BeanFactoryReference bfr4;
-		bfr = facLoc.useBeanFactory("a.qualified.name.of.some.sort");
-		fac = bfr.getFactory();
-		bfr2 = facLoc.useBeanFactory("another.qualified.name");
-		fac = bfr2.getFactory();
-		// verify that the same instance is returned
-		tb = (TestBean) fac.getBean("beans1.bean1");
-		assertTrue(tb.getName().equals("beans1.bean1"));
-		tb.setName("was beans1.bean1");
-		bfr3 = facLoc.useBeanFactory("another.qualified.name");
-		fac = bfr3.getFactory();
-		tb = (TestBean) fac.getBean("beans1.bean1");
-		assertTrue(tb.getName().equals("was beans1.bean1"));
-		bfr4 = facLoc.useBeanFactory("a.qualified.name.which.is.an.alias");
-		fac = bfr4.getFactory();
-		tb = (TestBean) fac.getBean("beans1.bean1");
-		assertTrue(tb.getName().equals("was beans1.bean1"));
-		bfr4.release();
-		bfr3.release();
-		bfr2.release();
-		bfr.release();
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java b/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java
deleted file mode 100644
index f54299a03f9..00000000000
--- a/spring-context/src/test/java/org/springframework/beans/factory/access/TestBean.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans.factory.access;
-
-import java.util.List;
-
-/**
- * Scrap bean for use in tests.
- *
- * @author Colin Sampaleanu
- */
-public class TestBean {
-
-	private String name;
-
-	private List list;
-
-	private Object objRef;
-
-	/**
-	 * @return Returns the name.
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @param name The name to set.
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * @return Returns the list.
-	 */
-	public List getList() {
-		return list;
-	}
-
-	/**
-	 * @param list The list to set.
-	 */
-	public void setList(List list) {
-		this.list = list;
-	}
-
-	/**
-	 * @return Returns the object.
-	 */
-	public Object getObjRef() {
-		return objRef;
-	}
-
-	/**
-	 * @param object The object to set.
-	 */
-	public void setObjRef(Object object) {
-		this.objRef = object;
-	}
-}
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/access/ref1.xml b/spring-context/src/test/java/org/springframework/beans/factory/access/ref1.xml
deleted file mode 100644
index 2dde7a31b37..00000000000
--- a/spring-context/src/test/java/org/springframework/beans/factory/access/ref1.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-  
-  
-    
-  
-
-  
-
-  
-    
-     
-  
-
-  
-
-
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java b/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
deleted file mode 100644
index d42adc1daf3..00000000000
--- a/spring-context/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans.factory.parsing;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Rob Harrop
- * @author Juergen Hoeller
- */
-public class CollectingReaderEventListener implements ReaderEventListener {
-
-	private final List defaults = new LinkedList();
-
-	private final Map componentDefinitions = new LinkedHashMap<>(8);
-
-	private final Map> aliasMap = new LinkedHashMap<>(8);
-
-	private final List imports = new LinkedList();
-
-
-	@Override
-	public void defaultsRegistered(DefaultsDefinition defaultsDefinition) {
-		this.defaults.add(defaultsDefinition);
-	}
-
-	public List getDefaults() {
-		return Collections.unmodifiableList(this.defaults);
-	}
-
-	@Override
-	public void componentRegistered(ComponentDefinition componentDefinition) {
-		this.componentDefinitions.put(componentDefinition.getName(), componentDefinition);
-	}
-
-	public ComponentDefinition getComponentDefinition(String name) {
-		return this.componentDefinitions.get(name);
-	}
-
-	public ComponentDefinition[] getComponentDefinitions() {
-		Collection collection = this.componentDefinitions.values();
-		return collection.toArray(new ComponentDefinition[collection.size()]);
-	}
-
-	@Override
-	public void aliasRegistered(AliasDefinition aliasDefinition) {
-		List aliases = this.aliasMap.get(aliasDefinition.getBeanName());
-		if(aliases == null) {
-			aliases = new ArrayList();
-			this.aliasMap.put(aliasDefinition.getBeanName(), aliases);
-		}
-		aliases.add(aliasDefinition);
-	}
-
-	public List getAliases(String beanName) {
-		List aliases = this.aliasMap.get(beanName);
-		return aliases == null ? null : Collections.unmodifiableList(aliases);
-	}
-
-	@Override
-	public void importProcessed(ImportDefinition importDefinition) {
-		this.imports.add(importDefinition);
-	}
-
-	public List getImports() {
-		return Collections.unmodifiableList(this.imports);
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
deleted file mode 100644
index 28c3bffa8f4..00000000000
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans.factory.xml;
-
-import org.springframework.beans.TestBean;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-
-/**
- * Simple bean used to test dependency checking.
- *
- * Note: would be defined within {@link XmlBeanFactoryTestTypes}, but must be a public type
- * in order to satisfy test dependencies.
- *
- * @author Rod Johnson
- * @author Chris Beams
- * @since 04.09.2003
- */
-public final class DependenciesBean implements BeanFactoryAware {
-
-	private int age;
-
-	private String name;
-
-	private TestBean spouse;
-
-	private BeanFactory beanFactory;
-
-
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-	public int getAge() {
-		return age;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setSpouse(TestBean spouse) {
-		this.spouse = spouse;
-	}
-
-	public TestBean getSpouse() {
-		return spouse;
-	}
-
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) {
-		this.beanFactory = beanFactory;
-	}
-
-	public BeanFactory getBeanFactory() {
-		return beanFactory;
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml
index 017af485203..9eaf910d083 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests-context.xml
@@ -22,7 +22,7 @@
 		interceptor
 	
 	
-	
+	
 		Jenny
 		30
 	
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java
index ed9fbbde83b..96e2ab404a9 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/LookupMethodWrappedByCglibProxyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.aop.interceptor.DebugInterceptor;
-import org.springframework.beans.ITestBean;
+import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerWithExpressionLanguageTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerWithExpressionLanguageTests.java
index b1e6c818f0d..c21ee9078fb 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerWithExpressionLanguageTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/SimplePropertyNamespaceHandlerWithExpressionLanguageTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ package org.springframework.beans.factory.xml;
 import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 
-import org.springframework.beans.ITestBean;
+import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java
index 98f04505649..6f68b6bf600 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTestTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,14 +27,14 @@ import java.util.Set;
 import javax.sql.DataSource;
 
 import org.springframework.beans.BeansException;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.IndexedTestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.IndexedTestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.DummyFactory;
+import org.springframework.tests.sample.beans.factory.DummyFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.support.MethodReplacer;
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml
index 4fcad300bab..43510574bae 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-autowire.xml
@@ -3,22 +3,22 @@
 
 
 
-	
 		
 	
 
-	
 		
 	
 
-	
 		
 	
 
-	
 		
 	
@@ -38,12 +38,12 @@
 		
 	
 
-	
 		
 	
 
-	
+	
 
 	
 		
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml
index 654e76e7fb5..fc90f7905c7 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-child.xml
@@ -8,13 +8,13 @@
 		
 	
 	
-	
 		override
 		
 	
 
-	
 		override
 		
@@ -42,7 +42,7 @@
 
 	
 
-	
+	
 		myname
 	
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml
index 9a735571d89..7729dbc7882 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-collections.xml
@@ -3,7 +3,7 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-		
+	
 		Jenny
 		30
 		
@@ -11,8 +11,8 @@
 			
 		
 	
-	
-		
+
+	
 		
 			Simple bean, without any collections.
 		
@@ -22,8 +22,8 @@
 		
 		27
 	
-	
-		
+
+	
 		Rod
 		32
 		
@@ -34,8 +34,8 @@
 			
 		
 	
-	
-	
+
+	
 		Jenny
 		30
 		
@@ -44,12 +44,12 @@
 		
 	
 
-	
+	
 		David
 		27
 	
 
-	
+	
 		Rod
 		32
 		
@@ -63,7 +63,7 @@
 	
-		
+	
 		loner
 		26
 		
@@ -73,8 +73,8 @@
 			
 		
 	
-	
-		
+
+	
 		
 			
 				
@@ -84,7 +84,7 @@
 			
 		
 	
-	
+
 	
 		
 			
@@ -97,26 +97,26 @@
 		
 	
 
-	
+	
 		verbose
 	
-	
-		
+
+	
 		
 	
 
-		
+	
 		
 	
 
-	
+	
 		
 			
 			
 		
 	
-	
-		
+
+	
 		
 			
 				
@@ -126,7 +126,7 @@
 		
 	
 
-	
+	
 		
 			
 				
@@ -158,7 +158,7 @@
 		
 	
 
-	
+	
 		
 			
 				
@@ -167,7 +167,7 @@
 		
 	
 
-	
+	
 		
 			
 				
@@ -198,8 +198,8 @@
 			
 		
 	
-	
-	
+
+	
 		
 			
 			
@@ -207,7 +207,7 @@
 	
 
 
-	
+	
 		
 			
 				bar
@@ -217,15 +217,15 @@
 		
 	
 
-	
+	
 		
 			
 			
 		
 	
-	
-	
-		
+
+
+	
 		
 			
 				bar
@@ -233,8 +233,8 @@
 			
 		
 	
-	
-	
+
+	
 		
 			
 				
@@ -243,7 +243,7 @@
 		
 	
 
-	
+	
 		
 			
 				one
@@ -251,8 +251,8 @@
 			
 		
 	
-	
-		
+
+	
 		
 			
 				java.lang.String
@@ -260,8 +260,8 @@
 			
 		
 	
-	
-	
+
+	
 		
 			
 				0
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml
index 85eb3620b0f..8370424f739 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml
@@ -11,16 +11,16 @@
 	
 
-	
+	
 
 	
-		
+		
 		
 	
 	
-	
+	
 		
-			
+			
 				
 					
 						
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml
index bc4f87d63a4..d500c48881e 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorArg.xml
@@ -13,7 +13,7 @@
 		
 	
 
-	
+	
 		
 			
 				
@@ -117,7 +117,7 @@
 	
 	
 
-	
+	
 		
 			Kerry1
 		
@@ -126,7 +126,7 @@
 		
 	
 
-	
+	
 		
 			Kerry2
 		
@@ -135,7 +135,7 @@
 		
 	
 
-	
+	
 
 	
 		/test
@@ -187,13 +187,13 @@
 
 	
 		
-			
+			
 		
 	
 
 	
 		
-			
+			
 		
 	
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml
index ea061046ce3..d703fddd21f 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-constructorOverrides.xml
@@ -18,7 +18,7 @@
 	
 	
 	
-	
 		Jenny
 		30
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml
index 0094234b090..3815538559d 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultAutowire.xml
@@ -3,19 +3,19 @@
 
 
 
-	
+	
 		
 	
 
-	
+	
 		
 	
 
-	
+	
 		
 	
 
-	
+	
 		
 			Kerry
 		
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml
index 5021766b1c0..3451c1b37c0 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml
@@ -15,6 +15,6 @@
 		destroy-method="customDestroy"
 	/>
 
-	
+	
 
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml
index feb3bea4994..10ae8ae09fb 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-delegationOverrides.xml
@@ -58,7 +58,7 @@
 
 	
 
-	
 		Jenny
 		30
@@ -68,7 +68,7 @@
 		
 	
 
-	
 		
 			Simple bean, without any collections.
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml
index f94371ee0c7..86da8d595d4 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-factoryCircle.xml
@@ -3,7 +3,7 @@
 
 
 
-	
+	
 		
 	
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml
index 1a6eb553328..06281490175 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-initializers.xml
@@ -11,7 +11,7 @@
 	
 
-	
 
 	
 
 
-	
-	
-		
+
+
+	
 		Jenny
 		30
 		
@@ -12,9 +12,8 @@
 			
 		
 	
-	
+
 	
 
-		
-	
-	
\ No newline at end of file
+
+
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml
index e8b85a509af..cd232df3c00 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml
@@ -11,7 +11,7 @@
 	
 	
 
-	
+	
 		Jenny
 		30
 	
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml
index da6d7405eb3..2e49f71a540 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml
@@ -12,7 +12,7 @@
 	
 	
 
-	
+	
 		
 			
 				
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml
index bf0849bc98c..0a92c7426d0 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml
@@ -35,32 +35,32 @@
 	
 	
 	
-	
+	
 		Jenny
 		30
 		
 			
 		
 		
-			
+			
 		
 	
 	
-	
+	
 		Jenny
 		30
 		
-			
+			
 		
 	
 
-	
+	
 		
 			
 		
 	
 
-	
+	
 		
 			Simple bean, without any collections.
 		
@@ -71,12 +71,12 @@
 		27
 	
 	
-	
+	
 	
 	
 	
 	
-	
+	
 		
 	
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml
index 98f23096735..f575bcb44a9 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml
@@ -3,7 +3,7 @@
 
 
 
-	
+	
 		parent
 		1
 	
@@ -13,11 +13,11 @@
 		1
 	
 
-	
+	
 		parent
 		2
 	
 
-	
+	
 
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml
index c8adc19bb3d..f8e32809066 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-reftypes.xml
@@ -1,102 +1,102 @@
 
 
 
-	
-	
+
+	
 		Jenny
 		30
 		
 	
-	
-		
+
+	
 		
 		
 		
 	
-	
-	
+
+	
 		Andrew
 		36
 		
 	
 
-	
+	
 		
 		
 		
 	
-	
-		
+
+	
 		Georgia
 		33
 		
 	
 
-	
+	
 		
 		
 		
 	
 
-	
+	
 		
 		
 		
-			
+			
 				
 			
 		
 	
 
-	
+	
 		
 		
 		
 	
 
-	
+	
 		
 	
 
-	
+	
 		
 	
 
-	
+	
 		
 	
 
-	
+	
 		
-			
+			
 				
 			
 		
 	
 
 	
-	
+	
 		outer
 		0
 	
 
-	
+	
 		hasInner
 		5
 		
-			
+			
 				inner1
 				6
 			
 		
 		
 			
-				
+				
 					inner2
 					7
 				
-				
-				
+				
+				
 					inner5
 					6
 				
@@ -105,7 +105,7 @@
 		
 			
 				
-					
+					
 						inner3
 						8
 					
@@ -120,32 +120,32 @@
 		
 	
 
-	
+	
 		
-			
+			
 				inner1
 				6
 			
 		
 	
 
-	
+	
 		hasInner
 		5
 		
-			
+			
 				inner1
 				6
 			
 		
 		
 			
-				
+				
 					inner2
 					7
 				
-				
-				
+				
+				
 					inner5
 					6
 				
@@ -153,11 +153,11 @@
 		
 	
 
-	
+	
 		
 			
 				
-					
+					
 						inner3
 						8
 						
@@ -173,9 +173,9 @@
 		
 	
 
-	
+	
 		
-			
+			
 				inner1
 				6
 				
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml
index 3386242887d..9eb0813411a 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resource.xml
@@ -5,7 +5,7 @@
 
 	 
 
-	
+	
 		
 			classpath:org/springframework/beans/factory/xml/test.properties
 		
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml
index e5515885eff..31fa7a16bab 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml
@@ -3,7 +3,7 @@
 
 
 
-	
+	
 		
 			classpath:org/springframework/beans/factory/xml/test.properties
 		
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml
index 4b315b7582d..daa269998ee 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedAllDepCheck.xml
@@ -3,14 +3,14 @@
 
 
 
-	
 		
 		33
 		Rod
 	
 	
-	
 	
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml
index 8c1d0d3f37c..65fbd833c9f 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedObjectDepCheck.xml
@@ -3,11 +3,11 @@
 
 
 
-	
+	
 		
 	
 	
-	
+	
 	
 
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml
index 92981195029..9088b962e0f 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-satisfiedSimpleDepCheck.xml
@@ -3,7 +3,7 @@
 
 
 
-	
 		33
 		Rod
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml
index cc049ed23cd..393028d4f1f 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml
@@ -3,8 +3,8 @@
 
 
 
-	
+	
 
-	
+	
 
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml
index e991af7167a..90de5444371 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml
@@ -3,8 +3,8 @@
 
 
 
-	
+	
 
-	
+	
 
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml
index 19faed79258..a771266aa9a 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingObjects.xml
@@ -3,7 +3,7 @@
 
 
 
-	
 		33
 		Rod
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml
index df21ad72626..8cd2e725690 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedAllDepCheckMissingSimple.xml
@@ -3,13 +3,13 @@
 
 
 
-	
 		tony
 		 -->
 	
 	
-	
 	
 
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml
index f18e9e77c29..a96c4d303d8 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedObjectDepCheck.xml
@@ -3,7 +3,7 @@
 
 
 
-	
 		
 	
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml
index 8463f132a12..4968b12b3a6 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-unsatisfiedSimpleDepCheck.xml
@@ -3,7 +3,7 @@
 
 
 
-	
 		
 	
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
index 3eed0d7cfc1..b4e6a07538c 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,13 +42,8 @@ import org.junit.Test;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.BeansException;
-import org.springframework.beans.DerivedTestBean;
 import org.springframework.beans.FatalBeanException;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.IndexedTestBean;
 import org.springframework.beans.MutablePropertyValues;
-import org.springframework.beans.ResourceTestBean;
-import org.springframework.beans.TestBean;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanCurrentlyInCreationException;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
@@ -56,7 +51,6 @@ import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanIsAbstractException;
 import org.springframework.beans.factory.CannotLoadBeanClassException;
 import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.DummyFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.UnsatisfiedDependencyException;
@@ -69,6 +63,13 @@ import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.UrlResource;
 import org.springframework.core.io.support.EncodedResource;
+import org.springframework.tests.sample.beans.DependenciesBean;
+import org.springframework.tests.sample.beans.DerivedTestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.IndexedTestBean;
+import org.springframework.tests.sample.beans.ResourceTestBean;
+import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.tests.sample.beans.factory.DummyFactory;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.util.SerializationTestUtils;
 import org.springframework.util.StopWatch;
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml
index 1fbd8330863..17c9c7e8f5b 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml
@@ -10,11 +10,11 @@
 
 	
 
-	
+	
 		
 	
 
-	
+	
 		
 		
 		
@@ -24,14 +24,14 @@
 		
 	
 
-	
+	
 		
 		
 		
 		
 	
 
-	
+	
 
 	
 		
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
index 7a52f76eda2..68accbae1d4 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
+++ b/spring-context/src/test/java/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,31 +16,27 @@
 
 package org.springframework.beans.factory.xml.support;
 
-import java.io.IOException;
 import static java.lang.String.format;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-import test.interceptor.NopInterceptor;
-
 import org.springframework.aop.Advisor;
 import org.springframework.aop.config.AbstractInterceptorDrivenBeanDefinitionDecorator;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.interceptor.DebugInterceptor;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.BeanInstantiationException;
-import org.springframework.beans.ITestBean;
 import org.springframework.beans.MutablePropertyValues;
-import org.springframework.beans.TestBean;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
@@ -60,6 +56,13 @@ import org.springframework.context.ApplicationListener;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
+import org.springframework.tests.aop.interceptor.NopInterceptor;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
 
 /**
  * Unit tests for custom XML namespace handler implementations.
diff --git a/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
index a7207435209..6f407fb24e0 100644
--- a/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,10 +18,10 @@ package org.springframework.context;
 
 import java.util.Locale;
 
-import org.springframework.beans.TestBean;
-import org.springframework.beans.factory.AbstractListableBeanFactoryTests;
 import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.LifecycleBean;
+import org.springframework.beans.factory.xml.AbstractListableBeanFactoryTests;
+import org.springframework.tests.sample.beans.LifecycleBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * @author Rod Johnson
diff --git a/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java
index 69fea0435db..96f39c3296a 100644
--- a/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java
+++ b/spring-context/src/test/java/org/springframework/context/LifecycleContextBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.springframework.context;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.LifecycleBean;
+import org.springframework.tests.sample.beans.LifecycleBean;
 
 /**
  * Simple bean to test ApplicationContext lifecycle methods for beans
diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml b/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml
index 30b7c590c89..81770ea423f 100644
--- a/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml
+++ b/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml
@@ -3,7 +3,7 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-		
+	
 		Jenny
 		30
 		
@@ -11,8 +11,8 @@
 			
 		
 	
-	
-		
+
+	
 		
 			Simple bean, without any collections.
 		
@@ -22,8 +22,8 @@
 		
 		27
 	
-	
-		
+
+	
 		Rod
 		32
 		
@@ -34,8 +34,8 @@
 			
 		
 	
-	
-	
+
+	
 		Jenny
 		30
 		
@@ -44,12 +44,12 @@
 		
 	
 
-	
+	
 		David
 		27
 	
 
-	
+	
 		Rod
 		32
 		
@@ -63,7 +63,7 @@
 	
-		
+	
 		loner
 		26
 		
@@ -73,8 +73,8 @@
 			
 		
 	
-	
-		
+
+	
 		
 			
 				
@@ -84,7 +84,7 @@
 			
 		
 	
-	
+
 	
 		
 			
@@ -97,26 +97,26 @@
 		
 	
 
-	
+	
 		verbose
 	
-	
-		
+
+	
 		
 	
 
-		
+	
 		
 	
 
-	
+	
 		
 			
 			
 		
 	
-	
-		
+
+	
 		
 			
 				
@@ -126,7 +126,7 @@
 		
 	
 
-	
+	
 		
 			
 				
@@ -158,7 +158,7 @@
 		
 	
 
-	
+	
 		
 			
 				
@@ -167,7 +167,7 @@
 		
 	
 
-	
+	
 		
 			
 				
@@ -198,8 +198,8 @@
 			
 		
 	
-	
-	
+
+	
 		
 			
 			
@@ -207,7 +207,7 @@
 	
 
 
-	
+	
 		
 			
 				bar
@@ -217,15 +217,15 @@
 		
 	
 
-	
+	
 		
 			
 			
 		
 	
-	
-	
-		
+
+
+	
 		
 			
 				bar
@@ -233,8 +233,8 @@
 			
 		
 	
-	
-	
+
+	
 		
 			
 				
@@ -243,7 +243,7 @@
 		
 	
 
-	
+	
 		
 			
 				one
@@ -251,8 +251,8 @@
 			
 		
 	
-	
-		
+
+	
 		
 			
 				java.lang.String
@@ -260,8 +260,8 @@
 			
 		
 	
-	
-	
+
+	
 		
 			
 				0
diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml b/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml
index 6f5675fffd6..99d732a1642 100644
--- a/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml
+++ b/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml
@@ -3,7 +3,7 @@
 
 
 
-	
+	
 		parent
 		1
 	
@@ -13,11 +13,11 @@
 		1
 	
 
-	
+	
 		parent
 		2
 	
 
-	
+	
 
 
diff --git a/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java b/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java
index e87e6023780..8001716e485 100644
--- a/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.access.BootstrapException;
 import org.springframework.context.ApplicationContext;
-import org.springframework.mock.jndi.SimpleNamingContextBuilder;
+import org.springframework.tests.mock.jndi.SimpleNamingContextBuilder;
 
 /**
  * @author Colin Sampaleanu
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java
index bfbc2c9ef65..e3ed03301f4 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/AbstractCircularImportDetectionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ConfigurationClassParser;
 import org.springframework.context.annotation.Import;
 
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 
 /**
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java
index d35b5396fd3..0a9cfdf655f 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,8 @@ import javax.annotation.Resource;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.Test;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Required;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java
index 50b8cd20459..55d08669d09 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathBeanDefinitionScannerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ import org.aspectj.lang.annotation.Aspect;
 import static org.junit.Assert.*;
 import org.junit.Test;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.BeanDefinition;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java
index 1e4deb22f08..4475d87e4a8 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ClassPathFactoryBeanDefinitionScannerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,10 +20,10 @@ import junit.framework.TestCase;
 
 import org.springframework.aop.scope.ScopedObject;
 import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.context.SimpleMapScope;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.config.SimpleMapScope;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.annotation4.DependencyBean;
 import org.springframework.context.annotation4.FactoryMethodComponent;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
index 62aa1411a3a..331a2f0af2a 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,10 +25,11 @@ import javax.ejb.EJB;
 import org.junit.Test;
 
 import org.springframework.beans.BeansException;
-import org.springframework.beans.INestedTestBean;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.NestedTestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.mock.jndi.ExpectedLookupTemplate;
+import org.springframework.tests.sample.beans.INestedTestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.NestedTestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -41,7 +42,6 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.jndi.support.SimpleJndiBeanFactory;
-import org.springframework.mock.jndi.ExpectedLookupTemplate;
 import org.springframework.util.SerializationTestUtils;
 
 import static org.junit.Assert.*;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationIntegrationTests.java
index 7b461584a0a..f6d90975c2d 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationIntegrationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanAnnotationIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,12 +31,12 @@ import org.junit.Test;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.annotation.CustomAutowireConfigurer;
 import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.SimpleMapScope;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.ComponentScanParserTests.CustomAnnotationAutowiredBean;
 import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.tests.context.SimpleMapScope;
 import org.springframework.util.SerializationTestUtils;
 
 import example.scannable.CustomComponent;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserScopedProxyTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserScopedProxyTests.java
index 4cbfd9b34e7..31a87271caf 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserScopedProxyTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ComponentScanParserScopedProxyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@ import org.junit.Test;
 
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.FatalBeanException;
-import org.springframework.beans.factory.config.SimpleMapScope;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.tests.context.SimpleMapScope;
 import org.springframework.util.SerializationTestUtils;
 
 /**
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java
index ee826eb33a0..b35fc045745 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassAndBFPPTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertThat;
 
 import org.junit.Test;
 import org.springframework.beans.BeansException;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostConstructAndAutowiringTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostConstructAndAutowiringTests.java
index eb288746fd2..6972adada9a 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostConstructAndAutowiringTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostConstructAndAutowiringTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertThat;
 import javax.annotation.PostConstruct;
 
 import org.junit.Test;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
index d52a9db656f..815c487294d 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.springframework.context.annotation;
 
 import static org.junit.Assert.*;
 import org.junit.Test;
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 import org.springframework.beans.factory.support.ChildBeanDefinition;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java b/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java
index c01fc14cec5..eab6f37b7fe 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/FooServiceDependentConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import org.springframework.core.convert.converter.Converter;
 /**
  * @author Juergen Hoeller
  */
-public class FooServiceDependentConverter implements Converter {
+public class FooServiceDependentConverter implements Converter {
 
 	private FooService fooService;
 
@@ -32,8 +32,8 @@ public class FooServiceDependentConverter implements Converter
 
-	
+	
 		
 	
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml
index 44fc77e3b5e..1b95433a63e 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml
@@ -5,7 +5,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	
+	
 	
 	
 	
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java
index b23695db3ba..e895a207c3a 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.util.ClassUtils;
 
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * Unit tests cornering the bug exposed in SPR-6779.
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
index 49007b8a348..52aaaac7e91 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,8 +27,8 @@ import org.junit.After;
 import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
-import test.beans.ITestBean;
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 import org.springframework.aop.scope.ScopedObject;
 import org.springframework.beans.factory.ObjectFactory;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation4/FactoryMethodComponent.java b/spring-context/src/test/java/org/springframework/context/annotation4/FactoryMethodComponent.java
index 125c77c6363..6c59cf85228 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation4/FactoryMethodComponent.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation4/FactoryMethodComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.context.annotation4;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
diff --git a/spring-context/src/test/java/org/springframework/context/annotation4/SimpleBean.java b/spring-context/src/test/java/org/springframework/context/annotation4/SimpleBean.java
index b2cc55fec21..fcfe98d94ad 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation4/SimpleBean.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation4/SimpleBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.context.annotation4;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.context.annotation.Bean;
 
 /**
diff --git a/spring-context/src/test/java/org/springframework/context/annotation6/ConfigForScanning.java b/spring-context/src/test/java/org/springframework/context/annotation6/ConfigForScanning.java
index 8dbb67f34ae..42098c96e79 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation6/ConfigForScanning.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation6/ConfigForScanning.java
@@ -3,7 +3,7 @@ package org.springframework.context.annotation6;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 @Configuration
 public class ConfigForScanning {
diff --git a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
index 56233a73730..d124bac8306 100644
--- a/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/ApplicationContextEventTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ import static org.mockito.Mockito.verify;
 import org.junit.Test;
 
 import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.ApplicationContext;
diff --git a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
index 592337551c2..1a0e064b757 100644
--- a/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/event/EventPublicationInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.beans.BeansException;
-import org.springframework.beans.ITestBean;
+import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.beans.MutablePropertyValues;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
diff --git a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
index 3384916c081..17176f9dcd6 100644
--- a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
+++ b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import org.apache.commons.logging.LogFactory;
 import static org.junit.Assert.*;
 import org.junit.Test;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/spring-context/src/test/java/org/springframework/context/expression/EnvironmentAccessorIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/expression/EnvironmentAccessorIntegrationTests.java
index 4dda9faf6c6..152cf5d758d 100644
--- a/spring-context/src/test/java/org/springframework/context/expression/EnvironmentAccessorIntegrationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/expression/EnvironmentAccessorIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.mock.env.MockPropertySource;
 
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 
 /**
diff --git a/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java b/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java
index 8c39e53d32e..152ecfb6ecd 100644
--- a/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import static org.junit.Assert.*;
 
 import org.junit.Test;
 import org.springframework.beans.MutablePropertyValues;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
diff --git a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resource.xml b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resource.xml
index e339891102f..6c959877127 100644
--- a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resource.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resource.xml
@@ -5,7 +5,7 @@
 
 	 
 
-	
+	
 		
 			classpath:org/springframework/beans/factory/xml/test.properties
 		
diff --git a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resourceImport.xml b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resourceImport.xml
index 717148bc4c2..232374bd0ed 100644
--- a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resourceImport.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests-resourceImport.xml
@@ -3,7 +3,7 @@
 
 
 
-	
+	
 		
 			test.properties
 		
diff --git a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java
index 38939c7fcb5..7ff83e35eae 100644
--- a/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ import java.util.Map;
 
 import org.junit.Test;
 import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.ResourceTestBean;
+import org.springframework.tests.sample.beans.ResourceTestBean;
 import org.springframework.beans.TypeMismatchException;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanFactoryUtils;
diff --git a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
index 49fda87dab2..676ff05a305 100644
--- a/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/ConversionServiceFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import java.util.Set;
 
 import org.junit.Test;
 
-import org.springframework.beans.ResourceTestBean;
+import org.springframework.tests.sample.beans.ResourceTestBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.TypeDescriptor;
diff --git a/spring-context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java b/spring-context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java
index 39482f71cfc..24185526d6c 100644
--- a/spring-context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import java.io.FileNotFoundException;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.MutablePropertyValues;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.BeanInitializationException;
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
diff --git a/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
index 3e640d91457..078b1169790 100644
--- a/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ import org.springframework.core.io.Resource;
 import org.springframework.mock.env.MockEnvironment;
 import org.springframework.mock.env.MockPropertySource;
 
-import test.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * Unit tests for {@link PropertySourcesPlaceholderConfigurer}.
diff --git a/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java b/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java
index e03b30eaa68..887c6fc1cc1 100644
--- a/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java
+++ b/spring-context/src/test/java/org/springframework/context/support/SimpleThreadScopeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.context.ApplicationContext;
 
 /**
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
index 39651c9370f..b1f9d24ecd6 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.beans.MutablePropertyValues;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.support.PropertiesBeanDefinitionReader;
 import org.springframework.context.ACATester;
 import org.springframework.context.AbstractApplicationContextTests;
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
index acddae3ff11..bba7f776685 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import java.util.Locale;
 import java.util.Map;
 
 import org.springframework.beans.MutablePropertyValues;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.support.PropertiesBeanDefinitionReader;
 import org.springframework.context.ACATester;
 import org.springframework.context.AbstractApplicationContextTests;
diff --git a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
index 8a94e8326e4..908f5652c12 100644
--- a/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
+++ b/spring-context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -203,9 +203,9 @@ public class StaticMessageSourceTests extends AbstractApplicationContextTests {
 
 		Map m = new HashMap();
 		m.put("name", "Roderick");
-		parent.registerPrototype("rod", org.springframework.beans.TestBean.class, new MutablePropertyValues(m));
+		parent.registerPrototype("rod", org.springframework.tests.sample.beans.TestBean.class, new MutablePropertyValues(m));
 		m.put("name", "Albert");
-		parent.registerPrototype("father", org.springframework.beans.TestBean.class, new MutablePropertyValues(m));
+		parent.registerPrototype("father", org.springframework.tests.sample.beans.TestBean.class, new MutablePropertyValues(m));
 
 		parent.refresh();
 		parent.addApplicationListener(parentListener);
diff --git a/spring-context/src/test/java/org/springframework/context/support/conversionService.xml b/spring-context/src/test/java/org/springframework/context/support/conversionService.xml
index 57c2b5c8af0..bcfae1cdb55 100644
--- a/spring-context/src/test/java/org/springframework/context/support/conversionService.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/conversionService.xml
@@ -5,7 +5,7 @@
 
 	
 
-	
+	
 		
 		
  		
diff --git a/spring-context/src/test/java/org/springframework/context/support/conversionServiceWithResourceOverriding.xml b/spring-context/src/test/java/org/springframework/context/support/conversionServiceWithResourceOverriding.xml
index 5e407ee0be0..5ddcbab67d4 100644
--- a/spring-context/src/test/java/org/springframework/context/support/conversionServiceWithResourceOverriding.xml
+++ b/spring-context/src/test/java/org/springframework/context/support/conversionServiceWithResourceOverriding.xml
@@ -9,7 +9,7 @@
 		
 	
 
-	
+	
 		
 		
  		
diff --git a/spring-context/src/test/java/org/springframework/context/support/testBeans.properties b/spring-context/src/test/java/org/springframework/context/support/testBeans.properties
index 1eab846bc5e..6b9c028005b 100644
--- a/spring-context/src/test/java/org/springframework/context/support/testBeans.properties
+++ b/spring-context/src/test/java/org/springframework/context/support/testBeans.properties
@@ -1,42 +1,42 @@
 # this must only be used for ApplicationContexts, some classes are only appropriate for application contexts
 
-rod.(class)=org.springframework.beans.TestBean
+rod.(class)=org.springframework.tests.sample.beans.TestBean
 rod.name=Rod
 rod.age=31
 
 roderick.(parent)=rod
 roderick.name=Roderick
 
-kerry.(class)=org.springframework.beans.TestBean
+kerry.(class)=org.springframework.tests.sample.beans.TestBean
 kerry.name=Kerry
 kerry.age=34
 kerry.spouse(ref)=rod
 
-kathy.(class)=org.springframework.beans.TestBean
+kathy.(class)=org.springframework.tests.sample.beans.TestBean
 kathy.(singleton)=false
 
-typeMismatch.(class)=org.springframework.beans.TestBean
+typeMismatch.(class)=org.springframework.tests.sample.beans.TestBean
 typeMismatch.name=typeMismatch
 typeMismatch.age=34x
 typeMismatch.spouse(ref)=rod
 typeMismatch.(singleton)=false
 
-validEmpty.(class)=org.springframework.beans.TestBean
+validEmpty.(class)=org.springframework.tests.sample.beans.TestBean
 
-listenerVeto.(class)=org.springframework.beans.TestBean
+listenerVeto.(class)=org.springframework.tests.sample.beans.TestBean
 
 typeMismatch.name=typeMismatch
 typeMismatch.age=34x
 typeMismatch.spouse(ref)=rod
 
-singletonFactory.(class)=org.springframework.beans.factory.DummyFactory
+singletonFactory.(class)=org.springframework.tests.sample.beans.factory.DummyFactory
 singletonFactory.singleton=true
 
-prototypeFactory.(class)=org.springframework.beans.factory.DummyFactory
+prototypeFactory.(class)=org.springframework.tests.sample.beans.factory.DummyFactory
 prototypeFactory.singleton=false
 
-mustBeInitialized.(class)=org.springframework.beans.factory.MustBeInitialized
+mustBeInitialized.(class)=org.springframework.tests.sample.beans.MustBeInitialized
 
 lifecycle.(class)=org.springframework.context.LifecycleContextBean
 
-lifecyclePostProcessor.(class)=org.springframework.beans.factory.LifecycleBean$PostProcessor
+lifecyclePostProcessor.(class)=org.springframework.tests.sample.beans.LifecycleBean$PostProcessor
diff --git a/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java b/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java
index d8c1aa13902..4eea7e81555 100644
--- a/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java
+++ b/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerEventTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,11 +21,11 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
-import org.springframework.beans.factory.parsing.CollectingReaderEventListener;
 import org.springframework.beans.factory.parsing.ComponentDefinition;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.tests.beans.CollectingReaderEventListener;
 
 /**
  * @author Torsten Juergeleit
diff --git a/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerTests.java b/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerTests.java
index 1afb7000f3c..c2430271b43 100644
--- a/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerTests.java
+++ b/spring-context/src/test/java/org/springframework/ejb/config/JeeNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import static org.junit.Assert.*;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.beans.ITestBean;
+import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
@@ -125,7 +125,7 @@ public class JeeNamespaceHandlerTests {
 		assertPropertyValue(beanDefinition, "lookupHomeOnStartup", "true");
 		assertPropertyValue(beanDefinition, "resourceRef", "true");
 		assertPropertyValue(beanDefinition, "jndiEnvironment", "foo=bar");
-		assertPropertyValue(beanDefinition, "homeInterface", "org.springframework.beans.ITestBean");
+		assertPropertyValue(beanDefinition, "homeInterface", "org.springframework.tests.sample.beans.ITestBean");
 		assertPropertyValue(beanDefinition, "refreshHomeOnConnectFailure", "true");
 		assertPropertyValue(beanDefinition, "cacheSessionBean", "true");
 	}
diff --git a/spring-context/src/test/java/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml b/spring-context/src/test/java/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml
index 6d1a3ddf833..e8767251a95 100644
--- a/spring-context/src/test/java/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml
+++ b/spring-context/src/test/java/org/springframework/ejb/config/jeeNamespaceHandlerTests.xml
@@ -41,11 +41,11 @@
 
 	
 	
+			business-interface="org.springframework.tests.sample.beans.ITestBean"/>
 
 	
@@ -54,15 +54,15 @@
 
 	
 	
+			business-interface="org.springframework.tests.sample.beans.ITestBean"/>
 
 	
 		foo=bar
@@ -71,8 +71,8 @@
 	
 	
 	
+		business-interface="org.springframework.tests.sample.beans.ITestBean" lazy-init="true" />
 	
+		business-interface="org.springframework.tests.sample.beans.ITestBean" lazy-init="true" />
 
 
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
index 26b0af991d0..2d7d9e26398 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,6 @@ import javax.management.ObjectName;
 import javax.management.modelmbean.ModelMBeanInfo;
 
 import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.beans.TestBean;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
@@ -48,8 +47,8 @@ import org.springframework.jmx.export.assembler.SimpleReflectiveMBeanInfoAssembl
 import org.springframework.jmx.export.naming.SelfNaming;
 import org.springframework.jmx.support.ObjectNameManager;
 import org.springframework.jmx.support.RegistrationPolicy;
-
-import test.interceptor.NopInterceptor;
+import org.springframework.tests.aop.interceptor.NopInterceptor;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * Integration tests for the {@link MBeanExporter} class.
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
index 4c7c414d850..99cefe71583 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
+++ b/spring-context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
  * use this file except in compliance with the License. You may obtain a copy of
@@ -32,8 +32,7 @@ import org.springframework.jmx.JmxTestBean;
 import org.springframework.jmx.export.MBeanExporter;
 import org.springframework.jmx.export.metadata.JmxAttributeSource;
 import org.springframework.jmx.support.ObjectNameManager;
-
-import test.interceptor.NopInterceptor;
+import org.springframework.tests.aop.interceptor.NopInterceptor;
 
 /**
  * @author Rob Harrop
diff --git a/spring-context/src/test/java/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml b/spring-context/src/test/java/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml
index b108c30e01d..79790d3963b 100644
--- a/spring-context/src/test/java/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml
+++ b/spring-context/src/test/java/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml
@@ -17,7 +17,7 @@
 		
 			
 				
-					
+					
 				
 			
 		
diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java
index a99ef772f01..4ad2255d2c4 100644
--- a/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java
+++ b/spring-context/src/test/java/org/springframework/jndi/JndiObjectFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,10 +26,10 @@ import javax.naming.Context;
 import javax.naming.NamingException;
 
 import org.junit.Test;
-import org.springframework.beans.DerivedTestBean;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
-import org.springframework.mock.jndi.ExpectedLookupTemplate;
+import org.springframework.tests.mock.jndi.ExpectedLookupTemplate;
+import org.springframework.tests.sample.beans.DerivedTestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * @author Rod Johnson
@@ -378,7 +378,7 @@ public class JndiObjectFactoryBeanTests {
 			fail("Should have thrown NamingException");
 		}
 		catch (NamingException ex) {
-			assertTrue(ex.getMessage().indexOf("org.springframework.beans.DerivedTestBean") != -1);
+			assertTrue(ex.getMessage().indexOf("org.springframework.tests.sample.beans.DerivedTestBean") != -1);
 		}
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/jndi/JndiPropertySourceTests.java b/spring-context/src/test/java/org/springframework/jndi/JndiPropertySourceTests.java
index 5148742ca42..ad6ac8871ab 100644
--- a/spring-context/src/test/java/org/springframework/jndi/JndiPropertySourceTests.java
+++ b/spring-context/src/test/java/org/springframework/jndi/JndiPropertySourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import javax.naming.Context;
 import javax.naming.NamingException;
 
 import org.junit.Test;
-import org.springframework.mock.jndi.SimpleNamingContext;
+import org.springframework.tests.mock.jndi.SimpleNamingContext;
 
 /**
  * Unit tests for {@link JndiPropertySource}.
diff --git a/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java b/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java
index 23bac25d536..917e8dc918f 100644
--- a/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java
+++ b/spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,8 +35,8 @@ import javax.sql.DataSource;
 
 import org.junit.Test;
 
-import org.springframework.mock.jndi.SimpleNamingContext;
-import org.springframework.mock.jndi.SimpleNamingContextBuilder;
+import org.springframework.tests.mock.jndi.SimpleNamingContext;
+import org.springframework.tests.mock.jndi.SimpleNamingContextBuilder;
 
 import static org.junit.Assert.*;
 
diff --git a/spring-context/src/test/java/org/springframework/mock/env/MockPropertySource.java b/spring-context/src/test/java/org/springframework/mock/env/MockPropertySource.java
deleted file mode 100644
index 2783f244b18..00000000000
--- a/spring-context/src/test/java/org/springframework/mock/env/MockPropertySource.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.mock.env;
-
-import java.util.Properties;
-
-import org.springframework.core.env.PropertiesPropertySource;
-import org.springframework.core.env.PropertySource;
-
-/**
- * Simple {@link PropertySource} implementation for use in testing. Accepts
- * a user-provided {@link Properties} object, or if omitted during construction,
- * the implementation will initialize its own.
- *
- * The {@link #setProperty} and {@link #withProperty} methods are exposed for
- * convenience, for example:
- * 
- * {@code
- *   PropertySource source = new MockPropertySource().withProperty("foo", "bar");
- * }
- * 

- *
- * @author Chris Beams
- * @since 3.1
- * @see org.springframework.mock.env.MockEnvironment
- */
-public class MockPropertySource extends PropertiesPropertySource {
-
-	/**
-	 * {@value} is the default name for {@link MockPropertySource} instances not
-	 * otherwise given an explicit name.
-	 * @see #MockPropertySource()
-	 * @see #MockPropertySource(String)
-	 */
-	public static final String MOCK_PROPERTIES_PROPERTY_SOURCE_NAME = "mockProperties";
-
-	/**
-	 * Create a new {@code MockPropertySource} named {@value #MOCK_PROPERTIES_PROPERTY_SOURCE_NAME}
-	 * that will maintain its own internal {@link Properties} instance.
-	 */
-	public MockPropertySource() {
-		this(new Properties());
-	}
-
-	/**
-	 * Create a new {@code MockPropertySource} with the given name that will
-	 * maintain its own internal {@link Properties} instance.
-	 * @param name the {@linkplain #getName() name} of the property source
-	 */
-	public MockPropertySource(String name) {
-		this(name, new Properties());
-	}
-
-	/**
-	 * Create a new {@code MockPropertySource} named {@value #MOCK_PROPERTIES_PROPERTY_SOURCE_NAME}
-	 * and backed by the given {@link Properties} object.
-	 * @param properties the properties to use
-	 */
-	public MockPropertySource(Properties properties) {
-		this(MOCK_PROPERTIES_PROPERTY_SOURCE_NAME, properties);
-	}
-
-	/**
-	 * Create a new {@code MockPropertySource} with the given name and backed by the given
-	 * {@link Properties} object
-	 * @param name the {@linkplain #getName() name} of the property source
-	 * @param properties the properties to use
-	 */
-	public MockPropertySource(String name, Properties properties) {
-		super(name, properties);
-	}
-
-	/**
-	 * Set the given property on the underlying {@link Properties} object.
-	 */
-	public void setProperty(String name, Object value) {
-		this.source.put(name, value);
-	}
-
-	/**
-	 * Convenient synonym for {@link #setProperty} that returns the current instance.
-	 * Useful for method chaining and fluent-style use.
-	 * @return this {@link MockPropertySource} instance
-	 */
-	public MockPropertySource withProperty(String name, Object value) {
-		this.setProperty(name, value);
-		return this;
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
deleted file mode 100644
index 71736866063..00000000000
--- a/spring-context/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.mock.jndi;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.naming.NamingException;
-
-import org.springframework.jndi.JndiTemplate;
-
-/**
- * Simple extension of the JndiTemplate class that always returns
- * a given object. Very useful for testing. Effectively a mock object.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public class ExpectedLookupTemplate extends JndiTemplate {
-
-	private final Map jndiObjects = new ConcurrentHashMap();
-
-
-	/**
-	 * Construct a new JndiTemplate that will always return given objects
-	 * for given names. To be populated through {@code addObject} calls.
-	 * @see #addObject(String, Object)
-	 */
-	public ExpectedLookupTemplate() {
-	}
-
-	/**
-	 * Construct a new JndiTemplate that will always return the
-	 * given object, but honour only requests for the given name.
-	 * @param name the name the client is expected to look up
-	 * @param object the object that will be returned
-	 */
-	public ExpectedLookupTemplate(String name, Object object) {
-		addObject(name, object);
-	}
-
-
-	/**
-	 * Add the given object to the list of JNDI objects that this
-	 * template will expose.
-	 * @param name the name the client is expected to look up
-	 * @param object the object that will be returned
-	 */
-	public void addObject(String name, Object object) {
-		this.jndiObjects.put(name, object);
-	}
-
-
-	/**
-	 * If the name is the expected name specified in the constructor,
-	 * return the object provided in the constructor. If the name is
-	 * unexpected, a respective NamingException gets thrown.
-	 */
-	@Override
-	public Object lookup(String name) throws NamingException {
-		Object object = this.jndiObjects.get(name);
-		if (object == null) {
-			throw new NamingException("Unexpected JNDI name '" + name + "': expecting " + this.jndiObjects.keySet());
-		}
-		return object;
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
deleted file mode 100644
index 883db7bfd3f..00000000000
--- a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.mock.jndi;
-
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.spi.InitialContextFactory;
-import javax.naming.spi.InitialContextFactoryBuilder;
-import javax.naming.spi.NamingManager;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.util.ClassUtils;
-
-/**
- * Simple implementation of a JNDI naming context builder.
- *
- * 
Mainly targeted at test environments, where each test case can
- * configure JNDI appropriately, so that {@code new InitialContext()}
- * will expose the required objects. Also usable for standalone applications,
- * e.g. for binding a JDBC DataSource to a well-known JNDI location, to be
- * able to use traditional J2EE data access code outside of a J2EE container.
- *
- * 
There are various choices for DataSource implementations:
- * 
    
- * 
  • SingleConnectionDataSource (using the same Connection for all getConnection calls);
- * 
  • DriverManagerDataSource (creating a new Connection on each getConnection call);
- * 
  • Apache's Jakarta Commons DBCP offers BasicDataSource (a real pool).
- * 

- *
- * 
Typical usage in bootstrap code:
- *
- * 
- * SimpleNamingContextBuilder builder = new SimpleNamingContextBuilder();
- * DataSource ds = new DriverManagerDataSource(...);
- * builder.bind("java:comp/env/jdbc/myds", ds);
- * builder.activate();

- *
- * Note that it's impossible to activate multiple builders within the same JVM,
- * due to JNDI restrictions. Thus to configure a fresh builder repeatedly, use
- * the following code to get a reference to either an already activated builder
- * or a newly activated one:
- *
- * 
- * SimpleNamingContextBuilder builder = SimpleNamingContextBuilder.emptyActivatedContextBuilder();
- * DataSource ds = new DriverManagerDataSource(...);
- * builder.bind("java:comp/env/jdbc/myds", ds);

- *
- * Note that you should not call {@code activate()} on a builder from
- * this factory method, as there will already be an activated one in any case.
- *
- * 
An instance of this class is only necessary at setup time.
- * An application does not need to keep a reference to it after activation.
- *
- * @author Juergen Hoeller
- * @author Rod Johnson
- * @see #emptyActivatedContextBuilder()
- * @see #bind(String, Object)
- * @see #activate()
- * @see SimpleNamingContext
- * @see org.springframework.jdbc.datasource.SingleConnectionDataSource
- * @see org.springframework.jdbc.datasource.DriverManagerDataSource
- * @see org.apache.commons.dbcp.BasicDataSource
- */
-public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder {
-
-	/** An instance of this class bound to JNDI */
-	private static volatile SimpleNamingContextBuilder activated;
-
-	private static boolean initialized = false;
-
-	private static final Object initializationLock = new Object();
-
-
-	/**
-	 * Checks if a SimpleNamingContextBuilder is active.
-	 * @return the current SimpleNamingContextBuilder instance,
-	 * or {@code null} if none
-	 */
-	public static SimpleNamingContextBuilder getCurrentContextBuilder() {
-		return activated;
-	}
-
-	/**
-	 * If no SimpleNamingContextBuilder is already configuring JNDI,
-	 * create and activate one. Otherwise take the existing activate
-	 * SimpleNamingContextBuilder, clear it and return it.
-	 * 
This is mainly intended for test suites that want to
-	 * reinitialize JNDI bindings from scratch repeatedly.
-	 * @return an empty SimpleNamingContextBuilder that can be used
-	 * to control JNDI bindings
-	 */
-	public static SimpleNamingContextBuilder emptyActivatedContextBuilder() throws NamingException {
-		if (activated != null) {
-			// Clear already activated context builder.
-			activated.clear();
-		}
-		else {
-			// Create and activate new context builder.
-			SimpleNamingContextBuilder builder = new SimpleNamingContextBuilder();
-			// The activate() call will cause an assignment to the activated variable.
-			builder.activate();
-		}
-		return activated;
-	}
-
-
-	private final Log logger = LogFactory.getLog(getClass());
-
-	private final Hashtable boundObjects = new Hashtable();
-
-
-	/**
-	 * Register the context builder by registering it with the JNDI NamingManager.
-	 * Note that once this has been done, {@code new InitialContext()} will always
-	 * return a context from this factory. Use the {@code emptyActivatedContextBuilder()}
-	 * static method to get an empty context (for example, in test methods).
-	 * @throws IllegalStateException if there's already a naming context builder
-	 * registered with the JNDI NamingManager
-	 */
-	public void activate() throws IllegalStateException, NamingException {
-		logger.info("Activating simple JNDI environment");
-		synchronized (initializationLock) {
-			if (!initialized) {
-				if (NamingManager.hasInitialContextFactoryBuilder()) {
-					throw new IllegalStateException(
-							"Cannot activate SimpleNamingContextBuilder: there is already a JNDI provider registered. " +
-							"Note that JNDI is a JVM-wide service, shared at the JVM system class loader level, " +
-							"with no reset option. As a consequence, a JNDI provider must only be registered once per JVM.");
-				}
-				NamingManager.setInitialContextFactoryBuilder(this);
-				initialized = true;
-			}
-		}
-		activated = this;
-	}
-
-	/**
-	 * Temporarily deactivate this context builder. It will remain registered with
-	 * the JNDI NamingManager but will delegate to the standard JNDI InitialContextFactory
-	 * (if configured) instead of exposing its own bound objects.
-	 * 
Call {@code activate()} again in order to expose this context builder's own
-	 * bound objects again. Such activate/deactivate sequences can be applied any number
-	 * of times (e.g. within a larger integration test suite running in the same VM).
-	 * @see #activate()
-	 */
-	public void deactivate() {
-		logger.info("Deactivating simple JNDI environment");
-		activated = null;
-	}
-
-	/**
-	 * Clear all bindings in this context builder, while keeping it active.
-	 */
-	public void clear() {
-		this.boundObjects.clear();
-	}
-
-	/**
-	 * Bind the given object under the given name, for all naming contexts
-	 * that this context builder will generate.
-	 * @param name the JNDI name of the object (e.g. "java:comp/env/jdbc/myds")
-	 * @param obj the object to bind (e.g. a DataSource implementation)
-	 */
-	public void bind(String name, Object obj) {
-		if (logger.isInfoEnabled()) {
-			logger.info("Static JNDI binding: [" + name + "] = [" + obj + "]");
-		}
-		this.boundObjects.put(name, obj);
-	}
-
-
-	/**
-	 * Simple InitialContextFactoryBuilder implementation,
-	 * creating a new SimpleNamingContext instance.
-	 * @see SimpleNamingContext
-	 */
-	@Override
-	public InitialContextFactory createInitialContextFactory(Hashtable environment) {
-		if (activated == null && environment != null) {
-			Object icf = environment.get(Context.INITIAL_CONTEXT_FACTORY);
-			if (icf != null) {
-				Class icfClass = null;
-				if (icf instanceof Class) {
-					icfClass = (Class) icf;
-				}
-				else if (icf instanceof String) {
-					icfClass = ClassUtils.resolveClassName((String) icf, getClass().getClassLoader());
-				}
-				else {
-					throw new IllegalArgumentException("Invalid value type for environment key [" +
-							Context.INITIAL_CONTEXT_FACTORY + "]: " + icf.getClass().getName());
-				}
-				if (!InitialContextFactory.class.isAssignableFrom(icfClass)) {
-					throw new IllegalArgumentException(
-							"Specified class does not implement [" + InitialContextFactory.class.getName() + "]: " + icf);
-				}
-				try {
-					return (InitialContextFactory) icfClass.newInstance();
-				}
-				catch (Throwable ex) {
-					IllegalStateException ise =
-							new IllegalStateException("Cannot instantiate specified InitialContextFactory: " + icf);
-					ise.initCause(ex);
-					throw ise;
-				}
-			}
-		}
-
-		// Default case...
-		return new InitialContextFactory() {
-			@Override
-			@SuppressWarnings("unchecked")
-			public Context getInitialContext(Hashtable environment) {
-				return new SimpleNamingContext("", boundObjects, (Hashtable) environment);
-			}
-		};
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/package-info.java b/spring-context/src/test/java/org/springframework/mock/jndi/package-info.java
deleted file mode 100644
index 9c268b0f676..00000000000
--- a/spring-context/src/test/java/org/springframework/mock/jndi/package-info.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * The simplest implementation of the JNDI SPI that could possibly work.
- *
- * 
Useful for setting up a simple JNDI environment for test suites
- * or standalone applications. If e.g. JDBC DataSources get bound to the
- * same JNDI names as within a J2EE container, both application code and
- * configuration can me reused without changes.
- */
-
-package org.springframework.mock.jndi;
diff --git a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
index e0945fab1de..3beaf36b84a 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
+++ b/spring-context/src/test/java/org/springframework/scheduling/timer/TimerSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import java.util.TimerTask;
 
 import junit.framework.TestCase;
 
-import org.springframework.scheduling.TestMethodInvokingTask;
+import org.springframework.tests.context.TestMethodInvokingTask;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-context/src/test/java/org/springframework/scripting/ContextScriptBean.java b/spring-context/src/test/java/org/springframework/scripting/ContextScriptBean.java
index 052209d92f8..8c9a0ae2b87 100644
--- a/spring-context/src/test/java/org/springframework/scripting/ContextScriptBean.java
+++ b/spring-context/src/test/java/org/springframework/scripting/ContextScriptBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.scripting;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.context.ApplicationContext;
 
 /**
diff --git a/spring-context/src/test/java/org/springframework/scripting/TestBeanAwareMessenger.java b/spring-context/src/test/java/org/springframework/scripting/TestBeanAwareMessenger.java
index ddc139475cc..7ea2ee25901 100644
--- a/spring-context/src/test/java/org/springframework/scripting/TestBeanAwareMessenger.java
+++ b/spring-context/src/test/java/org/springframework/scripting/TestBeanAwareMessenger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.scripting;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
index 8add303ba8d..05601840108 100644
--- a/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/bsh/BshScriptFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import junit.framework.TestCase;
 
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.target.dynamic.Refreshable;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/MessengerImpl.bsh b/spring-context/src/test/java/org/springframework/scripting/bsh/MessengerImpl.bsh
index 62bfe8b7bf3..72a1e6a39c4 100644
--- a/spring-context/src/test/java/org/springframework/scripting/bsh/MessengerImpl.bsh
+++ b/spring-context/src/test/java/org/springframework/scripting/bsh/MessengerImpl.bsh
@@ -1,4 +1,4 @@
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.scripting.TestBeanAwareMessenger;
 
 public class MyMessenger implements TestBeanAwareMessenger {
diff --git a/spring-context/src/test/java/org/springframework/scripting/bsh/bsh-with-xsd.xml b/spring-context/src/test/java/org/springframework/scripting/bsh/bsh-with-xsd.xml
index 5908749d75c..116a7d6ab44 100644
--- a/spring-context/src/test/java/org/springframework/scripting/bsh/bsh-with-xsd.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/bsh/bsh-with-xsd.xml
@@ -36,7 +36,7 @@
 			autowire="byName" init-method="init" destroy-method="destroy">
 	
 
-	
+	
 
 	
 		
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
index 86214124a8e..e472a7064ee 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
@@ -36,7 +36,7 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.target.dynamic.Refreshable;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.UnsatisfiedDependencyException;
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/ScriptBean.groovy b/spring-context/src/test/java/org/springframework/scripting/groovy/ScriptBean.groovy
index d1b82bfece9..0b0116d2e10 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/ScriptBean.groovy
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/ScriptBean.groovy
@@ -1,4 +1,4 @@
-import org.springframework.beans.TestBean
+import org.springframework.tests.sample.beans.TestBean
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContextAware
 import org.springframework.scripting.ContextScriptBean
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-multiple-properties.xml b/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-multiple-properties.xml
index 58ce5e022aa..eaad85d1f8c 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-multiple-properties.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/groovy-multiple-properties.xml
@@ -19,6 +19,6 @@
 		
 	
 
-	
+	
 
 
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-beanNameAutoProxyCreator.xml b/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-beanNameAutoProxyCreator.xml
index a8afa2447f8..1516ac2dbc4 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-beanNameAutoProxyCreator.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-beanNameAutoProxyCreator.xml
@@ -16,6 +16,6 @@
 		
 	
 
-	
+	
 
 
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-factoryBean.xml b/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-factoryBean.xml
index 3744ad4ea62..2cd55ee7df6 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-factoryBean.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests-factoryBean.xml
@@ -16,6 +16,6 @@
 		
 	
 
-	
+	
 
 
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests.java
index a3791761801..0e29267700c 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/AdvisedJRubyScriptFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,10 +25,9 @@ import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.scripting.Messenger;
+import org.springframework.tests.aop.advice.CountingBeforeAdvice;
 import org.springframework.util.MBeanTestUtils;
 
-import test.advice.CountingBeforeAdvice;
-
 /**
  * @author Rob Harrop
  * @author Chris Beams
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
index dd338997f0f..8071e6309e7 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.target.dynamic.Refreshable;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/jruby-with-xsd.xml b/spring-context/src/test/java/org/springframework/scripting/jruby/jruby-with-xsd.xml
index 13f5d3c9aa0..5df3894c087 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/jruby-with-xsd.xml
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/jruby-with-xsd.xml
@@ -28,7 +28,7 @@
 			autowire="byName">
 	
 
-	
+	
 
 	
diff --git a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java b/spring-context/src/test/java/org/springframework/tests/context/SimpleMapScope.java
similarity index 95%
rename from spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
rename to spring-context/src/test/java/org/springframework/tests/context/SimpleMapScope.java
index 71b565f900c..9b63bfc3332 100644
--- a/spring-context/src/test/java/org/springframework/beans/factory/config/SimpleMapScope.java
+++ b/spring-context/src/test/java/org/springframework/tests/context/SimpleMapScope.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans.factory.config;
+package org.springframework.tests.context;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.config.Scope;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-context/src/test/java/org/springframework/scheduling/TestMethodInvokingTask.java b/spring-context/src/test/java/org/springframework/tests/context/TestMethodInvokingTask.java
similarity index 96%
rename from spring-context/src/test/java/org/springframework/scheduling/TestMethodInvokingTask.java
rename to spring-context/src/test/java/org/springframework/tests/context/TestMethodInvokingTask.java
index a95a2408b54..118feabbc33 100644
--- a/spring-context/src/test/java/org/springframework/scheduling/TestMethodInvokingTask.java
+++ b/spring-context/src/test/java/org/springframework/tests/context/TestMethodInvokingTask.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.scheduling;
+package org.springframework.tests.context;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java b/spring-context/src/test/java/org/springframework/tests/mock/jndi/ExpectedLookupTemplate.java
similarity index 98%
rename from spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
rename to spring-context/src/test/java/org/springframework/tests/mock/jndi/ExpectedLookupTemplate.java
index 71736866063..a4e8932e26d 100644
--- a/spring-tx/src/test/java/org/springframework/mock/jndi/ExpectedLookupTemplate.java
+++ b/spring-context/src/test/java/org/springframework/tests/mock/jndi/ExpectedLookupTemplate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.mock.jndi;
+package org.springframework.tests.mock.jndi;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-context/src/test/java/org/springframework/tests/mock/jndi/SimpleNamingContext.java
similarity index 98%
rename from spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
rename to spring-context/src/test/java/org/springframework/tests/mock/jndi/SimpleNamingContext.java
index 4e1641b2cd8..bdad96e32d0 100644
--- a/spring-context/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
+++ b/spring-context/src/test/java/org/springframework/tests/mock/jndi/SimpleNamingContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.mock.jndi;
+package org.springframework.tests.mock.jndi;
 
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -149,7 +149,7 @@ public class SimpleNamingContext implements Context {
 	 * Note: Not intended for direct use by applications
 	 * if setting up a JVM-level JNDI environment.
 	 * Use SimpleNamingContextBuilder to set up JNDI bindings then.
-	 * @see org.springframework.mock.jndi.SimpleNamingContextBuilder#bind
+	 * @see org.springframework.tests.mock.jndi.SimpleNamingContextBuilder#bind
 	 */
 	@Override
 	public void bind(String name, Object obj) {
diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java b/spring-context/src/test/java/org/springframework/tests/mock/jndi/SimpleNamingContextBuilder.java
similarity index 99%
rename from spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
rename to spring-context/src/test/java/org/springframework/tests/mock/jndi/SimpleNamingContextBuilder.java
index 883db7bfd3f..3d1452ac29f 100644
--- a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContextBuilder.java
+++ b/spring-context/src/test/java/org/springframework/tests/mock/jndi/SimpleNamingContextBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.mock.jndi;
+package org.springframework.tests.mock.jndi;
 
 import java.util.Hashtable;
 
diff --git a/spring-aop/src/test/java/test/beans/Person.java b/spring-context/src/test/java/org/springframework/tests/mock/jndi/package-info.java
similarity index 62%
rename from spring-aop/src/test/java/test/beans/Person.java
rename to spring-context/src/test/java/org/springframework/tests/mock/jndi/package-info.java
index 974d7d9b772..8847baab541 100644
--- a/spring-aop/src/test/java/test/beans/Person.java
+++ b/spring-context/src/test/java/org/springframework/tests/mock/jndi/package-info.java
@@ -14,23 +14,12 @@
  * limitations under the License.
  */
 
-package test.beans;
-
 /**
+ * The simplest implementation of the JNDI SPI that could possibly work.
  *
- * @author Rod Johnson
+ * 
Useful for setting up a simple JNDI environment for test suites
+ * or standalone applications. If e.g. JDBC DataSources get bound to the
+ * same JNDI names as within a J2EE container, both application code and
+ * configuration can me reused without changes.
  */
-public interface Person {
-
-	String getName();
-	void setName(String name);
-	int getAge();
-	void setAge(int i);
-
-	/**
-	 * Test for non-property method matching.
-	 * If the parameter is a Throwable, it will be thrown rather than
-	 * returned.
-	 */
-	Object echo(Object o) throws Throwable;
-}
\ No newline at end of file
+package org.springframework.tests.mock.jndi;
diff --git a/spring-context/src/test/java/org/springframework/beans/BeanWithObjectProperty.java b/spring-context/src/test/java/org/springframework/tests/sample/beans/BeanWithObjectProperty.java
similarity index 94%
rename from spring-context/src/test/java/org/springframework/beans/BeanWithObjectProperty.java
rename to spring-context/src/test/java/org/springframework/tests/sample/beans/BeanWithObjectProperty.java
index bb5e71f5cd0..4448962d49c 100644
--- a/spring-context/src/test/java/org/springframework/beans/BeanWithObjectProperty.java
+++ b/spring-context/src/test/java/org/springframework/tests/sample/beans/BeanWithObjectProperty.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans;
+package org.springframework.tests.sample.beans;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-context/src/test/java/test/beans/Employee.java b/spring-context/src/test/java/org/springframework/tests/sample/beans/Employee.java
similarity index 89%
rename from spring-context/src/test/java/test/beans/Employee.java
rename to spring-context/src/test/java/org/springframework/tests/sample/beans/Employee.java
index 537a5a88335..7bed71f394b 100644
--- a/spring-context/src/test/java/test/beans/Employee.java
+++ b/spring-context/src/test/java/org/springframework/tests/sample/beans/Employee.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package test.beans;
+package org.springframework.tests.sample.beans;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 public class Employee extends TestBean {
 
diff --git a/spring-context/src/test/java/test/beans/FactoryMethods.java b/spring-context/src/test/java/org/springframework/tests/sample/beans/FactoryMethods.java
similarity index 95%
rename from spring-context/src/test/java/test/beans/FactoryMethods.java
rename to spring-context/src/test/java/org/springframework/tests/sample/beans/FactoryMethods.java
index 8e0f55ce777..a98548867aa 100644
--- a/spring-context/src/test/java/test/beans/FactoryMethods.java
+++ b/spring-context/src/test/java/org/springframework/tests/sample/beans/FactoryMethods.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package test.beans;
+package org.springframework.tests.sample.beans;
 
 /**
  * Test class for Spring's ability to create objects using static
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/FieldAccessBean.java b/spring-context/src/test/java/org/springframework/tests/sample/beans/FieldAccessBean.java
similarity index 94%
rename from spring-webmvc/src/test/java/org/springframework/beans/FieldAccessBean.java
rename to spring-context/src/test/java/org/springframework/tests/sample/beans/FieldAccessBean.java
index 61f911902c7..a250f329cbd 100644
--- a/spring-webmvc/src/test/java/org/springframework/beans/FieldAccessBean.java
+++ b/spring-context/src/test/java/org/springframework/tests/sample/beans/FieldAccessBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans;
+package org.springframework.tests.sample.beans;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-context/src/test/java/org/springframework/beans/ResourceTestBean.java b/spring-context/src/test/java/org/springframework/tests/sample/beans/ResourceTestBean.java
similarity index 97%
rename from spring-context/src/test/java/org/springframework/beans/ResourceTestBean.java
rename to spring-context/src/test/java/org/springframework/tests/sample/beans/ResourceTestBean.java
index 0831e05c584..a5b1eef734e 100644
--- a/spring-context/src/test/java/org/springframework/beans/ResourceTestBean.java
+++ b/spring-context/src/test/java/org/springframework/tests/sample/beans/ResourceTestBean.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.beans;
+package org.springframework.tests.sample.beans;
 
 import java.io.InputStream;
 import java.util.Map;
diff --git a/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java
index 09a8c6aaa8d..7b159f3b3a0 100644
--- a/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java
+++ b/spring-context/src/test/java/org/springframework/ui/ModelMapTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ import java.util.Map;
 
 import org.junit.Test;
 import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
diff --git a/spring-context/src/test/java/org/springframework/util/SerializationTestUtils.java b/spring-context/src/test/java/org/springframework/util/SerializationTestUtils.java
deleted file mode 100644
index b20121d864c..00000000000
--- a/spring-context/src/test/java/org/springframework/util/SerializationTestUtils.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.NotSerializableException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-
-/**
- * Utilities for testing serializability of objects.
- * Exposes static methods for use in other test cases.
- *
- * @author Rod Johnson
- */
-public class SerializationTestUtils {
-
-	public static void testSerialization(Object o) throws IOException {
-		OutputStream baos = new ByteArrayOutputStream();
-		ObjectOutputStream oos = new ObjectOutputStream(baos);
-		oos.writeObject(o);
-	}
-
-	public static boolean isSerializable(Object o) throws IOException {
-		try {
-			testSerialization(o);
-			return true;
-		}
-		catch (NotSerializableException ex) {
-			return false;
-		}
-	}
-
-	public static Object serializeAndDeserialize(Object o) throws IOException, ClassNotFoundException {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ObjectOutputStream oos = new ObjectOutputStream(baos);
-		oos.writeObject(o);
-		oos.flush();
-		baos.flush();
-		byte[] bytes = baos.toByteArray();
-
-		ByteArrayInputStream is = new ByteArrayInputStream(bytes);
-		ObjectInputStream ois = new ObjectInputStream(is);
-		Object o2 = ois.readObject();
-		return o2;
-	}
-
-}
diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java
index e64219c59ca..bf2031ba53a 100644
--- a/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/DataBinderFieldAccessTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,11 +21,11 @@ import java.util.Map;
 
 import junit.framework.TestCase;
 
-import org.springframework.beans.FieldAccessBean;
+import org.springframework.tests.sample.beans.FieldAccessBean;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.NotWritablePropertyException;
 import org.springframework.beans.PropertyValue;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
index 9107bb3a59d..515a1013b02 100644
--- a/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/DataBinderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,16 +37,16 @@ import java.util.TreeSet;
 
 import junit.framework.TestCase;
 
-import org.springframework.beans.BeanWithObjectProperty;
-import org.springframework.beans.DerivedTestBean;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.IndexedTestBean;
+import org.springframework.tests.sample.beans.BeanWithObjectProperty;
+import org.springframework.tests.sample.beans.DerivedTestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.IndexedTestBean;
 import org.springframework.beans.InvalidPropertyException;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.NotWritablePropertyException;
 import org.springframework.beans.NullValueInNestedPathException;
-import org.springframework.beans.SerializablePerson;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.SerializablePerson;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.propertyeditors.CustomCollectionEditor;
 import org.springframework.beans.propertyeditors.CustomNumberEditor;
 import org.springframework.context.i18n.LocaleContextHolder;
@@ -1196,8 +1196,8 @@ public class DataBinderTests extends TestCase {
 		pvs.add("array[0].nestedIndexedBean.list[0].name", "test1");
 		pvs.add("array[1].nestedIndexedBean.list[1].name", "test2");
 		binder.bind(pvs);
-		assertEquals("listtest1", tb.getArray()[0].getNestedIndexedBean().getList().get(0).getName());
-		assertEquals("listtest2", tb.getArray()[1].getNestedIndexedBean().getList().get(1).getName());
+		assertEquals("listtest1", ((TestBean)tb.getArray()[0].getNestedIndexedBean().getList().get(0)).getName());
+		assertEquals("listtest2", ((TestBean)tb.getArray()[1].getNestedIndexedBean().getList().get(1)).getName());
 		assertEquals("test1", binder.getBindingResult().getFieldValue("array[0].nestedIndexedBean.list[0].name"));
 		assertEquals("test2", binder.getBindingResult().getFieldValue("array[1].nestedIndexedBean.list[1].name"));
 	}
@@ -1221,8 +1221,8 @@ public class DataBinderTests extends TestCase {
 		pvs.add("array[0].nestedIndexedBean.list[0].name", "test1");
 		pvs.add("array[1].nestedIndexedBean.list[1].name", "test2");
 		binder.bind(pvs);
-		assertEquals("listtest1", tb.getArray()[0].getNestedIndexedBean().getList().get(0).getName());
-		assertEquals("test2", tb.getArray()[1].getNestedIndexedBean().getList().get(1).getName());
+		assertEquals("listtest1", ((TestBean)tb.getArray()[0].getNestedIndexedBean().getList().get(0)).getName());
+		assertEquals("test2", ((TestBean)tb.getArray()[1].getNestedIndexedBean().getList().get(1)).getName());
 		assertEquals("test1", binder.getBindingResult().getFieldValue("array[0].nestedIndexedBean.list[0].name"));
 		assertEquals("test2", binder.getBindingResult().getFieldValue("array[1].nestedIndexedBean.list[1].name"));
 	}
@@ -1246,8 +1246,8 @@ public class DataBinderTests extends TestCase {
 		pvs.add("array[0].nestedIndexedBean.list[0].name", "test1");
 		pvs.add("array[1].nestedIndexedBean.list[1].name", "test2");
 		binder.bind(pvs);
-		assertEquals("listtest1", tb.getArray()[0].getNestedIndexedBean().getList().get(0).getName());
-		assertEquals("test2", tb.getArray()[1].getNestedIndexedBean().getList().get(1).getName());
+		assertEquals("listtest1", ((TestBean)tb.getArray()[0].getNestedIndexedBean().getList().get(0)).getName());
+		assertEquals("test2", ((TestBean)tb.getArray()[1].getNestedIndexedBean().getList().get(1)).getName());
 		assertEquals("test1", binder.getBindingResult().getFieldValue("array[0].nestedIndexedBean.list[0].name"));
 		assertEquals("test2", binder.getBindingResult().getFieldValue("array[1].nestedIndexedBean.list[1].name"));
 	}
@@ -1282,7 +1282,7 @@ public class DataBinderTests extends TestCase {
 		assertEquals("NOT_ROD.tb.array", errors.getFieldError("array[0]").getCodes()[1]);
 		assertEquals("NOT_ROD.array[0]", errors.getFieldError("array[0]").getCodes()[2]);
 		assertEquals("NOT_ROD.array", errors.getFieldError("array[0]").getCodes()[3]);
-		assertEquals("NOT_ROD.org.springframework.beans.DerivedTestBean", errors.getFieldError("array[0]").getCodes()[4]);
+		assertEquals("NOT_ROD.org.springframework.tests.sample.beans.DerivedTestBean", errors.getFieldError("array[0]").getCodes()[4]);
 		assertEquals("NOT_ROD", errors.getFieldError("array[0]").getCodes()[5]);
 		assertEquals("arraya", errors.getFieldValue("array[0]"));
 
@@ -1292,7 +1292,7 @@ public class DataBinderTests extends TestCase {
 		assertEquals("NOT_ROD.tb.map", errors.getFieldError("map[key1]").getCodes()[1]);
 		assertEquals("NOT_ROD.map[key1]", errors.getFieldError("map[key1]").getCodes()[2]);
 		assertEquals("NOT_ROD.map", errors.getFieldError("map[key1]").getCodes()[3]);
-		assertEquals("NOT_ROD.org.springframework.beans.TestBean", errors.getFieldError("map[key1]").getCodes()[4]);
+		assertEquals("NOT_ROD.org.springframework.tests.sample.beans.TestBean", errors.getFieldError("map[key1]").getCodes()[4]);
 		assertEquals("NOT_ROD", errors.getFieldError("map[key1]").getCodes()[5]);
 
 		assertEquals(1, errors.getFieldErrorCount("map[key0]"));
@@ -1330,7 +1330,7 @@ public class DataBinderTests extends TestCase {
 		assertEquals("NOT_NULL.map", errors.getFieldError("map[key0]").getCodes()[3]);
 		// This next code is only generated because of the registered editor, using the
 		// registered type of the editor as guess for the content type of the collection.
-		assertEquals("NOT_NULL.org.springframework.beans.TestBean", errors.getFieldError("map[key0]").getCodes()[4]);
+		assertEquals("NOT_NULL.org.springframework.tests.sample.beans.TestBean", errors.getFieldError("map[key0]").getCodes()[4]);
 		assertEquals("NOT_NULL", errors.getFieldError("map[key0]").getCodes()[5]);
 	}
 
@@ -1360,7 +1360,7 @@ public class DataBinderTests extends TestCase {
 		assertEquals("NOT_NULL.map", errors.getFieldError("map[key0]").getCodes()[3]);
 		// This next code is only generated because of the registered editor, using the
 		// registered type of the editor as guess for the content type of the collection.
-		assertEquals("NOT_NULL.org.springframework.beans.TestBean", errors.getFieldError("map[key0]").getCodes()[4]);
+		assertEquals("NOT_NULL.org.springframework.tests.sample.beans.TestBean", errors.getFieldError("map[key0]").getCodes()[4]);
 		assertEquals("NOT_NULL", errors.getFieldError("map[key0]").getCodes()[5]);
 	}
 
@@ -1392,7 +1392,7 @@ public class DataBinderTests extends TestCase {
 		assertEquals("NOT_ROD.tb.array", errors.getFieldError("array[0]").getCodes()[1]);
 		assertEquals("NOT_ROD.array[0]", errors.getFieldError("array[0]").getCodes()[2]);
 		assertEquals("NOT_ROD.array", errors.getFieldError("array[0]").getCodes()[3]);
-		assertEquals("NOT_ROD.org.springframework.beans.DerivedTestBean", errors.getFieldError("array[0]").getCodes()[4]);
+		assertEquals("NOT_ROD.org.springframework.tests.sample.beans.DerivedTestBean", errors.getFieldError("array[0]").getCodes()[4]);
 		assertEquals("NOT_ROD", errors.getFieldError("array[0]").getCodes()[5]);
 		assertEquals("arraya", errors.getFieldValue("array[0]"));
 	}
diff --git a/spring-context/src/test/java/org/springframework/validation/DefaultMessageCodesResolverTests.java b/spring-context/src/test/java/org/springframework/validation/DefaultMessageCodesResolverTests.java
index d5e094a2e1f..947677717ce 100644
--- a/spring-context/src/test/java/org/springframework/validation/DefaultMessageCodesResolverTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/DefaultMessageCodesResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
 import org.junit.Test;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.validation.DefaultMessageCodesResolver.Format;
 
 /**
@@ -48,7 +48,7 @@ public class DefaultMessageCodesResolverTests {
 		assertThat(codes, is(equalTo(new String[] {
 				"errorCode.objectName.field",
 				"errorCode.field",
-				"errorCode.org.springframework.beans.TestBean",
+				"errorCode.org.springframework.tests.sample.beans.TestBean",
 				"errorCode" })));
 	}
 
@@ -64,7 +64,7 @@ public class DefaultMessageCodesResolverTests {
 				"errorCode.a.b[3].c.d",
 				"errorCode.a.b.c.d",
 				"errorCode.d",
-				"errorCode.org.springframework.beans.TestBean",
+				"errorCode.org.springframework.tests.sample.beans.TestBean",
 				"errorCode" })));
 	}
 
@@ -85,7 +85,7 @@ public class DefaultMessageCodesResolverTests {
 		assertThat(codes, is(equalTo(new String[] {
 				"prefix.errorCode.objectName.field",
 				"prefix.errorCode.field",
-				"prefix.errorCode.org.springframework.beans.TestBean",
+				"prefix.errorCode.org.springframework.tests.sample.beans.TestBean",
 				"prefix.errorCode" })));
 	}
 
@@ -97,7 +97,7 @@ public class DefaultMessageCodesResolverTests {
 		assertThat(codes, is(equalTo(new String[] {
 				"errorCode.objectName.field",
 				"errorCode.field",
-				"errorCode.org.springframework.beans.TestBean",
+				"errorCode.org.springframework.tests.sample.beans.TestBean",
 				"errorCode" })));
 	}
 
@@ -108,7 +108,7 @@ public class DefaultMessageCodesResolverTests {
 		assertThat(codes, is(equalTo(new String[] {
 				"errorCode.objectName.field[",
 				"errorCode.field[",
-				"errorCode.org.springframework.beans.TestBean",
+				"errorCode.org.springframework.tests.sample.beans.TestBean",
 				"errorCode" })));
 	}
 
@@ -139,7 +139,7 @@ public class DefaultMessageCodesResolverTests {
 		assertThat(codes, is(equalTo(new String[] {
 				"objectName.field.errorCode",
 				"field.errorCode",
-				"org.springframework.beans.TestBean.errorCode",
+				"org.springframework.tests.sample.beans.TestBean.errorCode",
 				"errorCode" })));
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java b/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java
index 1c7fe2c708e..83a36cf9558 100644
--- a/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/ValidationUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ package org.springframework.validation;
 import static org.junit.Assert.*;
 
 import org.junit.Test;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * Unit tests for {@link ValidationUtils}.
diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessorTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessorTests.java
index b98fb420072..6d831328c18 100644
--- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessorTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/BeanValidationPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import javax.validation.constraints.Size;
 import static org.junit.Assert.*;
 import org.junit.Test;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.annotation.CommonAnnotationBeanPostProcessor;
diff --git a/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java b/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java
deleted file mode 100644
index a8a3a01e3a3..00000000000
--- a/spring-context/src/test/java/test/advice/CountingAfterReturningAdvice.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.advice;
-
-import java.lang.reflect.Method;
-
-import org.springframework.aop.AfterReturningAdvice;
-
-/**
- * Simple before advice example that we can use for counting checks.
- *
- * @author Rod Johnson
- */
-@SuppressWarnings("serial")
-public class CountingAfterReturningAdvice extends MethodCounter implements AfterReturningAdvice {
-
-	@Override
-	public void afterReturning(Object o, Method m, Object[] args, Object target) throws Throwable {
-		count(m);
-	}
-
-}
\ No newline at end of file
diff --git a/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java b/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java
deleted file mode 100644
index 5aa37b61e14..00000000000
--- a/spring-context/src/test/java/test/advice/CountingBeforeAdvice.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.advice;
-
-import java.lang.reflect.Method;
-
-import org.springframework.aop.MethodBeforeAdvice;
-
-/**
- * Simple before advice example that we can use for counting checks.
- *
- * @author Rod Johnson
- */
-@SuppressWarnings("serial")
-public class CountingBeforeAdvice extends MethodCounter implements MethodBeforeAdvice {
-
-	@Override
-	public void before(Method m, Object[] args, Object target) throws Throwable {
-		count(m);
-	}
-
-}
diff --git a/spring-context/src/test/java/test/advice/MethodCounter.java b/spring-context/src/test/java/test/advice/MethodCounter.java
deleted file mode 100644
index e0e45d6f142..00000000000
--- a/spring-context/src/test/java/test/advice/MethodCounter.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.advice;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-
-/**
- * Abstract superclass for counting advices etc.
- *
- * @author Rod Johnson
- * @author Chris Beams
- */
-@SuppressWarnings("serial")
-public class MethodCounter implements Serializable {
-
-	/** Method name --> count, does not understand overloading */
-	private HashMap map = new HashMap();
-
-	private int allCount;
-
-	protected void count(Method m) {
-		count(m.getName());
-	}
-
-	protected void count(String methodName) {
-		Integer i = map.get(methodName);
-		i = (i != null) ? new Integer(i.intValue() + 1) : new Integer(1);
-		map.put(methodName, i);
-		++allCount;
-	}
-
-	public int getCalls(String methodName) {
-		Integer i = map.get(methodName);
-		return (i != null ? i.intValue() : 0);
-	}
-
-	public int getCalls() {
-		return allCount;
-	}
-
-	/**
-	 * A bit simplistic: just wants the same class.
-	 * Doesn't worry about counts.
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object other) {
-		return (other != null && other.getClass() == this.getClass());
-	}
-
-	public int hashCode() {
-		return getClass().hashCode();
-	}
-
-}
diff --git a/spring-context/src/test/java/test/beans/Colour.java b/spring-context/src/test/java/test/beans/Colour.java
deleted file mode 100644
index 193531bcbd0..00000000000
--- a/spring-context/src/test/java/test/beans/Colour.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2002-2008 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package test.beans;
-
-import org.springframework.core.enums.ShortCodedLabeledEnum;
-
-/**
- * @author Rob Harrop
- */
-@SuppressWarnings({ "serial", "deprecation" })
-public class Colour extends ShortCodedLabeledEnum {
-
-	public static final Colour RED = new Colour(0, "RED");
-
-	public static final Colour BLUE = new Colour(1, "BLUE");
-
-	public static final Colour GREEN = new Colour(2, "GREEN");
-
-	public static final Colour PURPLE = new Colour(3, "PURPLE");
-
-	private Colour(int code, String label) {
-		super(code, label);
-	}
-}
diff --git a/spring-context/src/test/java/test/beans/CustomScope.java b/spring-context/src/test/java/test/beans/CustomScope.java
deleted file mode 100644
index 32de2322644..00000000000
--- a/spring-context/src/test/java/test/beans/CustomScope.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package test.beans;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.beans.factory.config.Scope;
-
-/**
- * Simple scope implementation which creates object based on a flag.
- *
- * @author  Costin Leau
- * @author  Chris Beams
- */
-public class CustomScope implements Scope {
-
-	public boolean createNewScope = true;
-
-	private Map beans = new HashMap();
-
-	@Override
-	public Object get(String name, ObjectFactory objectFactory) {
-		if (createNewScope) {
-			beans.clear();
-			// reset the flag back
-			createNewScope = false;
-		}
-
-		Object bean = beans.get(name);
-		// if a new object is requested or none exists under the current
-		// name, create one
-		if (bean == null) {
-			beans.put(name, objectFactory.getObject());
-		}
-
-		return beans.get(name);
-	}
-
-	@Override
-	public String getConversationId() {
-		return null;
-	}
-
-	@Override
-	public void registerDestructionCallback(String name, Runnable callback) {
-		// do nothing
-	}
-
-	@Override
-	public Object remove(String name) {
-		return beans.remove(name);
-	}
-
-	@Override
-	public Object resolveContextualObject(String key) {
-		return null;
-	}
-
-}
diff --git a/spring-context/src/test/java/test/beans/DependsOnTestBean.java b/spring-context/src/test/java/test/beans/DependsOnTestBean.java
deleted file mode 100644
index d784bae712d..00000000000
--- a/spring-context/src/test/java/test/beans/DependsOnTestBean.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2008 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package test.beans;
-
-public class DependsOnTestBean {
-
-	public TestBean tb;
-
-	private int state;
-
-	public void setTestBean(TestBean tb) {
-		this.tb = tb;
-	}
-
-	public int getState() {
-		return state;
-	}
-
-	public TestBean getTestBean() {
-		return tb;
-	}
-
-}
diff --git a/spring-context/src/test/java/test/beans/INestedTestBean.java b/spring-context/src/test/java/test/beans/INestedTestBean.java
deleted file mode 100644
index 4cdf0cfc5cc..00000000000
--- a/spring-context/src/test/java/test/beans/INestedTestBean.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2002-2008 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package test.beans;
-
-public interface INestedTestBean {
-
-	String getCompany();
-
-}
diff --git a/spring-context/src/test/java/test/beans/IOther.java b/spring-context/src/test/java/test/beans/IOther.java
deleted file mode 100644
index cfd81f2bad3..00000000000
--- a/spring-context/src/test/java/test/beans/IOther.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2002-2008 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package test.beans;
-
-public interface IOther {
-
-	void absquatulate();
-
-}
diff --git a/spring-context/src/test/java/test/beans/ITestBean.java b/spring-context/src/test/java/test/beans/ITestBean.java
deleted file mode 100644
index 242d5e38503..00000000000
--- a/spring-context/src/test/java/test/beans/ITestBean.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package test.beans;
-
-import java.io.IOException;
-
-
-/**
- * Interface used for test beans. Two methods are the same as on Person, but if this extends
- * person it breaks quite a few tests
- *
- * @author Rod Johnson
- */
-public interface ITestBean {
-
-	int getAge();
-
-	void setAge(int age);
-
-	String getName();
-
-	void setName(String name);
-
-	ITestBean getSpouse();
-
-	void setSpouse(ITestBean spouse);
-
-	/**
-	 * t null no error.
-	 */
-	void exceptional(Throwable t) throws Throwable;
-
-	Object returnsThis();
-
-	INestedTestBean getDoctor();
-
-	INestedTestBean getLawyer();
-
-	IndexedTestBean getNestedIndexedBean();
-
-	/**
-	 * Increment the age by one.
-	 *
-	 * @return the previous age
-	 */
-	int haveBirthday();
-
-	void unreliableFileOperation() throws IOException;
-}
diff --git a/spring-context/src/test/java/test/beans/IndexedTestBean.java b/spring-context/src/test/java/test/beans/IndexedTestBean.java
deleted file mode 100644
index 8cef5b23217..00000000000
--- a/spring-context/src/test/java/test/beans/IndexedTestBean.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright 2002-2008 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package test.beans;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-
-/**
- * @author Juergen Hoeller
- * @since 11.11.2003
- */
-public class IndexedTestBean {
-
-	private TestBean[] array;
-
-	private Collection collection;
-
-	private List list;
-
-	private Set set;
-
-	private SortedSet sortedSet;
-
-	private Map map;
-
-	private SortedMap sortedMap;
-
-	public IndexedTestBean() {
-		this(true);
-	}
-
-	public IndexedTestBean(boolean populate) {
-		if (populate) {
-			populate();
-		}
-	}
-
-	public void populate() {
-		TestBean tb0 = new TestBean("name0", 0);
-		TestBean tb1 = new TestBean("name1", 0);
-		TestBean tb2 = new TestBean("name2", 0);
-		TestBean tb3 = new TestBean("name3", 0);
-		TestBean tb4 = new TestBean("name4", 0);
-		TestBean tb5 = new TestBean("name5", 0);
-		TestBean tb6 = new TestBean("name6", 0);
-		TestBean tb7 = new TestBean("name7", 0);
-		TestBean tbX = new TestBean("nameX", 0);
-		TestBean tbY = new TestBean("nameY", 0);
-		this.array = new TestBean[] { tb0, tb1 };
-		this.list = new ArrayList();
-		this.list.add(tb2);
-		this.list.add(tb3);
-		this.set = new TreeSet();
-		this.set.add(tb6);
-		this.set.add(tb7);
-		this.map = new HashMap();
-		this.map.put("key1", tb4);
-		this.map.put("key2", tb5);
-		this.map.put("key.3", tb5);
-		List list = new ArrayList();
-		list.add(tbX);
-		list.add(tbY);
-		this.map.put("key4", list);
-	}
-
-	public TestBean[] getArray() {
-		return array;
-	}
-
-	public void setArray(TestBean[] array) {
-		this.array = array;
-	}
-
-	public Collection getCollection() {
-		return collection;
-	}
-
-	public void setCollection(Collection collection) {
-		this.collection = collection;
-	}
-
-	public List getList() {
-		return list;
-	}
-
-	public void setList(List list) {
-		this.list = list;
-	}
-
-	public Set getSet() {
-		return set;
-	}
-
-	public void setSet(Set set) {
-		this.set = set;
-	}
-
-	public SortedSet getSortedSet() {
-		return sortedSet;
-	}
-
-	public void setSortedSet(SortedSet sortedSet) {
-		this.sortedSet = sortedSet;
-	}
-
-	public Map getMap() {
-		return map;
-	}
-
-	public void setMap(Map map) {
-		this.map = map;
-	}
-
-	public SortedMap getSortedMap() {
-		return sortedMap;
-	}
-
-	public void setSortedMap(SortedMap sortedMap) {
-		this.sortedMap = sortedMap;
-	}
-
-}
diff --git a/spring-context/src/test/java/test/beans/NestedTestBean.java b/spring-context/src/test/java/test/beans/NestedTestBean.java
deleted file mode 100644
index 0546fdadebb..00000000000
--- a/spring-context/src/test/java/test/beans/NestedTestBean.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package test.beans;
-
-/**
- * Simple nested test bean used for testing bean factories, AOP framework etc.
- *
- * @author Trevor D. Cook
- * @since 30.09.2003
- */
-public class NestedTestBean implements INestedTestBean {
-
-	private String company = "";
-
-	public NestedTestBean() {
-	}
-
-	public NestedTestBean(String company) {
-		setCompany(company);
-	}
-
-	public void setCompany(String company) {
-		this.company = ((company != null) ? company : "");
-	}
-
-	@Override
-	public String getCompany() {
-		return company;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (!(obj instanceof NestedTestBean)) {
-			return false;
-		}
-
-		NestedTestBean ntb = (NestedTestBean) obj;
-		return this.company.equals(ntb.company);
-	}
-
-	@Override
-	public int hashCode() {
-		return this.company.hashCode();
-	}
-
-	@Override
-	public String toString() {
-		return "NestedTestBean: " + this.company;
-	}
-
-}
diff --git a/spring-context/src/test/java/test/beans/SideEffectBean.java b/spring-context/src/test/java/test/beans/SideEffectBean.java
deleted file mode 100644
index 52b78737175..00000000000
--- a/spring-context/src/test/java/test/beans/SideEffectBean.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-/**
- * Bean that changes state on a business invocation, so that
- * we can check whether it's been invoked
- *
- * @author Rod Johnson
- */
-public class SideEffectBean {
-
-	private int count;
-
-	public void setCount(int count) {
-		this.count = count;
-	}
-
-	public int getCount() {
-		return this.count;
-	}
-
-	public void doWork() {
-		++count;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-context/src/test/java/test/beans/TestBean.java b/spring-context/src/test/java/test/beans/TestBean.java
deleted file mode 100644
index 4b98eab870e..00000000000
--- a/spring-context/src/test/java/test/beans/TestBean.java
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package test.beans;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.BeanNameAware;
-
-import org.springframework.util.ObjectUtils;
-
-import java.io.IOException;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-
-/**
- * Simple test bean used for testing bean factories, AOP framework etc.
- *
- * @author Rod Johnson
- * @since 15 April 2001
- */
-public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOther, Comparable {
-
-	private String beanName;
-
-	private String country;
-
-	private BeanFactory beanFactory;
-
-	private boolean postProcessed;
-
-	private String name;
-
-	private String sex;
-
-	private int age;
-
-	private boolean jedi;
-
-	private ITestBean spouse;
-
-	private String touchy;
-
-	private String[] stringArray;
-
-	private Integer[] someIntegerArray;
-
-	private Date date = new Date();
-
-	private Float myFloat = new Float(0.0);
-
-	private Collection friends = new LinkedList();
-
-	private Set someSet = new HashSet();
-
-	private Map someMap = new HashMap();
-
-	private List someList = new ArrayList();
-
-	private Properties someProperties = new Properties();
-
-	private INestedTestBean doctor = new NestedTestBean();
-
-	private INestedTestBean lawyer = new NestedTestBean();
-
-	private IndexedTestBean nestedIndexedBean;
-
-	private boolean destroyed;
-
-	private Number someNumber;
-
-	private Colour favouriteColour;
-
-	private Boolean someBoolean;
-
-	private List otherColours;
-
-	private List pets;
-
-	public TestBean() {
-	}
-
-	public TestBean(String name) {
-		this.name = name;
-	}
-
-	public TestBean(ITestBean spouse) {
-		this.spouse = spouse;
-	}
-
-	public TestBean(String name, int age) {
-		this.name = name;
-		this.age = age;
-	}
-
-	public TestBean(ITestBean spouse, Properties someProperties) {
-		this.spouse = spouse;
-		this.someProperties = someProperties;
-	}
-
-	@Override
-	public void setBeanName(String beanName) {
-		this.beanName = beanName;
-	}
-
-	public String getBeanName() {
-		return beanName;
-	}
-
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) {
-		this.beanFactory = beanFactory;
-	}
-
-	public BeanFactory getBeanFactory() {
-		return beanFactory;
-	}
-
-	public void setPostProcessed(boolean postProcessed) {
-		this.postProcessed = postProcessed;
-	}
-
-	public boolean isPostProcessed() {
-		return postProcessed;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getSex() {
-		return sex;
-	}
-
-	public void setSex(String sex) {
-		this.sex = sex;
-	}
-
-	@Override
-	public int getAge() {
-		return age;
-	}
-
-	@Override
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-	public boolean isJedi() {
-		return jedi;
-	}
-
-	public void setJedi(boolean jedi) {
-		this.jedi = jedi;
-	}
-
-	@Override
-	public ITestBean getSpouse() {
-		return spouse;
-	}
-
-	@Override
-	public void setSpouse(ITestBean spouse) {
-		this.spouse = spouse;
-	}
-
-	public String getTouchy() {
-		return touchy;
-	}
-
-	public void setTouchy(String touchy) throws Exception {
-		if (touchy.indexOf('.') != -1) {
-			throw new Exception("Can't contain a .");
-		}
-
-		if (touchy.indexOf(',') != -1) {
-			throw new NumberFormatException("Number format exception: contains a ,");
-		}
-
-		this.touchy = touchy;
-	}
-
-	public String getCountry() {
-		return country;
-	}
-
-	public void setCountry(String country) {
-		this.country = country;
-	}
-
-	public String[] getStringArray() {
-		return stringArray;
-	}
-
-	public void setStringArray(String[] stringArray) {
-		this.stringArray = stringArray;
-	}
-
-	public Integer[] getSomeIntegerArray() {
-		return someIntegerArray;
-	}
-
-	public void setSomeIntegerArray(Integer[] someIntegerArray) {
-		this.someIntegerArray = someIntegerArray;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public Float getMyFloat() {
-		return myFloat;
-	}
-
-	public void setMyFloat(Float myFloat) {
-		this.myFloat = myFloat;
-	}
-
-	public Collection getFriends() {
-		return friends;
-	}
-
-	public void setFriends(Collection friends) {
-		this.friends = friends;
-	}
-
-	public Set getSomeSet() {
-		return someSet;
-	}
-
-	public void setSomeSet(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public Map getSomeMap() {
-		return someMap;
-	}
-
-	public void setSomeMap(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public List getSomeList() {
-		return someList;
-	}
-
-	public void setSomeList(List someList) {
-		this.someList = someList;
-	}
-
-	public Properties getSomeProperties() {
-		return someProperties;
-	}
-
-	public void setSomeProperties(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-	@Override
-	public INestedTestBean getDoctor() {
-		return doctor;
-	}
-
-	@Override
-	public INestedTestBean getLawyer() {
-		return lawyer;
-	}
-
-	public void setDoctor(INestedTestBean bean) {
-		doctor = bean;
-	}
-
-	public void setLawyer(INestedTestBean bean) {
-		lawyer = bean;
-	}
-
-	public Number getSomeNumber() {
-		return someNumber;
-	}
-
-	public void setSomeNumber(Number someNumber) {
-		this.someNumber = someNumber;
-	}
-
-	public Colour getFavouriteColour() {
-		return favouriteColour;
-	}
-
-	public void setFavouriteColour(Colour favouriteColour) {
-		this.favouriteColour = favouriteColour;
-	}
-
-	public Boolean getSomeBoolean() {
-		return someBoolean;
-	}
-
-	public void setSomeBoolean(Boolean someBoolean) {
-		this.someBoolean = someBoolean;
-	}
-
-	@Override
-	public IndexedTestBean getNestedIndexedBean() {
-		return nestedIndexedBean;
-	}
-
-	public void setNestedIndexedBean(IndexedTestBean nestedIndexedBean) {
-		this.nestedIndexedBean = nestedIndexedBean;
-	}
-
-	public List getOtherColours() {
-		return otherColours;
-	}
-
-	public void setOtherColours(List otherColours) {
-		this.otherColours = otherColours;
-	}
-
-	public List getPets() {
-		return pets;
-	}
-
-	public void setPets(List pets) {
-		this.pets = pets;
-	}
-
-	/**
-	 * @see ITestBean#exceptional(Throwable)
-	 */
-	@Override
-	public void exceptional(Throwable t) throws Throwable {
-		if (t != null) {
-			throw t;
-		}
-	}
-
-	@Override
-	public void unreliableFileOperation() throws IOException {
-		throw new IOException();
-	}
-
-	/**
-	 * @see ITestBean#returnsThis()
-	 */
-	@Override
-	public Object returnsThis() {
-		return this;
-	}
-
-	/**
-	 * @see IOther#absquatulate()
-	 */
-	@Override
-	public void absquatulate() {
-	}
-
-	@Override
-	public int haveBirthday() {
-		return age++;
-	}
-
-	public void destroy() {
-		this.destroyed = true;
-	}
-
-	public boolean wasDestroyed() {
-		return destroyed;
-	}
-
-	@Override
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-
-		if ((other == null) || !(other instanceof TestBean)) {
-			return false;
-		}
-
-		TestBean tb2 = (TestBean) other;
-		return (ObjectUtils.nullSafeEquals(this.name, tb2.name) && (this.age == tb2.age));
-	}
-
-	@Override
-	public int hashCode() {
-		return this.age;
-	}
-
-	@Override
-	public int compareTo(Object other) {
-		if ((this.name != null) && (other instanceof TestBean)) {
-			return this.name.compareTo(((TestBean) other).getName());
-		}
-
-		return 1;
-	}
-
-	@Override
-	public String toString() {
-		String s = "name=" + name + "; age=" + age + "; touchy=" + touchy;
-		s += "; spouse={" + ((spouse != null) ? spouse.getName() : null) + "}";
-		return s;
-	}
-
-}
diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerWithExpressionLanguageTests.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerWithExpressionLanguageTests.xml
index 1067cbc26cb..3982b48c7cf 100644
--- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerWithExpressionLanguageTests.xml
+++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerWithExpressionLanguageTests.xml
@@ -4,8 +4,8 @@
 	   xmlns:p="http://www.springframework.org/schema/p"
 	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	
+	
 
-	
+	
 
 
diff --git a/spring-context/src/test/resources/org/springframework/context/support/simpleThreadScopeTests.xml b/spring-context/src/test/resources/org/springframework/context/support/simpleThreadScopeTests.xml
index 2b71bd30014..efb31d0297b 100644
--- a/spring-context/src/test/resources/org/springframework/context/support/simpleThreadScopeTests.xml
+++ b/spring-context/src/test/resources/org/springframework/context/support/simpleThreadScopeTests.xml
@@ -14,34 +14,34 @@
 		
 	
 
-	
+	
 
 	
 	
 	
-	
 		override
 		
 	
 
-	
 		override
 		
@@ -42,7 +42,7 @@
 
 	
 
-	
+	
 		myname
 	
 
diff --git a/spring-orm/src/test/resources/org/springframework/beans/factory/xml/test.xml b/spring-orm/src/test/resources/org/springframework/beans/factory/xml/test.xml
index e67e3101362..933e66b7d00 100644
--- a/spring-orm/src/test/resources/org/springframework/beans/factory/xml/test.xml
+++ b/spring-orm/src/test/resources/org/springframework/beans/factory/xml/test.xml
@@ -3,7 +3,7 @@
 
 
 
-	
+	
 		
 			I have no properties and I'm happy without them.
 		
@@ -12,7 +12,7 @@
 	
-	
+	
 		aliased
 	
 
@@ -20,17 +20,17 @@
 
 	
 
-	
+	
 		aliased
 	
 
 	
 
-	
+	
 		aliased
 	
 
-	
+	
 		
 	
 
@@ -40,7 +40,7 @@
 
 	
 
-	
+	
 		Rod
 		31
 		
@@ -52,29 +52,29 @@
 		
 	
 
-	
+	
 		Kerry
 		34
 		
 		
 	
 
-	
+	
 		Kathy
 		28
 		
 	
 
-	
+	
 		typeMismatch
 		34x
 		
 	
 
 	
-	
+	
 
-	
 		true
 	
@@ -85,10 +85,10 @@
 	
 
 	
-	
+	
 	
 
-	
+	
 		false
 	
 
@@ -113,14 +113,14 @@
 		
 	
 
-	
+	
 		listenerVeto
 		66
 	
 
-	
+	
 
-	
+	
 	  this is a ]]>
 	
 
diff --git a/spring-test/src/test/java/org/springframework/beans/Colour.java b/spring-test/src/test/java/org/springframework/beans/Colour.java
deleted file mode 100644
index 194e0037973..00000000000
--- a/spring-test/src/test/java/org/springframework/beans/Colour.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2002-2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import org.springframework.core.enums.ShortCodedLabeledEnum;
-
-/**
- * @author Rob Harrop
- */
-@SuppressWarnings({ "serial", "deprecation" })
-public class Colour extends ShortCodedLabeledEnum {
-
-	public static final Colour RED = new Colour(0, "RED");
-	public static final Colour BLUE = new Colour(1, "BLUE");
-	public static final Colour GREEN = new Colour(2, "GREEN");
-	public static final Colour PURPLE = new Colour(3, "PURPLE");
-
-
-	private Colour(int code, String label) {
-		super(code, label);
-	}
-
-}
\ No newline at end of file
diff --git a/spring-test/src/test/java/org/springframework/beans/Employee.java b/spring-test/src/test/java/org/springframework/beans/Employee.java
deleted file mode 100644
index 9289e451370..00000000000
--- a/spring-test/src/test/java/org/springframework/beans/Employee.java
+++ /dev/null
@@ -1,39 +0,0 @@
-
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-public class Employee extends TestBean {
-
-	private String co;
-
-	/**
-	 * Constructor for Employee.
-	 */
-	public Employee() {
-		super();
-	}
-
-	public String getCompany() {
-		return co;
-	}
-
-	public void setCompany(String co) {
-		this.co = co;
-	}
-
-}
diff --git a/spring-test/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-test/src/test/java/org/springframework/beans/INestedTestBean.java
deleted file mode 100644
index e0ae5f20a3f..00000000000
--- a/spring-test/src/test/java/org/springframework/beans/INestedTestBean.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-public interface INestedTestBean {
-
-	public String getCompany();
-
-}
\ No newline at end of file
diff --git a/spring-test/src/test/java/org/springframework/beans/IOther.java b/spring-test/src/test/java/org/springframework/beans/IOther.java
deleted file mode 100644
index d7fb346185a..00000000000
--- a/spring-test/src/test/java/org/springframework/beans/IOther.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-public interface IOther {
-
-	void absquatulate();
-
-}
\ No newline at end of file
diff --git a/spring-test/src/test/java/org/springframework/beans/ITestBean.java b/spring-test/src/test/java/org/springframework/beans/ITestBean.java
deleted file mode 100644
index cdf5ef510dd..00000000000
--- a/spring-test/src/test/java/org/springframework/beans/ITestBean.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2002-2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.IOException;
-
-/**
- * Interface used for {@link org.springframework.beans.TestBean}.
- *
- * 
Two methods are the same as on Person, but if this
- * extends person it breaks quite a few tests..
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public interface ITestBean {
-
-	int getAge();
-
-	void setAge(int age);
-
-	String getName();
-
-	void setName(String name);
-
-	ITestBean getSpouse();
-
-	void setSpouse(ITestBean spouse);
-
-	ITestBean[] getSpouses();
-
-	String[] getStringArray();
-
-	void setStringArray(String[] stringArray);
-
-	/**
-	 * Throws a given (non-null) exception.
-	 */
-	void exceptional(Throwable t) throws Throwable;
-
-	Object returnsThis();
-
-	INestedTestBean getDoctor();
-
-	INestedTestBean getLawyer();
-
-	IndexedTestBean getNestedIndexedBean();
-
-	/**
-	 * Increment the age by one.
-	 * @return the previous age
-	 */
-	int haveBirthday();
-
-	void unreliableFileOperation() throws IOException;
-
-}
\ No newline at end of file
diff --git a/spring-test/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-test/src/test/java/org/springframework/beans/IndexedTestBean.java
deleted file mode 100644
index cd1724f2645..00000000000
--- a/spring-test/src/test/java/org/springframework/beans/IndexedTestBean.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright 2002-2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-/**
- * @author Juergen Hoeller
- * @since 11.11.2003
- */
-@SuppressWarnings("rawtypes")
-public class IndexedTestBean {
-
-	private TestBean[] array;
-
-	private Collection collection;
-
-	private List list;
-
-	private Set set;
-
-	private SortedSet sortedSet;
-
-	private Map map;
-
-	private SortedMap sortedMap;
-
-
-	public IndexedTestBean() {
-		this(true);
-	}
-
-	public IndexedTestBean(boolean populate) {
-		if (populate) {
-			populate();
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	public void populate() {
-		TestBean tb0 = new TestBean("name0", 0);
-		TestBean tb1 = new TestBean("name1", 0);
-		TestBean tb2 = new TestBean("name2", 0);
-		TestBean tb3 = new TestBean("name3", 0);
-		TestBean tb4 = new TestBean("name4", 0);
-		TestBean tb5 = new TestBean("name5", 0);
-		TestBean tb6 = new TestBean("name6", 0);
-		TestBean tb7 = new TestBean("name7", 0);
-		TestBean tbX = new TestBean("nameX", 0);
-		TestBean tbY = new TestBean("nameY", 0);
-		this.array = new TestBean[] { tb0, tb1 };
-		this.list = new ArrayList();
-		this.list.add(tb2);
-		this.list.add(tb3);
-		this.set = new TreeSet();
-		this.set.add(tb6);
-		this.set.add(tb7);
-		this.map = new HashMap();
-		this.map.put("key1", tb4);
-		this.map.put("key2", tb5);
-		this.map.put("key.3", tb5);
-		List list = new ArrayList();
-		list.add(tbX);
-		list.add(tbY);
-		this.map.put("key4", list);
-	}
-
-	public TestBean[] getArray() {
-		return array;
-	}
-
-	public void setArray(TestBean[] array) {
-		this.array = array;
-	}
-
-	public Collection getCollection() {
-		return collection;
-	}
-
-	public void setCollection(Collection collection) {
-		this.collection = collection;
-	}
-
-	public List getList() {
-		return list;
-	}
-
-	public void setList(List list) {
-		this.list = list;
-	}
-
-	public Set getSet() {
-		return set;
-	}
-
-	public void setSet(Set set) {
-		this.set = set;
-	}
-
-	public SortedSet getSortedSet() {
-		return sortedSet;
-	}
-
-	public void setSortedSet(SortedSet sortedSet) {
-		this.sortedSet = sortedSet;
-	}
-
-	public Map getMap() {
-		return map;
-	}
-
-	public void setMap(Map map) {
-		this.map = map;
-	}
-
-	public SortedMap getSortedMap() {
-		return sortedMap;
-	}
-
-	public void setSortedMap(SortedMap sortedMap) {
-		this.sortedMap = sortedMap;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java
deleted file mode 100644
index 412891c439b..00000000000
--- a/spring-test/src/test/java/org/springframework/beans/NestedTestBean.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-/**
- * Simple nested test bean used for testing bean factories, AOP framework etc.
- *
- * @author Trevor D. Cook
- * @since 30.09.2003
- */
-public class NestedTestBean implements INestedTestBean {
-
-	private String company = "";
-
-	public NestedTestBean() {
-	}
-
-	public NestedTestBean(String company) {
-		setCompany(company);
-	}
-
-	public void setCompany(String company) {
-		this.company = (company != null ? company : "");
-	}
-
-	@Override
-	public String getCompany() {
-		return company;
-	}
-
-	public boolean equals(Object obj) {
-		if (!(obj instanceof NestedTestBean)) {
-			return false;
-		}
-		NestedTestBean ntb = (NestedTestBean) obj;
-		return this.company.equals(ntb.company);
-	}
-
-	public int hashCode() {
-		return this.company.hashCode();
-	}
-
-	public String toString() {
-		return "NestedTestBean: " + this.company;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-test/src/test/java/org/springframework/beans/TestBean.java b/spring-test/src/test/java/org/springframework/beans/TestBean.java
deleted file mode 100644
index 3ce93f7c439..00000000000
--- a/spring-test/src/test/java/org/springframework/beans/TestBean.java
+++ /dev/null
@@ -1,455 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.util.ObjectUtils;
-
-/**
- * Simple test bean used for testing bean factories, the AOP framework etc.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @since 15 April 2001
- */
-@SuppressWarnings("rawtypes")
-public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOther, Comparable {
-
-	private String beanName;
-
-	private String country;
-
-	private BeanFactory beanFactory;
-
-	private boolean postProcessed;
-
-	private String name;
-
-	private String sex;
-
-	private int age;
-
-	private boolean jedi;
-
-	private ITestBean[] spouses;
-
-	private String touchy;
-
-	private String[] stringArray;
-
-	private Integer[] someIntegerArray;
-
-	private Date date = new Date();
-
-	private Float myFloat = new Float(0.0);
-
-	private Collection friends = new LinkedList();
-
-	private Set someSet = new HashSet();
-
-	private Map someMap = new HashMap();
-
-	private List someList = new ArrayList();
-
-	private Properties someProperties = new Properties();
-
-	private INestedTestBean doctor = new NestedTestBean();
-
-	private INestedTestBean lawyer = new NestedTestBean();
-
-	private IndexedTestBean nestedIndexedBean;
-
-	private boolean destroyed;
-
-	private Number someNumber;
-
-	private Colour favouriteColour;
-
-	private Boolean someBoolean;
-
-	private List otherColours;
-
-	private List pets;
-
-
-	public TestBean() {
-	}
-
-	public TestBean(String name) {
-		this.name = name;
-	}
-
-	public TestBean(ITestBean spouse) {
-		this.spouses = new ITestBean[] { spouse };
-	}
-
-	public TestBean(String name, int age) {
-		this.name = name;
-		this.age = age;
-	}
-
-	public TestBean(ITestBean spouse, Properties someProperties) {
-		this.spouses = new ITestBean[] { spouse };
-		this.someProperties = someProperties;
-	}
-
-	public TestBean(List someList) {
-		this.someList = someList;
-	}
-
-	public TestBean(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public TestBean(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public TestBean(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-	@Override
-	public void setBeanName(String beanName) {
-		this.beanName = beanName;
-	}
-
-	public String getBeanName() {
-		return beanName;
-	}
-
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) {
-		this.beanFactory = beanFactory;
-	}
-
-	public BeanFactory getBeanFactory() {
-		return beanFactory;
-	}
-
-	public void setPostProcessed(boolean postProcessed) {
-		this.postProcessed = postProcessed;
-	}
-
-	public boolean isPostProcessed() {
-		return postProcessed;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getSex() {
-		return sex;
-	}
-
-	public void setSex(String sex) {
-		this.sex = sex;
-		if (this.name == null) {
-			this.name = sex;
-		}
-	}
-
-	@Override
-	public int getAge() {
-		return age;
-	}
-
-	@Override
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-	public boolean isJedi() {
-		return jedi;
-	}
-
-	public void setJedi(boolean jedi) {
-		this.jedi = jedi;
-	}
-
-	@Override
-	public ITestBean getSpouse() {
-		return (spouses != null ? spouses[0] : null);
-	}
-
-	@Override
-	public void setSpouse(ITestBean spouse) {
-		this.spouses = new ITestBean[] { spouse };
-	}
-
-	@Override
-	public ITestBean[] getSpouses() {
-		return spouses;
-	}
-
-	public String getTouchy() {
-		return touchy;
-	}
-
-	public void setTouchy(String touchy) throws Exception {
-		if (touchy.indexOf('.') != -1) {
-			throw new Exception("Can't contain a .");
-		}
-		if (touchy.indexOf(',') != -1) {
-			throw new NumberFormatException("Number format exception: contains a ,");
-		}
-		this.touchy = touchy;
-	}
-
-	public String getCountry() {
-		return country;
-	}
-
-	public void setCountry(String country) {
-		this.country = country;
-	}
-
-	@Override
-	public String[] getStringArray() {
-		return stringArray;
-	}
-
-	@Override
-	public void setStringArray(String[] stringArray) {
-		this.stringArray = stringArray;
-	}
-
-	public Integer[] getSomeIntegerArray() {
-		return someIntegerArray;
-	}
-
-	public void setSomeIntegerArray(Integer[] someIntegerArray) {
-		this.someIntegerArray = someIntegerArray;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public Float getMyFloat() {
-		return myFloat;
-	}
-
-	public void setMyFloat(Float myFloat) {
-		this.myFloat = myFloat;
-	}
-
-	public Collection getFriends() {
-		return friends;
-	}
-
-	public void setFriends(Collection friends) {
-		this.friends = friends;
-	}
-
-	public Set getSomeSet() {
-		return someSet;
-	}
-
-	public void setSomeSet(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public Map getSomeMap() {
-		return someMap;
-	}
-
-	public void setSomeMap(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public List getSomeList() {
-		return someList;
-	}
-
-	public void setSomeList(List someList) {
-		this.someList = someList;
-	}
-
-	public Properties getSomeProperties() {
-		return someProperties;
-	}
-
-	public void setSomeProperties(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-	@Override
-	public INestedTestBean getDoctor() {
-		return doctor;
-	}
-
-	public void setDoctor(INestedTestBean doctor) {
-		this.doctor = doctor;
-	}
-
-	@Override
-	public INestedTestBean getLawyer() {
-		return lawyer;
-	}
-
-	public void setLawyer(INestedTestBean lawyer) {
-		this.lawyer = lawyer;
-	}
-
-	public Number getSomeNumber() {
-		return someNumber;
-	}
-
-	public void setSomeNumber(Number someNumber) {
-		this.someNumber = someNumber;
-	}
-
-	public Colour getFavouriteColour() {
-		return favouriteColour;
-	}
-
-	public void setFavouriteColour(Colour favouriteColour) {
-		this.favouriteColour = favouriteColour;
-	}
-
-	public Boolean getSomeBoolean() {
-		return someBoolean;
-	}
-
-	public void setSomeBoolean(Boolean someBoolean) {
-		this.someBoolean = someBoolean;
-	}
-
-	@Override
-	public IndexedTestBean getNestedIndexedBean() {
-		return nestedIndexedBean;
-	}
-
-	public void setNestedIndexedBean(IndexedTestBean nestedIndexedBean) {
-		this.nestedIndexedBean = nestedIndexedBean;
-	}
-
-	public List getOtherColours() {
-		return otherColours;
-	}
-
-	public void setOtherColours(List otherColours) {
-		this.otherColours = otherColours;
-	}
-
-	public List getPets() {
-		return pets;
-	}
-
-	public void setPets(List pets) {
-		this.pets = pets;
-	}
-
-	/**
-	 * @see ITestBean#exceptional(Throwable)
-	 */
-	@Override
-	public void exceptional(Throwable t) throws Throwable {
-		if (t != null) {
-			throw t;
-		}
-	}
-
-	@Override
-	public void unreliableFileOperation() throws IOException {
-		throw new IOException();
-	}
-
-	/**
-	 * @see ITestBean#returnsThis()
-	 */
-	@Override
-	public Object returnsThis() {
-		return this;
-	}
-
-	/**
-	 * @see IOther#absquatulate()
-	 */
-	@Override
-	public void absquatulate() {
-	}
-
-	@Override
-	public int haveBirthday() {
-		return age++;
-	}
-
-	public void destroy() {
-		this.destroyed = true;
-	}
-
-	public boolean wasDestroyed() {
-		return destroyed;
-	}
-
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (other == null || !(other instanceof TestBean)) {
-			return false;
-		}
-		TestBean tb2 = (TestBean) other;
-		return (ObjectUtils.nullSafeEquals(this.name, tb2.name) && this.age == tb2.age);
-	}
-
-	public int hashCode() {
-		return this.age;
-	}
-
-	@Override
-	public int compareTo(Object other) {
-		if (this.name != null && other instanceof TestBean) {
-			return this.name.compareTo(((TestBean) other).getName());
-		}
-		else {
-			return 1;
-		}
-	}
-
-	public String toString() {
-		return this.name;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
index 06c94aa4417..ba8c81c2945 100644
--- a/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.test;
 
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.ApplicationContext;
 
diff --git a/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests-context.properties b/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests-context.properties
index 307a4e93df2..7b96503a3fe 100644
--- a/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests-context.properties
+++ b/spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests-context.properties
@@ -1,2 +1,2 @@
-cat.(class)=org.springframework.beans.Pet
+cat.(class)=org.springframework.tests.sample.beans.Pet
 cat.$0=Garfield
diff --git a/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml b/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml
index 72360454848..b1939de12fd 100644
--- a/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml
@@ -2,7 +2,7 @@
 
 
-	
+	
 		
 	
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests-context.properties b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests-context.properties
index 1efbb6201e0..45d36076bba 100644
--- a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests-context.properties
+++ b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests-context.properties
@@ -1,4 +1,4 @@
-dog.(class)=org.springframework.beans.Pet
+dog.(class)=org.springframework.tests.sample.beans.Pet
 dog.$0=Fido
 
 testString2.(class)=java.lang.String
diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java
index eb6f44f176a..3a976747ea7 100644
--- a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.ContextLoader;
diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests-context.properties b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests-context.properties
index 1efbb6201e0..45d36076bba 100644
--- a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests-context.properties
+++ b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests-context.properties
@@ -1,4 +1,4 @@
-dog.(class)=org.springframework.beans.Pet
+dog.(class)=org.springframework.tests.sample.beans.Pet
 dog.$0=Fido
 
 testString2.(class)=java.lang.String
diff --git a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java
index 81f51d459a9..77f079aec24 100644
--- a/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.ContextLoader;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests-context.xml
index acdab7073c1..9f2fdef412d 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests-context.xml
@@ -3,13 +3,13 @@
 	xmlns:p="http://www.springframework.org/schema/p"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	
+	
 		
 		
 		
 	
 
-	
+	
 		
 	
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java
index 147679ed5f1..735f96a01f6 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@ import javax.sql.DataSource;
 
 import org.junit.internal.runners.JUnit38ClassRunner;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Employee;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml
index a219470ce63..a91178410a2 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml
@@ -8,13 +8,13 @@
 	
 
-	
+	
 		
 		
 		
 	
 
-	
+	
 		
 	
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java
index bab1df5ff8d..c88aed37d12 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,8 +29,8 @@ import javax.sql.DataSource;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.beans.Employee;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Employee;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java
index 0c068820875..3ee77974a0e 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertNotNull;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.model.InitializationError;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.support.GenericPropertiesContextLoader;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml
index 2f6eda6962f..b40fed69ca8 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml
@@ -2,7 +2,7 @@
 
 
-	
+	
 		
 		
 		
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml
index cb75b8accd4..f6a90a62eac 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml
@@ -2,7 +2,7 @@
 
 
-	
+	
 		
 	
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml
index 62206fde4a8..67590a6b584 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml
@@ -2,19 +2,19 @@
 
 
-	
+	
 		
 		
 		
 	
 
-	
+	
 		
 		
 		
 	
 
-	
+	
 		
 	
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests.java
index ed2f58de118..bf07919721b 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,8 +31,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
-import org.springframework.beans.Employee;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Employee;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests-context.properties b/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests-context.properties
index 0e62ef734fc..6df81585fb4 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests-context.properties
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests-context.properties
@@ -1,4 +1,4 @@
-cat.(class)=org.springframework.beans.Pet
+cat.(class)=org.springframework.tests.sample.beans.Pet
 cat.$0=Garfield
 
 testString.(class)=java.lang.String
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java
index d41dbb50269..b5d74839f68 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import java.util.Properties;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml
index dffdb30f99b..704b3478733 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml
@@ -2,13 +2,13 @@
 
 
-	
+	
 		
 		
 		
 	
 
-	
+	
 		
 	
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
index 399f6a61030..4973d7c68de 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,8 +29,8 @@ import javax.inject.Named;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.BeansException;
-import org.springframework.beans.Employee;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Employee;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java
index 46dfd6725a6..a0c51ded527 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java
index 469e35f8d9d..e8a440a230a 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java
index e426d1e7f3b..05c74a29eb7 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java
index 9f29d9a54aa..7af6a541b45 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.ContextConfiguration;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java
index 278804817e4..00da19f130c 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java
index 3cf8f064d0c..9b4793e462f 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java
index b54613b4910..6613a695b4a 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java
index c060ea4b555..a0f7668ae2f 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java
index a3d2ecee168..7da5e68bd01 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java
index 54596ae6d29..cca20f48278 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java
index 0208925227c..19eefe388ae 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 
 package org.springframework.test.context.junit4.annotation;
 
-import org.springframework.beans.Employee;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Employee;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DefaultProfileAnnotationConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DefaultProfileAnnotationConfigTests.java
index cc26b849dbb..836dca41df5 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DefaultProfileAnnotationConfigTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DefaultProfileAnnotationConfigTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@ import static org.junit.Assert.assertNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Employee;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DefaultProfileConfig.java b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DefaultProfileConfig.java
index 98cc3af1495..44b5675a89a 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DefaultProfileConfig.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DefaultProfileConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4.profile.annotation;
 
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DevProfileConfig.java b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DevProfileConfig.java
index 9fb695889ae..cafc8b6e475 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DevProfileConfig.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DevProfileConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4.profile.annotation;
 
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/DefaultProfileAnnotationConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/DefaultProfileAnnotationConfigTests.java
index f6f2907f875..07a8d2d5ffc 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/DefaultProfileAnnotationConfigTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/DefaultProfileAnnotationConfigTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@ import static org.junit.Assert.assertNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Employee;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/DefaultProfileConfig.java b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/DefaultProfileConfig.java
index a4af38435a4..818212dd3e1 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/DefaultProfileConfig.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/DefaultProfileConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4.profile.importresource;
 
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/import.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/import.xml
index 8427a674a3d..3861d0ec592 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/import.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/import.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	
-		
+		
 			
 			
 			
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests-context.xml
index 1fc6d4ecfc9..0e672de0843 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests-context.xml
@@ -2,12 +2,12 @@
 
 
-	
+	
 		
 	
 
 	
-		
+		
 			
 			
 			
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests.java
index f79a9b0aa5d..1ed4f5467a4 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@ import static org.junit.Assert.assertNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Employee;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml
index 55a4cff1e8a..7238260bd43 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml
@@ -2,7 +2,7 @@
 
 
-	
+	
 		
 		
 		
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml
index 2f6eda6962f..b40fed69ca8 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml
@@ -2,7 +2,7 @@
 
 
-	
+	
 		
 		
 		
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java
index fb373a03479..7131201d438 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml
index cb75b8accd4..f6a90a62eac 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml
@@ -2,7 +2,7 @@
 
 
-	
+	
 		
 	
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java
index 9896e35880b..1f488ec26c6 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java
index 1c9fbe91255..cd81b6becb8 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java
index 5c99fefa39f..b01764251c8 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/AbstractTransactionalAnnotatedConfigClassTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/AbstractTransactionalAnnotatedConfigClassTests.java
index d8b7fcacf3f..54b55c8c440 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/AbstractTransactionalAnnotatedConfigClassTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/AbstractTransactionalAnnotatedConfigClassTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/TransactionalAnnotatedConfigClassWithAtConfigurationTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/TransactionalAnnotatedConfigClassWithAtConfigurationTests.java
index 373166d9b41..6e0f84f7339 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/TransactionalAnnotatedConfigClassWithAtConfigurationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/TransactionalAnnotatedConfigClassWithAtConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertSame;
 import javax.sql.DataSource;
 
 import org.junit.Before;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/TransactionalAnnotatedConfigClassesWithoutAtConfigurationTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/TransactionalAnnotatedConfigClassesWithoutAtConfigurationTests.java
index 3f6a054ecb0..622f0dfe682 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/TransactionalAnnotatedConfigClassesWithoutAtConfigurationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/TransactionalAnnotatedConfigClassesWithoutAtConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertNotSame;
 import javax.sql.DataSource;
 
 import org.junit.Before;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.core.JdbcTemplate;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9604/LookUpTxMgrViaTransactionManagementConfigurerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9604/LookUpTxMgrViaTransactionManagementConfigurerTests.java
index cd20e40f3f5..5dbba76acbd 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9604/LookUpTxMgrViaTransactionManagementConfigurerTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9604/LookUpTxMgrViaTransactionManagementConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4.spr9604;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,7 +26,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.transaction.AfterTransaction;
 import org.springframework.test.context.transaction.BeforeTransaction;
-import org.springframework.test.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.TransactionManagementConfigurer;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpNonexistentTxMgrTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpNonexistentTxMgrTests.java
index 72af7e7a7bc..78720a8f5ec 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpNonexistentTxMgrTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpNonexistentTxMgrTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4.spr9645;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -24,7 +24,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 
 /**
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndDefaultNameTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndDefaultNameTests.java
index 6f1525229fd..331342d4fcc 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndDefaultNameTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndDefaultNameTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4.spr9645;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,7 +26,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.transaction.AfterTransaction;
 import org.springframework.test.context.transaction.BeforeTransaction;
-import org.springframework.test.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndNameTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndNameTests.java
index d8c070c5043..76a82b823c2 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndNameTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndNameTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4.spr9645;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -27,7 +27,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.transaction.AfterTransaction;
 import org.springframework.test.context.transaction.BeforeTransaction;
 import org.springframework.test.context.transaction.TransactionConfiguration;
-import org.springframework.test.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndQualifierAtClassLevelTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndQualifierAtClassLevelTests.java
index bbc0951e4fc..8492b02d5a6 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndQualifierAtClassLevelTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndQualifierAtClassLevelTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4.spr9645;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,7 +26,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.transaction.AfterTransaction;
 import org.springframework.test.context.transaction.BeforeTransaction;
-import org.springframework.test.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndQualifierAtMethodLevelTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndQualifierAtMethodLevelTests.java
index b9d6b4b6aef..363d47a9b27 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndQualifierAtMethodLevelTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndQualifierAtMethodLevelTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4.spr9645;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,7 +26,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.transaction.AfterTransaction;
 import org.springframework.test.context.transaction.BeforeTransaction;
-import org.springframework.test.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeTests.java
index b7a52aa961b..957533f9130 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4.spr9645;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,7 +26,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.transaction.AfterTransaction;
 import org.springframework.test.context.transaction.BeforeTransaction;
-import org.springframework.test.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java
index 4cfb6b8abc4..f20e466410f 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@ import static org.testng.Assert.assertNotNull;
 
 import javax.sql.DataSource;
 
-import org.springframework.beans.Employee;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Employee;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml
index 11e92153da0..a46a6da3d1f 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml
@@ -5,10 +5,10 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
 
-	
 
-	
+	
 
 	
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
index 0ad8862c2ed..ee25cb32e45 100644
--- a/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@ import static org.testng.Assert.assertTrue;
 
 import javax.annotation.Resource;
 
-import org.springframework.beans.Employee;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Employee;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-test/src/test/java/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests.java b/spring-test/src/test/java/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests.java
index c07b25a9273..829d70ffec5 100644
--- a/spring-test/src/test/java/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import static org.junit.Assert.*;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpSession;
diff --git a/spring-test/src/test/resources/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests-context.xml b/spring-test/src/test/resources/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests-context.xml
index 0930460eeaa..7f2a6c5b232 100644
--- a/spring-test/src/test/resources/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests-context.xml
+++ b/spring-test/src/test/resources/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests-context.xml
@@ -2,10 +2,10 @@
 
 
-	
+	
 		
 	
 
-	
+	
 
 
diff --git a/spring-tx/src/test/java/org/springframework/beans/Colour.java b/spring-tx/src/test/java/org/springframework/beans/Colour.java
deleted file mode 100644
index a992a2ebfc6..00000000000
--- a/spring-tx/src/test/java/org/springframework/beans/Colour.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import org.springframework.core.enums.ShortCodedLabeledEnum;
-
-/**
- * @author Rob Harrop
- */
-@SuppressWarnings("serial")
-public class Colour extends ShortCodedLabeledEnum {
-
-	public static final Colour RED = new Colour(0, "RED");
-	public static final Colour BLUE = new Colour(1, "BLUE");
-	public static final Colour GREEN = new Colour(2, "GREEN");
-	public static final Colour PURPLE = new Colour(3, "PURPLE");
-
-	private Colour(int code, String label) {
-		super(code, label);
-	}
-
-}
diff --git a/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java
deleted file mode 100644
index c5360de5316..00000000000
--- a/spring-tx/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.Serializable;
-
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.beans.factory.DisposableBean;
-
-/**
- * @author Juergen Hoeller
- * @since 21.08.2003
- */
-@SuppressWarnings("serial")
-public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean {
-
-	private String beanName;
-
-	private boolean initialized;
-
-	private boolean destroyed;
-
-
-	public DerivedTestBean() {
-	}
-
-	public DerivedTestBean(String[] names) {
-		if (names == null || names.length < 2) {
-			throw new IllegalArgumentException("Invalid names array");
-		}
-		setName(names[0]);
-		setBeanName(names[1]);
-	}
-
-	public static DerivedTestBean create(String[] names) {
-		return new DerivedTestBean(names);
-	}
-
-
-	@Override
-	public void setBeanName(String beanName) {
-		if (this.beanName == null || beanName == null) {
-			this.beanName = beanName;
-		}
-	}
-
-	@Override
-	public String getBeanName() {
-		return beanName;
-	}
-
-	public void setSpouseRef(String name) {
-		setSpouse(new TestBean(name));
-	}
-
-
-	public void initialize() {
-		this.initialized = true;
-	}
-
-	public boolean wasInitialized() {
-		return initialized;
-	}
-
-
-	@Override
-	public void destroy() {
-		this.destroyed = true;
-	}
-
-	@Override
-	public boolean wasDestroyed() {
-		return destroyed;
-	}
-
-}
diff --git a/spring-tx/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/INestedTestBean.java
deleted file mode 100644
index e0ae5f20a3f..00000000000
--- a/spring-tx/src/test/java/org/springframework/beans/INestedTestBean.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-public interface INestedTestBean {
-
-	public String getCompany();
-
-}
\ No newline at end of file
diff --git a/spring-tx/src/test/java/org/springframework/beans/IOther.java b/spring-tx/src/test/java/org/springframework/beans/IOther.java
deleted file mode 100644
index d7fb346185a..00000000000
--- a/spring-tx/src/test/java/org/springframework/beans/IOther.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-public interface IOther {
-
-	void absquatulate();
-
-}
\ No newline at end of file
diff --git a/spring-tx/src/test/java/org/springframework/beans/ITestBean.java b/spring-tx/src/test/java/org/springframework/beans/ITestBean.java
deleted file mode 100644
index cdf5ef510dd..00000000000
--- a/spring-tx/src/test/java/org/springframework/beans/ITestBean.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2002-2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.IOException;
-
-/**
- * Interface used for {@link org.springframework.beans.TestBean}.
- *
- * 
Two methods are the same as on Person, but if this
- * extends person it breaks quite a few tests..
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public interface ITestBean {
-
-	int getAge();
-
-	void setAge(int age);
-
-	String getName();
-
-	void setName(String name);
-
-	ITestBean getSpouse();
-
-	void setSpouse(ITestBean spouse);
-
-	ITestBean[] getSpouses();
-
-	String[] getStringArray();
-
-	void setStringArray(String[] stringArray);
-
-	/**
-	 * Throws a given (non-null) exception.
-	 */
-	void exceptional(Throwable t) throws Throwable;
-
-	Object returnsThis();
-
-	INestedTestBean getDoctor();
-
-	INestedTestBean getLawyer();
-
-	IndexedTestBean getNestedIndexedBean();
-
-	/**
-	 * Increment the age by one.
-	 * @return the previous age
-	 */
-	int haveBirthday();
-
-	void unreliableFileOperation() throws IOException;
-
-}
\ No newline at end of file
diff --git a/spring-tx/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/IndexedTestBean.java
deleted file mode 100644
index ddb091770ee..00000000000
--- a/spring-tx/src/test/java/org/springframework/beans/IndexedTestBean.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2002-2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-/**
- * @author Juergen Hoeller
- * @since 11.11.2003
- */
-public class IndexedTestBean {
-
-	private TestBean[] array;
-
-	private Collection collection;
-
-	private List list;
-
-	private Set set;
-
-	private SortedSet sortedSet;
-
-	private Map map;
-
-	private SortedMap sortedMap;
-
-
-	public IndexedTestBean() {
-		this(true);
-	}
-
-	public IndexedTestBean(boolean populate) {
-		if (populate) {
-			populate();
-		}
-	}
-
-	public void populate() {
-		TestBean tb0 = new TestBean("name0", 0);
-		TestBean tb1 = new TestBean("name1", 0);
-		TestBean tb2 = new TestBean("name2", 0);
-		TestBean tb3 = new TestBean("name3", 0);
-		TestBean tb4 = new TestBean("name4", 0);
-		TestBean tb5 = new TestBean("name5", 0);
-		TestBean tb6 = new TestBean("name6", 0);
-		TestBean tb7 = new TestBean("name7", 0);
-		TestBean tbX = new TestBean("nameX", 0);
-		TestBean tbY = new TestBean("nameY", 0);
-		this.array = new TestBean[] {tb0, tb1};
-		this.list = new ArrayList();
-		this.list.add(tb2);
-		this.list.add(tb3);
-		this.set = new TreeSet();
-		this.set.add(tb6);
-		this.set.add(tb7);
-		this.map = new HashMap();
-		this.map.put("key1", tb4);
-		this.map.put("key2", tb5);
-		this.map.put("key.3", tb5);
-		List list = new ArrayList();
-		list.add(tbX);
-		list.add(tbY);
-		this.map.put("key4", list);
-	}
-
-
-	public TestBean[] getArray() {
-		return array;
-	}
-
-	public void setArray(TestBean[] array) {
-		this.array = array;
-	}
-
-	public Collection getCollection() {
-		return collection;
-	}
-
-	public void setCollection(Collection collection) {
-		this.collection = collection;
-	}
-
-	public List getList() {
-		return list;
-	}
-
-	public void setList(List list) {
-		this.list = list;
-	}
-
-	public Set getSet() {
-		return set;
-	}
-
-	public void setSet(Set set) {
-		this.set = set;
-	}
-
-	public SortedSet getSortedSet() {
-		return sortedSet;
-	}
-
-	public void setSortedSet(SortedSet sortedSet) {
-		this.sortedSet = sortedSet;
-	}
-
-	public Map getMap() {
-		return map;
-	}
-
-	public void setMap(Map map) {
-		this.map = map;
-	}
-
-	public SortedMap getSortedMap() {
-		return sortedMap;
-	}
-
-	public void setSortedMap(SortedMap sortedMap) {
-		this.sortedMap = sortedMap;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java
deleted file mode 100644
index 412891c439b..00000000000
--- a/spring-tx/src/test/java/org/springframework/beans/NestedTestBean.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-/**
- * Simple nested test bean used for testing bean factories, AOP framework etc.
- *
- * @author Trevor D. Cook
- * @since 30.09.2003
- */
-public class NestedTestBean implements INestedTestBean {
-
-	private String company = "";
-
-	public NestedTestBean() {
-	}
-
-	public NestedTestBean(String company) {
-		setCompany(company);
-	}
-
-	public void setCompany(String company) {
-		this.company = (company != null ? company : "");
-	}
-
-	@Override
-	public String getCompany() {
-		return company;
-	}
-
-	public boolean equals(Object obj) {
-		if (!(obj instanceof NestedTestBean)) {
-			return false;
-		}
-		NestedTestBean ntb = (NestedTestBean) obj;
-		return this.company.equals(ntb.company);
-	}
-
-	public int hashCode() {
-		return this.company.hashCode();
-	}
-
-	public String toString() {
-		return "NestedTestBean: " + this.company;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-tx/src/test/java/org/springframework/beans/TestBean.java b/spring-tx/src/test/java/org/springframework/beans/TestBean.java
deleted file mode 100644
index 6d71de75764..00000000000
--- a/spring-tx/src/test/java/org/springframework/beans/TestBean.java
+++ /dev/null
@@ -1,457 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.util.ObjectUtils;
-
-/**
- * Simple test bean used for testing bean factories, the AOP framework etc.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @since 15 April 2001
- */
-public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOther, Comparable {
-
-	private String beanName;
-
-	private String country;
-
-	private BeanFactory beanFactory;
-
-	private boolean postProcessed;
-
-	private String name;
-
-	private String sex;
-
-	private int age;
-
-	private boolean jedi;
-
-	private ITestBean[] spouses;
-
-	private String touchy;
-
-	private String[] stringArray;
-
-	private Integer[] someIntegerArray;
-
-	private Date date = new Date();
-
-	private Float myFloat = new Float(0.0);
-
-	private Collection friends = new LinkedList();
-
-	private Set someSet = new HashSet();
-
-	private Map someMap = new HashMap();
-
-	private List someList = new ArrayList();
-
-	private Properties someProperties = new Properties();
-
-	private INestedTestBean doctor = new NestedTestBean();
-
-	private INestedTestBean lawyer = new NestedTestBean();
-
-	private IndexedTestBean nestedIndexedBean;
-
-	private boolean destroyed;
-
-	private Number someNumber;
-
-	private Colour favouriteColour;
-
-	private Boolean someBoolean;
-
-	private List otherColours;
-
-	private List pets;
-
-
-	public TestBean() {
-	}
-
-	public TestBean(String name) {
-		this.name = name;
-	}
-
-	public TestBean(ITestBean spouse) {
-		this.spouses = new ITestBean[] {spouse};
-	}
-
-	public TestBean(String name, int age) {
-		this.name = name;
-		this.age = age;
-	}
-
-	public TestBean(ITestBean spouse, Properties someProperties) {
-		this.spouses = new ITestBean[] {spouse};
-		this.someProperties = someProperties;
-	}
-
-	public TestBean(List someList) {
-		this.someList = someList;
-	}
-
-	public TestBean(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public TestBean(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public TestBean(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-
-	@Override
-	public void setBeanName(String beanName) {
-		this.beanName = beanName;
-	}
-
-	public String getBeanName() {
-		return beanName;
-	}
-
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) {
-		this.beanFactory = beanFactory;
-	}
-
-	public BeanFactory getBeanFactory() {
-		return beanFactory;
-	}
-
-	public void setPostProcessed(boolean postProcessed) {
-		this.postProcessed = postProcessed;
-	}
-
-	public boolean isPostProcessed() {
-		return postProcessed;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getSex() {
-		return sex;
-	}
-
-	public void setSex(String sex) {
-		this.sex = sex;
-		if (this.name == null) {
-			this.name = sex;
-		}
-	}
-
-	@Override
-	public int getAge() {
-		return age;
-	}
-
-	@Override
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-	public boolean isJedi() {
-		return jedi;
-	}
-
-	public void setJedi(boolean jedi) {
-		this.jedi = jedi;
-	}
-
-	@Override
-	public ITestBean getSpouse() {
-		return (spouses != null ? spouses[0] : null);
-	}
-
-	@Override
-	public void setSpouse(ITestBean spouse) {
-		this.spouses = new ITestBean[] {spouse};
-	}
-
-	@Override
-	public ITestBean[] getSpouses() {
-		return spouses;
-	}
-
-	public String getTouchy() {
-		return touchy;
-	}
-
-	public void setTouchy(String touchy) throws Exception {
-		if (touchy.indexOf('.') != -1) {
-			throw new Exception("Can't contain a .");
-		}
-		if (touchy.indexOf(',') != -1) {
-			throw new NumberFormatException("Number format exception: contains a ,");
-		}
-		this.touchy = touchy;
-	}
-
-	public String getCountry() {
-		return country;
-	}
-
-	public void setCountry(String country) {
-		this.country = country;
-	}
-
-	@Override
-	public String[] getStringArray() {
-		return stringArray;
-	}
-
-	@Override
-	public void setStringArray(String[] stringArray) {
-		this.stringArray = stringArray;
-	}
-
-	public Integer[] getSomeIntegerArray() {
-		return someIntegerArray;
-	}
-
-	public void setSomeIntegerArray(Integer[] someIntegerArray) {
-		this.someIntegerArray = someIntegerArray;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public Float getMyFloat() {
-		return myFloat;
-	}
-
-	public void setMyFloat(Float myFloat) {
-		this.myFloat = myFloat;
-	}
-
-	public Collection getFriends() {
-		return friends;
-	}
-
-	public void setFriends(Collection friends) {
-		this.friends = friends;
-	}
-
-	public Set getSomeSet() {
-		return someSet;
-	}
-
-	public void setSomeSet(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public Map getSomeMap() {
-		return someMap;
-	}
-
-	public void setSomeMap(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public List getSomeList() {
-		return someList;
-	}
-
-	public void setSomeList(List someList) {
-		this.someList = someList;
-	}
-
-	public Properties getSomeProperties() {
-		return someProperties;
-	}
-
-	public void setSomeProperties(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-	@Override
-	public INestedTestBean getDoctor() {
-		return doctor;
-	}
-
-	public void setDoctor(INestedTestBean doctor) {
-		this.doctor = doctor;
-	}
-
-	@Override
-	public INestedTestBean getLawyer() {
-		return lawyer;
-	}
-
-	public void setLawyer(INestedTestBean lawyer) {
-		this.lawyer = lawyer;
-	}
-
-	public Number getSomeNumber() {
-		return someNumber;
-	}
-
-	public void setSomeNumber(Number someNumber) {
-		this.someNumber = someNumber;
-	}
-
-	public Colour getFavouriteColour() {
-		return favouriteColour;
-	}
-
-	public void setFavouriteColour(Colour favouriteColour) {
-		this.favouriteColour = favouriteColour;
-	}
-
-	public Boolean getSomeBoolean() {
-		return someBoolean;
-	}
-
-	public void setSomeBoolean(Boolean someBoolean) {
-		this.someBoolean = someBoolean;
-	}
-
-	@Override
-	public IndexedTestBean getNestedIndexedBean() {
-		return nestedIndexedBean;
-	}
-
-	public void setNestedIndexedBean(IndexedTestBean nestedIndexedBean) {
-		this.nestedIndexedBean = nestedIndexedBean;
-	}
-
-	public List getOtherColours() {
-		return otherColours;
-	}
-
-	public void setOtherColours(List otherColours) {
-		this.otherColours = otherColours;
-	}
-
-	public List getPets() {
-		return pets;
-	}
-
-	public void setPets(List pets) {
-		this.pets = pets;
-	}
-
-
-	/**
-	 * @see org.springframework.beans.ITestBean#exceptional(Throwable)
-	 */
-	@Override
-	public void exceptional(Throwable t) throws Throwable {
-		if (t != null) {
-			throw t;
-		}
-	}
-
-	@Override
-	public void unreliableFileOperation() throws IOException {
-		throw new IOException();
-	}
-	/**
-	 * @see org.springframework.beans.ITestBean#returnsThis()
-	 */
-	@Override
-	public Object returnsThis() {
-		return this;
-	}
-
-	/**
-	 * @see org.springframework.beans.IOther#absquatulate()
-	 */
-	@Override
-	public void absquatulate() {
-	}
-
-	@Override
-	public int haveBirthday() {
-		return age++;
-	}
-
-
-	public void destroy() {
-		this.destroyed = true;
-	}
-
-	public boolean wasDestroyed() {
-		return destroyed;
-	}
-
-
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (other == null || !(other instanceof TestBean)) {
-			return false;
-		}
-		TestBean tb2 = (TestBean) other;
-		return (ObjectUtils.nullSafeEquals(this.name, tb2.name) && this.age == tb2.age);
-	}
-
-	public int hashCode() {
-		return this.age;
-	}
-
-	@Override
-	public int compareTo(Object other) {
-		if (this.name != null && other instanceof TestBean) {
-			return this.name.compareTo(((TestBean) other).getName());
-		}
-		else {
-			return 1;
-		}
-	}
-
-	public String toString() {
-		return this.name;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java b/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
deleted file mode 100644
index c7066b5cc7f..00000000000
--- a/spring-tx/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans.factory.parsing;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.core.CollectionFactory;
-
-/**
- * @author Rob Harrop
- * @author Juergen Hoeller
- */
-public class CollectingReaderEventListener implements ReaderEventListener {
-
-	private final List defaults = new LinkedList();
-
-	private final Map componentDefinitions = new LinkedHashMap<>(8);
-
-	private final Map aliasMap = new LinkedHashMap<>(8);
-
-	private final List imports = new LinkedList();
-
-
-	@Override
-	public void defaultsRegistered(DefaultsDefinition defaultsDefinition) {
-		this.defaults.add(defaultsDefinition);
-	}
-
-	public List getDefaults() {
-		return Collections.unmodifiableList(this.defaults);
-	}
-
-	@Override
-	public void componentRegistered(ComponentDefinition componentDefinition) {
-		this.componentDefinitions.put(componentDefinition.getName(), componentDefinition);
-	}
-
-	public ComponentDefinition getComponentDefinition(String name) {
-		return (ComponentDefinition) this.componentDefinitions.get(name);
-	}
-
-	public ComponentDefinition[] getComponentDefinitions() {
-		Collection collection = this.componentDefinitions.values();
-		return (ComponentDefinition[]) collection.toArray(new ComponentDefinition[collection.size()]);
-	}
-
-	@Override
-	public void aliasRegistered(AliasDefinition aliasDefinition) {
-		List aliases = (List) this.aliasMap.get(aliasDefinition.getBeanName());
-		if(aliases == null) {
-			aliases = new ArrayList();
-			this.aliasMap.put(aliasDefinition.getBeanName(), aliases);
-		}
-		aliases.add(aliasDefinition);
-	}
-
-	public List getAliases(String beanName) {
-		List aliases = (List) this.aliasMap.get(beanName);
-		return aliases == null ? null : Collections.unmodifiableList(aliases);
-	}
-
-	@Override
-	public void importProcessed(ImportDefinition importDefinition) {
-		this.imports.add(importDefinition);
-	}
-
-	public List getImports() {
-		return Collections.unmodifiableList(this.imports);
-	}
-
-}
diff --git a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
deleted file mode 100644
index 4e1641b2cd8..00000000000
--- a/spring-tx/src/test/java/org/springframework/mock/jndi/SimpleNamingContext.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.mock.jndi;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-import javax.naming.Binding;
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NameClassPair;
-import javax.naming.NameNotFoundException;
-import javax.naming.NameParser;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.OperationNotSupportedException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.util.StringUtils;
-
-/**
- * Simple implementation of a JNDI naming context.
- * Only supports binding plain Objects to String names.
- * Mainly for test environments, but also usable for standalone applications.
- *
- * 
This class is not intended for direct usage by applications, although it
- * can be used for example to override JndiTemplate's {@code createInitialContext}
- * method in unit tests. Typically, SimpleNamingContextBuilder will be used to
- * set up a JVM-level JNDI environment.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @see SimpleNamingContextBuilder
- * @see org.springframework.jndi.JndiTemplate#createInitialContext
- */
-public class SimpleNamingContext implements Context {
-
-	private final Log logger = LogFactory.getLog(getClass());
-
-	private final String root;
-
-	private final Hashtable boundObjects;
-
-	private final Hashtable environment = new Hashtable();
-
-
-	/**
-	 * Create a new naming context.
-	 */
-	public SimpleNamingContext() {
-		this("");
-	}
-
-	/**
-	 * Create a new naming context with the given naming root.
-	 */
-	public SimpleNamingContext(String root) {
-		this.root = root;
-		this.boundObjects = new Hashtable();
-	}
-
-	/**
-	 * Create a new naming context with the given naming root,
-	 * the given name/object map, and the JNDI environment entries.
-	 */
-	public SimpleNamingContext(String root, Hashtable boundObjects, Hashtable env) {
-		this.root = root;
-		this.boundObjects = boundObjects;
-		if (env != null) {
-			this.environment.putAll(env);
-		}
-	}
-
-
-	// Actual implementations of Context methods follow
-
-	@Override
-	public NamingEnumeration list(String root) throws NamingException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Listing name/class pairs under [" + root + "]");
-		}
-		return new NameClassPairEnumeration(this, root);
-	}
-
-	@Override
-	public NamingEnumeration listBindings(String root) throws NamingException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Listing bindings under [" + root + "]");
-		}
-		return new BindingEnumeration(this, root);
-	}
-
-	/**
-	 * Look up the object with the given name.
-	 * 
Note: Not intended for direct use by applications.
-	 * Will be used by any standard InitialContext JNDI lookups.
-	 * @throws javax.naming.NameNotFoundException if the object could not be found
-	 */
-	@Override
-	public Object lookup(String lookupName) throws NameNotFoundException {
-		String name = this.root + lookupName;
-		if (logger.isDebugEnabled()) {
-			logger.debug("Static JNDI lookup: [" + name + "]");
-		}
-		if ("".equals(name)) {
-			return new SimpleNamingContext(this.root, this.boundObjects, this.environment);
-		}
-		Object found = this.boundObjects.get(name);
-		if (found == null) {
-			if (!name.endsWith("/")) {
-				name = name + "/";
-			}
-			for (String boundName : this.boundObjects.keySet()) {
-				if (boundName.startsWith(name)) {
-					return new SimpleNamingContext(name, this.boundObjects, this.environment);
-				}
-			}
-			throw new NameNotFoundException(
-					"Name [" + this.root + lookupName + "] not bound; " + this.boundObjects.size() + " bindings: [" +
-					StringUtils.collectionToDelimitedString(this.boundObjects.keySet(), ",") + "]");
-		}
-		return found;
-	}
-
-	@Override
-	public Object lookupLink(String name) throws NameNotFoundException {
-		return lookup(name);
-	}
-
-	/**
-	 * Bind the given object to the given name.
-	 * Note: Not intended for direct use by applications
-	 * if setting up a JVM-level JNDI environment.
-	 * Use SimpleNamingContextBuilder to set up JNDI bindings then.
-	 * @see org.springframework.mock.jndi.SimpleNamingContextBuilder#bind
-	 */
-	@Override
-	public void bind(String name, Object obj) {
-		if (logger.isInfoEnabled()) {
-			logger.info("Static JNDI binding: [" + this.root + name + "] = [" + obj + "]");
-		}
-		this.boundObjects.put(this.root + name, obj);
-	}
-
-	@Override
-	public void unbind(String name) {
-		if (logger.isInfoEnabled()) {
-			logger.info("Static JNDI remove: [" + this.root + name + "]");
-		}
-		this.boundObjects.remove(this.root + name);
-	}
-
-	@Override
-	public void rebind(String name, Object obj) {
-		bind(name, obj);
-	}
-
-	@Override
-	public void rename(String oldName, String newName) throws NameNotFoundException {
-		Object obj = lookup(oldName);
-		unbind(oldName);
-		bind(newName, obj);
-	}
-
-	@Override
-	public Context createSubcontext(String name) {
-		String subcontextName = this.root + name;
-		if (!subcontextName.endsWith("/")) {
-			subcontextName += "/";
-		}
-		Context subcontext = new SimpleNamingContext(subcontextName, this.boundObjects, this.environment);
-		bind(name, subcontext);
-		return subcontext;
-	}
-
-	@Override
-	public void destroySubcontext(String name) {
-		unbind(name);
-	}
-
-	@Override
-	public String composeName(String name, String prefix) {
-		return prefix + name;
-	}
-
-	@Override
-	public Hashtable getEnvironment() {
-		return this.environment;
-	}
-
-	@Override
-	public Object addToEnvironment(String propName, Object propVal) {
-		return this.environment.put(propName, propVal);
-	}
-
-	@Override
-	public Object removeFromEnvironment(String propName) {
-		return this.environment.remove(propName);
-	}
-
-	@Override
-	public void close() {
-	}
-
-
-	// Unsupported methods follow: no support for javax.naming.Name
-
-	@Override
-	public NamingEnumeration list(Name name) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public NamingEnumeration listBindings(Name name) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public Object lookup(Name name) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public Object lookupLink(Name name) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public void bind(Name name, Object obj) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public void unbind(Name name) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public void rebind(Name name, Object obj) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public void rename(Name oldName, Name newName) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public Context createSubcontext(Name name) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public void destroySubcontext(Name name) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public String getNameInNamespace() throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public NameParser getNameParser(Name name) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public NameParser getNameParser(String name) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-	@Override
-	public Name composeName(Name name, Name prefix) throws NamingException {
-		throw new OperationNotSupportedException("SimpleNamingContext does not support [javax.naming.Name]");
-	}
-
-
-	private static abstract class AbstractNamingEnumeration implements NamingEnumeration {
-
-		private Iterator iterator;
-
-		private AbstractNamingEnumeration(SimpleNamingContext context, String proot) throws NamingException {
-			if (!"".equals(proot) && !proot.endsWith("/")) {
-				proot = proot + "/";
-			}
-			String root = context.root + proot;
-			Map contents = new HashMap();
-			for (String boundName : context.boundObjects.keySet()) {
-				if (boundName.startsWith(root)) {
-					int startIndex = root.length();
-					int endIndex = boundName.indexOf('/', startIndex);
-					String strippedName =
-							(endIndex != -1 ? boundName.substring(startIndex, endIndex) : boundName.substring(startIndex));
-					if (!contents.containsKey(strippedName)) {
-						try {
-							contents.put(strippedName, createObject(strippedName, context.lookup(proot + strippedName)));
-						}
-						catch (NameNotFoundException ex) {
-							// cannot happen
-						}
-					}
-				}
-			}
-			if (contents.size() == 0) {
-				throw new NamingException("Invalid root: [" + context.root + proot + "]");
-			}
-			this.iterator = contents.values().iterator();
-		}
-
-		protected abstract T createObject(String strippedName, Object obj);
-
-		@Override
-		public boolean hasMore() {
-			return this.iterator.hasNext();
-		}
-
-		@Override
-		public T next() {
-			return this.iterator.next();
-		}
-
-		@Override
-		public boolean hasMoreElements() {
-			return this.iterator.hasNext();
-		}
-
-		@Override
-		public T nextElement() {
-			return this.iterator.next();
-		}
-
-		@Override
-		public void close() {
-		}
-	}
-
-
-	private static class NameClassPairEnumeration extends AbstractNamingEnumeration {
-
-		private NameClassPairEnumeration(SimpleNamingContext context, String root) throws NamingException {
-			super(context, root);
-		}
-
-		@Override
-		protected NameClassPair createObject(String strippedName, Object obj) {
-			return new NameClassPair(strippedName, obj.getClass().getName());
-		}
-	}
-
-
-	private static class BindingEnumeration extends AbstractNamingEnumeration {
-
-		private BindingEnumeration(SimpleNamingContext context, String root) throws NamingException {
-			super(context, root);
-		}
-
-		@Override
-		protected Binding createObject(String strippedName, Object obj) {
-			return new Binding(strippedName, obj);
-		}
-	}
-
-}
diff --git a/spring-test/src/test/java/org/springframework/test/transaction/CallCountingTransactionManager.java b/spring-tx/src/test/java/org/springframework/tests/transaction/CallCountingTransactionManager.java
similarity index 97%
rename from spring-test/src/test/java/org/springframework/test/transaction/CallCountingTransactionManager.java
rename to spring-tx/src/test/java/org/springframework/tests/transaction/CallCountingTransactionManager.java
index 13f3b5d360d..d3852d4e34a 100644
--- a/spring-test/src/test/java/org/springframework/test/transaction/CallCountingTransactionManager.java
+++ b/spring-tx/src/test/java/org/springframework/tests/transaction/CallCountingTransactionManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.test.transaction;
+package org.springframework.tests.transaction;
 
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.support.AbstractPlatformTransactionManager;
@@ -33,7 +33,6 @@ public class CallCountingTransactionManager extends AbstractPlatformTransactionM
 	public int rollbacks;
 	public int inflight;
 
-
 	@Override
 	protected Object doGetTransaction() {
 		return new Object();
diff --git a/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java b/spring-tx/src/test/java/org/springframework/tests/transaction/MockJtaTransaction.java
similarity index 96%
rename from spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java
rename to spring-tx/src/test/java/org/springframework/tests/transaction/MockJtaTransaction.java
index e2066af4d92..eb68f255173 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/MockJtaTransaction.java
+++ b/spring-tx/src/test/java/org/springframework/tests/transaction/MockJtaTransaction.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.transaction;
+package org.springframework.tests.transaction;
 
 import javax.transaction.Status;
 import javax.transaction.Synchronization;
diff --git a/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
deleted file mode 100644
index b1862dd8937..00000000000
--- a/spring-tx/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.transaction;
-
-import org.springframework.transaction.support.AbstractPlatformTransactionManager;
-import org.springframework.transaction.support.DefaultTransactionStatus;
-
-/**
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-@SuppressWarnings("serial")
-public class CallCountingTransactionManager extends AbstractPlatformTransactionManager {
-
-	public TransactionDefinition lastDefinition;
-	public int begun;
-	public int commits;
-	public int rollbacks;
-	public int inflight;
-
-	@Override
-	protected Object doGetTransaction() {
-		return new Object();
-	}
-
-	@Override
-	protected void doBegin(Object transaction, TransactionDefinition definition) {
-		this.lastDefinition = definition;
-		++begun;
-		++inflight;
-	}
-
-	@Override
-	protected void doCommit(DefaultTransactionStatus status) {
-		++commits;
-		--inflight;
-	}
-
-	@Override
-	protected void doRollback(DefaultTransactionStatus status) {
-		++rollbacks;
-		--inflight;
-	}
-
-	public void clear() {
-		begun = commits = rollbacks = inflight = 0;
-	}
-
-}
diff --git a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java
index 11566aeee71..04e937b7ecc 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/JndiJtaTransactionManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import javax.transaction.UserTransaction;
 import junit.framework.TestCase;
 import org.easymock.MockControl;
 
-import org.springframework.mock.jndi.ExpectedLookupTemplate;
+import org.springframework.tests.mock.jndi.ExpectedLookupTemplate;
 import org.springframework.transaction.jta.JtaTransactionManager;
 import org.springframework.transaction.jta.UserTransactionAdapter;
 import org.springframework.transaction.support.TransactionCallbackWithoutResult;
diff --git a/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java
index 8bb61812009..c13ea6bc417 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/JtaTransactionManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@ import junit.framework.TestCase;
 import org.easymock.MockControl;
 
 import org.springframework.dao.OptimisticLockingFailureException;
+import org.springframework.tests.transaction.MockJtaTransaction;
 import org.springframework.transaction.jta.JtaTransactionManager;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 import org.springframework.transaction.support.TransactionCallbackWithoutResult;
diff --git a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java
index 38c7e20d224..3f4286e51b9 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerEventTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,11 @@ package org.springframework.transaction;
 import junit.framework.TestCase;
 
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
-import org.springframework.beans.factory.parsing.CollectingReaderEventListener;
 import org.springframework.beans.factory.parsing.ComponentDefinition;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.tests.beans.CollectingReaderEventListener;
 
 /**
  * @author Torsten Juergeleit
diff --git a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java
index 7808f43b991..813a905e079 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/TxNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,8 @@ import java.lang.reflect.Method;
 import junit.framework.TestCase;
 
 import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.ITestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.transaction.interceptor.TransactionAttribute;
diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java
index 7caafe92c21..ad05997a079 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ import org.junit.Test;
 
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.interceptor.NoRollbackRuleAttribute;
 import org.springframework.transaction.interceptor.RollbackRuleAttribute;
 import org.springframework.transaction.interceptor.RuleBasedTransactionAttribute;
diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java
index 21c5f5374fb..556cb599659 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionInterceptorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ package org.springframework.transaction.annotation;
 import junit.framework.TestCase;
 
 import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.interceptor.TransactionInterceptor;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java
index 0f0deca8663..92f1ed65142 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.jmx.export.annotation.ManagedOperation;
 import org.springframework.jmx.export.annotation.ManagedResource;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 
 /**
  * @author Rob Harrop
diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java b/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java
index 417859b43ec..5c11e26d5dd 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.AnnotationTransactionNamespaceHandlerTests.TransactionalTestBean;
 
diff --git a/spring-tx/src/test/java/org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml b/spring-tx/src/test/java/org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml
index d30fd87be1a..bd659fd8934 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml
+++ b/spring-tx/src/test/java/org/springframework/transaction/annotation/annotationTransactionNamespaceHandlerTests.xml
@@ -11,7 +11,7 @@
 
 	
 
-	
+	
 
 	
diff --git a/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java b/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java
index d6a79128d0f..ee458c0cf84 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/config/AnnotationDrivenTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import org.springframework.aop.support.AopUtils;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.SerializationTestUtils;
 
diff --git a/spring-tx/src/test/java/org/springframework/transaction/config/TransactionManagerConfiguration.java b/spring-tx/src/test/java/org/springframework/transaction/config/TransactionManagerConfiguration.java
index 11a649ad50d..965a0db01e0 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/config/TransactionManagerConfiguration.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/config/TransactionManagerConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ package org.springframework.transaction.config;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 
 /**
diff --git a/spring-tx/src/test/java/org/springframework/transaction/config/annotationDrivenProxyTargetClassTests.xml b/spring-tx/src/test/java/org/springframework/transaction/config/annotationDrivenProxyTargetClassTests.xml
index ea4f7189c83..a707e84fd36 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/config/annotationDrivenProxyTargetClassTests.xml
+++ b/spring-tx/src/test/java/org/springframework/transaction/config/annotationDrivenProxyTargetClassTests.xml
@@ -12,11 +12,11 @@
 
 	
 
-	
+	
 		
 	
 	
-	
+	
 		
 		
 	
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
index 7a818f701be..2b01ef4a916 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/AbstractTransactionAspectTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@ import java.lang.reflect.Method;
 import junit.framework.TestCase;
 import org.easymock.MockControl;
 
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.transaction.CannotCreateTransactionException;
 import org.springframework.transaction.MockCallbackPreferringTransactionManager;
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java
index a34a228a456..1ff4a262f4e 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/BeanFactoryTransactionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,14 +28,14 @@ import org.easymock.MockControl;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.aop.support.StaticMethodMatcherPointcut;
 import org.springframework.aop.target.HotSwappableTargetSource;
-import org.springframework.beans.DerivedTestBean;
+import org.springframework.tests.sample.beans.DerivedTestBean;
 import org.springframework.beans.FatalBeanException;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionException;
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/ImplementsNoInterfaces.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/ImplementsNoInterfaces.java
index 302026a7aaa..79885dd3ee3 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/ImplementsNoInterfaces.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/ImplementsNoInterfaces.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.transaction.interceptor;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * Test for CGLIB proxying that implements no interfaces
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/noTransactionAttributeSource.xml b/spring-tx/src/test/java/org/springframework/transaction/interceptor/noTransactionAttributeSource.xml
index 09c860fffd5..e9ef193b449 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/noTransactionAttributeSource.xml
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/noTransactionAttributeSource.xml
@@ -4,11 +4,11 @@
 
 
 	
-		
+	
 		custom
 		666
 	
-	
+
 	
 
 	
-	
+	
 		custom
 		666
 		
@@ -22,16 +22,16 @@
 		
 		
 			
-				org.springframework.beans.ITestBean.s*=PROPAGATION_MANDATORY
-				org.springframework.beans.ITestBean.setAg*=PROPAGATION_REQUIRED
-				org.springframework.beans.ITestBean.set*= PROPAGATION_SUPPORTS , readOnly
+				org.springframework.tests.sample.beans.ITestBean.s*=PROPAGATION_MANDATORY
+				org.springframework.tests.sample.beans.ITestBean.setAg*=PROPAGATION_REQUIRED
+				org.springframework.tests.sample.beans.ITestBean.set*= PROPAGATION_SUPPORTS , readOnly
 			
 		
 	
 
 	
 		
-			org.springframework.beans.ITestBean
+			org.springframework.tests.sample.beans.ITestBean
 		
 		
 			
diff --git a/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java b/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java
index 12c70ed91c2..5630bd82197 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/jta/WebSphereUowTransactionManagerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ import junit.framework.TestCase;
 import org.easymock.MockControl;
 
 import org.springframework.dao.OptimisticLockingFailureException;
-import org.springframework.mock.jndi.ExpectedLookupTemplate;
+import org.springframework.tests.mock.jndi.ExpectedLookupTemplate;
 import org.springframework.transaction.IllegalTransactionStateException;
 import org.springframework.transaction.NestedTransactionNotSupportedException;
 import org.springframework.transaction.TransactionDefinition;
diff --git a/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java b/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
index 99f791a5328..ff819d3ede5 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/support/JtaTransactionManagerSerializationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import javax.transaction.UserTransaction;
 
 import junit.framework.TestCase;
 
-import org.springframework.mock.jndi.SimpleNamingContextBuilder;
+import org.springframework.tests.mock.jndi.SimpleNamingContextBuilder;
 import org.springframework.transaction.jta.JtaTransactionManager;
 import org.springframework.util.SerializationTestUtils;
 
diff --git a/spring-tx/src/test/java/org/springframework/transaction/txNamespaceHandlerTests.xml b/spring-tx/src/test/java/org/springframework/transaction/txNamespaceHandlerTests.xml
index 0a4b7e9f1c5..a8adf10c6df 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/txNamespaceHandlerTests.xml
+++ b/spring-tx/src/test/java/org/springframework/transaction/txNamespaceHandlerTests.xml
@@ -26,8 +26,8 @@
 		
 	
 
-	
+	
 
-	
+	
 
 
diff --git a/spring-tx/src/test/java/org/springframework/util/SerializationTestUtils.java b/spring-tx/src/test/java/org/springframework/util/SerializationTestUtils.java
deleted file mode 100644
index dbe6421093e..00000000000
--- a/spring-tx/src/test/java/org/springframework/util/SerializationTestUtils.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * The Spring Framework is published under the terms
- * of the Apache Software License.
- */
-
-package org.springframework.util;
-
-import java.awt.Point;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.NotSerializableException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-
-import junit.framework.TestCase;
-
-import org.springframework.beans.TestBean;
-
-/**
- * Utilities for testing serializability of objects.
- * Exposes static methods for use in other test cases.
- * Extends TestCase only to test itself.
- *
- * @author Rod Johnson
- */
-public class SerializationTestUtils extends TestCase {
-
-	public static void testSerialization(Object o) throws IOException {
-		OutputStream baos = new ByteArrayOutputStream();
-		ObjectOutputStream oos = new ObjectOutputStream(baos);
-		oos.writeObject(o);
-	}
-
-	public static boolean isSerializable(Object o) throws IOException {
-		try {
-			testSerialization(o);
-			return true;
-		}
-		catch (NotSerializableException ex) {
-			return false;
-		}
-	}
-
-	public static Object serializeAndDeserialize(Object o) throws IOException, ClassNotFoundException {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ObjectOutputStream oos = new ObjectOutputStream(baos);
-		oos.writeObject(o);
-		oos.flush();
-		baos.flush();
-		byte[] bytes = baos.toByteArray();
-
-		ByteArrayInputStream is = new ByteArrayInputStream(bytes);
-		ObjectInputStream ois = new ObjectInputStream(is);
-		Object o2 = ois.readObject();
-
-		return o2;
-	}
-
-	public SerializationTestUtils(String s) {
-		super(s);
-	}
-
-	public void testWithNonSerializableObject() throws IOException {
-		TestBean o = new TestBean();
-		assertFalse(o instanceof Serializable);
-
-		assertFalse(isSerializable(o));
-
-		try {
-			testSerialization(o);
-			fail();
-		}
-		catch (NotSerializableException ex) {
-			// Ok
-		}
-	}
-
-	public void testWithSerializableObject() throws Exception {
-		int x = 5;
-		int y = 10;
-		Point p = new Point(x, y);
-		assertTrue(p instanceof Serializable);
-
-		testSerialization(p);
-
-		assertTrue(isSerializable(p));
-
-		Point p2 = (Point) serializeAndDeserialize(p);
-		assertNotSame(p, p2);
-		assertEquals(x, (int) p2.getX());
-		assertEquals(y, (int) p2.getY());
-	}
-
-}
\ No newline at end of file
diff --git a/spring-web/src/test/java/org/springframework/beans/BeanWithObjectProperty.java b/spring-web/src/test/java/org/springframework/beans/BeanWithObjectProperty.java
deleted file mode 100644
index bb5e71f5cd0..00000000000
--- a/spring-web/src/test/java/org/springframework/beans/BeanWithObjectProperty.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2002-2005 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-/**
- * @author Juergen Hoeller
- * @since 17.08.2004
- */
-public class BeanWithObjectProperty {
-
-	private Object object;
-
-	public Object getObject() {
-		return object;
-	}
-
-	public void setObject(Object object) {
-		this.object = object;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-web/src/test/java/org/springframework/beans/Colour.java b/spring-web/src/test/java/org/springframework/beans/Colour.java
deleted file mode 100644
index a992a2ebfc6..00000000000
--- a/spring-web/src/test/java/org/springframework/beans/Colour.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import org.springframework.core.enums.ShortCodedLabeledEnum;
-
-/**
- * @author Rob Harrop
- */
-@SuppressWarnings("serial")
-public class Colour extends ShortCodedLabeledEnum {
-
-	public static final Colour RED = new Colour(0, "RED");
-	public static final Colour BLUE = new Colour(1, "BLUE");
-	public static final Colour GREEN = new Colour(2, "GREEN");
-	public static final Colour PURPLE = new Colour(3, "PURPLE");
-
-	private Colour(int code, String label) {
-		super(code, label);
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java
deleted file mode 100644
index c5360de5316..00000000000
--- a/spring-web/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.Serializable;
-
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.beans.factory.DisposableBean;
-
-/**
- * @author Juergen Hoeller
- * @since 21.08.2003
- */
-@SuppressWarnings("serial")
-public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean {
-
-	private String beanName;
-
-	private boolean initialized;
-
-	private boolean destroyed;
-
-
-	public DerivedTestBean() {
-	}
-
-	public DerivedTestBean(String[] names) {
-		if (names == null || names.length < 2) {
-			throw new IllegalArgumentException("Invalid names array");
-		}
-		setName(names[0]);
-		setBeanName(names[1]);
-	}
-
-	public static DerivedTestBean create(String[] names) {
-		return new DerivedTestBean(names);
-	}
-
-
-	@Override
-	public void setBeanName(String beanName) {
-		if (this.beanName == null || beanName == null) {
-			this.beanName = beanName;
-		}
-	}
-
-	@Override
-	public String getBeanName() {
-		return beanName;
-	}
-
-	public void setSpouseRef(String name) {
-		setSpouse(new TestBean(name));
-	}
-
-
-	public void initialize() {
-		this.initialized = true;
-	}
-
-	public boolean wasInitialized() {
-		return initialized;
-	}
-
-
-	@Override
-	public void destroy() {
-		this.destroyed = true;
-	}
-
-	@Override
-	public boolean wasDestroyed() {
-		return destroyed;
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/beans/FieldAccessBean.java b/spring-web/src/test/java/org/springframework/beans/FieldAccessBean.java
deleted file mode 100644
index 61f911902c7..00000000000
--- a/spring-web/src/test/java/org/springframework/beans/FieldAccessBean.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2002-2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-/**
- * @author Juergen Hoeller
- * @since 07.03.2006
- */
-public class FieldAccessBean {
-
-	public String name;
-
-	protected int age;
-
-	private TestBean spouse;
-
-
-	public String getName() {
-		return name;
-	}
-
-	public int getAge() {
-		return age;
-	}
-
-	public TestBean getSpouse() {
-		return spouse;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-web/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-web/src/test/java/org/springframework/beans/INestedTestBean.java
deleted file mode 100644
index e0ae5f20a3f..00000000000
--- a/spring-web/src/test/java/org/springframework/beans/INestedTestBean.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-public interface INestedTestBean {
-
-	public String getCompany();
-
-}
\ No newline at end of file
diff --git a/spring-web/src/test/java/org/springframework/beans/IOther.java b/spring-web/src/test/java/org/springframework/beans/IOther.java
deleted file mode 100644
index d7fb346185a..00000000000
--- a/spring-web/src/test/java/org/springframework/beans/IOther.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-public interface IOther {
-
-	void absquatulate();
-
-}
\ No newline at end of file
diff --git a/spring-web/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-web/src/test/java/org/springframework/beans/IndexedTestBean.java
deleted file mode 100644
index ddb091770ee..00000000000
--- a/spring-web/src/test/java/org/springframework/beans/IndexedTestBean.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2002-2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-/**
- * @author Juergen Hoeller
- * @since 11.11.2003
- */
-public class IndexedTestBean {
-
-	private TestBean[] array;
-
-	private Collection collection;
-
-	private List list;
-
-	private Set set;
-
-	private SortedSet sortedSet;
-
-	private Map map;
-
-	private SortedMap sortedMap;
-
-
-	public IndexedTestBean() {
-		this(true);
-	}
-
-	public IndexedTestBean(boolean populate) {
-		if (populate) {
-			populate();
-		}
-	}
-
-	public void populate() {
-		TestBean tb0 = new TestBean("name0", 0);
-		TestBean tb1 = new TestBean("name1", 0);
-		TestBean tb2 = new TestBean("name2", 0);
-		TestBean tb3 = new TestBean("name3", 0);
-		TestBean tb4 = new TestBean("name4", 0);
-		TestBean tb5 = new TestBean("name5", 0);
-		TestBean tb6 = new TestBean("name6", 0);
-		TestBean tb7 = new TestBean("name7", 0);
-		TestBean tbX = new TestBean("nameX", 0);
-		TestBean tbY = new TestBean("nameY", 0);
-		this.array = new TestBean[] {tb0, tb1};
-		this.list = new ArrayList();
-		this.list.add(tb2);
-		this.list.add(tb3);
-		this.set = new TreeSet();
-		this.set.add(tb6);
-		this.set.add(tb7);
-		this.map = new HashMap();
-		this.map.put("key1", tb4);
-		this.map.put("key2", tb5);
-		this.map.put("key.3", tb5);
-		List list = new ArrayList();
-		list.add(tbX);
-		list.add(tbY);
-		this.map.put("key4", list);
-	}
-
-
-	public TestBean[] getArray() {
-		return array;
-	}
-
-	public void setArray(TestBean[] array) {
-		this.array = array;
-	}
-
-	public Collection getCollection() {
-		return collection;
-	}
-
-	public void setCollection(Collection collection) {
-		this.collection = collection;
-	}
-
-	public List getList() {
-		return list;
-	}
-
-	public void setList(List list) {
-		this.list = list;
-	}
-
-	public Set getSet() {
-		return set;
-	}
-
-	public void setSet(Set set) {
-		this.set = set;
-	}
-
-	public SortedSet getSortedSet() {
-		return sortedSet;
-	}
-
-	public void setSortedSet(SortedSet sortedSet) {
-		this.sortedSet = sortedSet;
-	}
-
-	public Map getMap() {
-		return map;
-	}
-
-	public void setMap(Map map) {
-		this.map = map;
-	}
-
-	public SortedMap getSortedMap() {
-		return sortedMap;
-	}
-
-	public void setSortedMap(SortedMap sortedMap) {
-		this.sortedMap = sortedMap;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java
deleted file mode 100644
index 412891c439b..00000000000
--- a/spring-web/src/test/java/org/springframework/beans/NestedTestBean.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-/**
- * Simple nested test bean used for testing bean factories, AOP framework etc.
- *
- * @author Trevor D. Cook
- * @since 30.09.2003
- */
-public class NestedTestBean implements INestedTestBean {
-
-	private String company = "";
-
-	public NestedTestBean() {
-	}
-
-	public NestedTestBean(String company) {
-		setCompany(company);
-	}
-
-	public void setCompany(String company) {
-		this.company = (company != null ? company : "");
-	}
-
-	@Override
-	public String getCompany() {
-		return company;
-	}
-
-	public boolean equals(Object obj) {
-		if (!(obj instanceof NestedTestBean)) {
-			return false;
-		}
-		NestedTestBean ntb = (NestedTestBean) obj;
-		return this.company.equals(ntb.company);
-	}
-
-	public int hashCode() {
-		return this.company.hashCode();
-	}
-
-	public String toString() {
-		return "NestedTestBean: " + this.company;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-web/src/test/java/org/springframework/beans/Person.java b/spring-web/src/test/java/org/springframework/beans/Person.java
deleted file mode 100644
index 7c66f4b451b..00000000000
--- a/spring-web/src/test/java/org/springframework/beans/Person.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-/**
- *
- * @author Rod Johnson
- */
-public interface Person {
-
-	String getName();
-	void setName(String name);
-	int getAge();
-	void setAge(int i);
-
-	/**
-	 * Test for non-property method matching.
-	 * If the parameter is a Throwable, it will be thrown rather than
-	 * returned.
-	 */
-	Object echo(Object o) throws Throwable;
-}
\ No newline at end of file
diff --git a/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java b/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java
deleted file mode 100644
index dbe365f4937..00000000000
--- a/spring-web/src/test/java/org/springframework/beans/SerializablePerson.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.Serializable;
-
-import org.springframework.util.ObjectUtils;
-
-/**
- * Serializable implementation of the Person interface.
- *
- * @author Rod Johnson
- */
-@SuppressWarnings("serial")
-public class SerializablePerson implements Person, Serializable {
-
-	private String name;
-	private int age;
-
-	@Override
-	public int getAge() {
-		return age;
-	}
-
-	@Override
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	@Override
-	public Object echo(Object o) throws Throwable {
-		if (o instanceof Throwable) {
-			throw (Throwable) o;
-		}
-		return o;
-	}
-
-	public boolean equals(Object other) {
-		if (!(other instanceof SerializablePerson)) {
-			return false;
-		}
-		SerializablePerson p = (SerializablePerson) other;
-		return p.age == age && ObjectUtils.nullSafeEquals(name, p.name);
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/beans/TestBean.java b/spring-web/src/test/java/org/springframework/beans/TestBean.java
deleted file mode 100644
index 1fc36aba374..00000000000
--- a/spring-web/src/test/java/org/springframework/beans/TestBean.java
+++ /dev/null
@@ -1,495 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.util.ObjectUtils;
-
-/**
- * Simple test bean used for testing bean factories, the AOP framework etc.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @since 15 April 2001
- */
-public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOther, Comparable {
-
-	private String beanName;
-
-	private String country;
-
-	private BeanFactory beanFactory;
-
-	private boolean postProcessed;
-
-	private String name;
-
-	private String sex;
-
-	private int age;
-
-	private boolean jedi;
-
-	private ITestBean[] spouses;
-
-	private String touchy;
-
-	private String[] stringArray;
-
-	private Integer[] someIntegerArray;
-
-	private Integer[][] nestedIntegerArray;
-
-	private int[] someIntArray;
-
-	private int[][] nestedIntArray;
-
-	private Date date = new Date();
-
-	private Float myFloat = new Float(0.0);
-
-	private Collection friends = new LinkedList();
-
-	private Set someSet = new HashSet();
-
-	private Map someMap = new HashMap();
-
-	private List someList = new ArrayList();
-
-	private Properties someProperties = new Properties();
-
-	private INestedTestBean doctor = new NestedTestBean();
-
-	private INestedTestBean lawyer = new NestedTestBean();
-
-	private IndexedTestBean nestedIndexedBean;
-
-	private boolean destroyed;
-
-	private Number someNumber;
-
-	private Colour favouriteColour;
-
-	private Boolean someBoolean;
-
-	private List otherColours;
-
-	private List pets;
-
-
-	public TestBean() {
-	}
-
-	public TestBean(String name) {
-		this.name = name;
-	}
-
-	public TestBean(ITestBean spouse) {
-		this.spouses = new ITestBean[] {spouse};
-	}
-
-	public TestBean(String name, int age) {
-		this.name = name;
-		this.age = age;
-	}
-
-	public TestBean(ITestBean spouse, Properties someProperties) {
-		this.spouses = new ITestBean[] {spouse};
-		this.someProperties = someProperties;
-	}
-
-	public TestBean(List someList) {
-		this.someList = someList;
-	}
-
-	public TestBean(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public TestBean(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public TestBean(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-
-	@Override
-	public void setBeanName(String beanName) {
-		this.beanName = beanName;
-	}
-
-	public String getBeanName() {
-		return beanName;
-	}
-
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) {
-		this.beanFactory = beanFactory;
-	}
-
-	public BeanFactory getBeanFactory() {
-		return beanFactory;
-	}
-
-	public void setPostProcessed(boolean postProcessed) {
-		this.postProcessed = postProcessed;
-	}
-
-	public boolean isPostProcessed() {
-		return postProcessed;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getSex() {
-		return sex;
-	}
-
-	public void setSex(String sex) {
-		this.sex = sex;
-		if (this.name == null) {
-			this.name = sex;
-		}
-	}
-
-	@Override
-	public int getAge() {
-		return age;
-	}
-
-	@Override
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-	public boolean isJedi() {
-		return jedi;
-	}
-
-	public void setJedi(boolean jedi) {
-		this.jedi = jedi;
-	}
-
-	@Override
-	public ITestBean getSpouse() {
-		return (spouses != null ? spouses[0] : null);
-	}
-
-	public void setConcreteSpouse(TestBean spouse) {
-		this.spouses = new ITestBean[] {spouse};
-	}
-
-	public TestBean getConcreteSpouse() {
-		return (spouses != null ? (TestBean) spouses[0] : null);
-	}
-
-	@Override
-	public void setSpouse(ITestBean spouse) {
-		this.spouses = new ITestBean[] {spouse};
-	}
-
-	@Override
-	public ITestBean[] getSpouses() {
-		return spouses;
-	}
-
-	public String getTouchy() {
-		return touchy;
-	}
-
-	public void setTouchy(String touchy) throws Exception {
-		if (touchy.indexOf('.') != -1) {
-			throw new Exception("Can't contain a .");
-		}
-		if (touchy.indexOf(',') != -1) {
-			throw new NumberFormatException("Number format exception: contains a ,");
-		}
-		this.touchy = touchy;
-	}
-
-	public String getCountry() {
-		return country;
-	}
-
-	public void setCountry(String country) {
-		this.country = country;
-	}
-
-	@Override
-	public String[] getStringArray() {
-		return stringArray;
-	}
-
-	@Override
-	public void setStringArray(String[] stringArray) {
-		this.stringArray = stringArray;
-	}
-
-	@Override
-	public Integer[] getSomeIntegerArray() {
-		return someIntegerArray;
-	}
-
-	@Override
-	public void setSomeIntegerArray(Integer[] someIntegerArray) {
-		this.someIntegerArray = someIntegerArray;
-	}
-
-	@Override
-	public Integer[][] getNestedIntegerArray() {
-		return nestedIntegerArray;
-	}
-
-	@Override
-	public void setNestedIntegerArray(Integer[][] nestedIntegerArray) {
-		this.nestedIntegerArray = nestedIntegerArray;
-	}
-
-	@Override
-	public int[] getSomeIntArray() {
-		return someIntArray;
-	}
-
-	@Override
-	public void setSomeIntArray(int[] someIntArray) {
-		this.someIntArray = someIntArray;
-	}
-
-	@Override
-	public int[][] getNestedIntArray() {
-		return nestedIntArray;
-	}
-
-	@Override
-	public void setNestedIntArray(int[][] nestedIntArray) {
-		this.nestedIntArray = nestedIntArray;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public Float getMyFloat() {
-		return myFloat;
-	}
-
-	public void setMyFloat(Float myFloat) {
-		this.myFloat = myFloat;
-	}
-
-	public Collection getFriends() {
-		return friends;
-	}
-
-	public void setFriends(Collection friends) {
-		this.friends = friends;
-	}
-
-	public Set getSomeSet() {
-		return someSet;
-	}
-
-	public void setSomeSet(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public Map getSomeMap() {
-		return someMap;
-	}
-
-	public void setSomeMap(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public List getSomeList() {
-		return someList;
-	}
-
-	public void setSomeList(List someList) {
-		this.someList = someList;
-	}
-
-	public Properties getSomeProperties() {
-		return someProperties;
-	}
-
-	public void setSomeProperties(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-	@Override
-	public INestedTestBean getDoctor() {
-		return doctor;
-	}
-
-	public void setDoctor(INestedTestBean doctor) {
-		this.doctor = doctor;
-	}
-
-	@Override
-	public INestedTestBean getLawyer() {
-		return lawyer;
-	}
-
-	public void setLawyer(INestedTestBean lawyer) {
-		this.lawyer = lawyer;
-	}
-
-	public Number getSomeNumber() {
-		return someNumber;
-	}
-
-	public void setSomeNumber(Number someNumber) {
-		this.someNumber = someNumber;
-	}
-
-	public Colour getFavouriteColour() {
-		return favouriteColour;
-	}
-
-	public void setFavouriteColour(Colour favouriteColour) {
-		this.favouriteColour = favouriteColour;
-	}
-
-	public Boolean getSomeBoolean() {
-		return someBoolean;
-	}
-
-	public void setSomeBoolean(Boolean someBoolean) {
-		this.someBoolean = someBoolean;
-	}
-
-	@Override
-	public IndexedTestBean getNestedIndexedBean() {
-		return nestedIndexedBean;
-	}
-
-	public void setNestedIndexedBean(IndexedTestBean nestedIndexedBean) {
-		this.nestedIndexedBean = nestedIndexedBean;
-	}
-
-	public List getOtherColours() {
-		return otherColours;
-	}
-
-	public void setOtherColours(List otherColours) {
-		this.otherColours = otherColours;
-	}
-
-	public List getPets() {
-		return pets;
-	}
-
-	public void setPets(List pets) {
-		this.pets = pets;
-	}
-
-
-	@Override
-	public void exceptional(Throwable t) throws Throwable {
-		if (t != null) {
-			throw t;
-		}
-	}
-
-	@Override
-	public void unreliableFileOperation() throws IOException {
-		throw new IOException();
-	}
-
-	@Override
-	public Object returnsThis() {
-		return this;
-	}
-
-	@Override
-	public void absquatulate() {
-	}
-
-	@Override
-	public int haveBirthday() {
-		return age++;
-	}
-
-
-	public void destroy() {
-		this.destroyed = true;
-	}
-
-	public boolean wasDestroyed() {
-		return destroyed;
-	}
-
-
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (other == null || !(other instanceof TestBean)) {
-			return false;
-		}
-		TestBean tb2 = (TestBean) other;
-		return (ObjectUtils.nullSafeEquals(this.name, tb2.name) && this.age == tb2.age);
-	}
-
-	public int hashCode() {
-		return this.age;
-	}
-
-	@Override
-	public int compareTo(Object other) {
-		if (this.name != null && other instanceof TestBean) {
-			return this.name.compareTo(((TestBean) other).getName());
-		}
-		else {
-			return 1;
-		}
-	}
-
-	public String toString() {
-		return this.name;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java
deleted file mode 100644
index 6fc7e36aa90..00000000000
--- a/spring-web/src/test/java/org/springframework/beans/factory/DummyFactory.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans.factory;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.TestBean;
-import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
-
-/**
- * Simple factory to allow testing of FactoryBean support in AbstractBeanFactory.
- * Depending on whether its singleton property is set, it will return a singleton
- * or a prototype instance.
- *
- * 
Implements InitializingBean interface, so we can check that
- * factories get this lifecycle callback if they want.
- *
- * @author Rod Johnson
- * @since 10.03.2003
- */
-public class DummyFactory
-		implements FactoryBean, BeanNameAware, BeanFactoryAware, InitializingBean, DisposableBean {
-
-	public static final String SINGLETON_NAME = "Factory singleton";
-
-	private static boolean prototypeCreated;
-
-	/**
-	 * Clear static state.
-	 */
-	public static void reset() {
-		prototypeCreated = false;
-	}
-
-
-	/**
-	 * Default is for factories to return a singleton instance.
-	 */
-	private boolean singleton = true;
-
-	private String beanName;
-
-	private AutowireCapableBeanFactory beanFactory;
-
-	private boolean postProcessed;
-
-	private boolean initialized;
-
-	private TestBean testBean;
-
-	private TestBean otherTestBean;
-
-
-	public DummyFactory() {
-		this.testBean = new TestBean();
-		this.testBean.setName(SINGLETON_NAME);
-		this.testBean.setAge(25);
-	}
-
-	/**
-	 * Return if the bean managed by this factory is a singleton.
-	 * @see FactoryBean#isSingleton()
-	 */
-	@Override
-	public boolean isSingleton() {
-		return this.singleton;
-	}
-
-	/**
-	 * Set if the bean managed by this factory is a singleton.
-	 */
-	public void setSingleton(boolean singleton) {
-		this.singleton = singleton;
-	}
-
-	@Override
-	public void setBeanName(String beanName) {
-		this.beanName = beanName;
-	}
-
-	public String getBeanName() {
-		return beanName;
-	}
-
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) {
-		this.beanFactory = (AutowireCapableBeanFactory) beanFactory;
-		this.beanFactory.applyBeanPostProcessorsBeforeInitialization(this.testBean, this.beanName);
-	}
-
-	public BeanFactory getBeanFactory() {
-		return beanFactory;
-	}
-
-	public void setPostProcessed(boolean postProcessed) {
-		this.postProcessed = postProcessed;
-	}
-
-	public boolean isPostProcessed() {
-		return postProcessed;
-	}
-
-	public void setOtherTestBean(TestBean otherTestBean) {
-		this.otherTestBean = otherTestBean;
-		this.testBean.setSpouse(otherTestBean);
-	}
-
-	public TestBean getOtherTestBean() {
-		return otherTestBean;
-	}
-
-	@Override
-	public void afterPropertiesSet() {
-		if (initialized) {
-			throw new RuntimeException("Cannot call afterPropertiesSet twice on the one bean");
-		}
-		this.initialized = true;
-	}
-
-	/**
-	 * Was this initialized by invocation of the
-	 * afterPropertiesSet() method from the InitializingBean interface?
-	 */
-	public boolean wasInitialized() {
-		return initialized;
-	}
-
-	public static boolean wasPrototypeCreated() {
-		return prototypeCreated;
-	}
-
-
-	/**
-	 * Return the managed object, supporting both singleton
-	 * and prototype mode.
-	 * @see FactoryBean#getObject()
-	 */
-	@Override
-	public Object getObject() throws BeansException {
-		if (isSingleton()) {
-			return this.testBean;
-		}
-		else {
-			TestBean prototype = new TestBean("prototype created at " + System.currentTimeMillis(), 11);
-			if (this.beanFactory != null) {
-				this.beanFactory.applyBeanPostProcessorsBeforeInitialization(prototype, this.beanName);
-			}
-			prototypeCreated = true;
-			return prototype;
-		}
-	}
-
-	@Override
-	public Class getObjectType() {
-		return TestBean.class;
-	}
-
-
-	@Override
-	public void destroy() {
-		if (this.testBean != null) {
-			this.testBean.setName(null);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTestCase.java b/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTestCase.java
index 2af35321ff6..3a3d4a68851 100644
--- a/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTestCase.java
+++ b/spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTestCase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,6 +43,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
+import org.springframework.tests.web.FreePortScanner;
 import org.springframework.util.FileCopyUtils;
 
 public abstract class AbstractHttpRequestFactoryTestCase {
diff --git a/spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java b/spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java
deleted file mode 100644
index 83add2ceaff..00000000000
--- a/spring-web/src/test/java/org/springframework/http/client/FreePortScanner.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.http.client;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.ServerSocket;
-import java.util.Random;
-
-import org.springframework.util.Assert;
-
-/**
- * Utility class that finds free BSD ports for use in testing scenario's.
- *
- * @author Ben Hale
- * @author Arjen Poutsma
- */
-public abstract class FreePortScanner {
-
-	private static final int MIN_SAFE_PORT = 1024;
-
-	private static final int MAX_PORT = 65535;
-
-	private static final Random random = new Random();
-
-	/**
-	 * Returns the number of a free port in the default range.
-	 */
-	public static int getFreePort() {
-		return getFreePort(MIN_SAFE_PORT, MAX_PORT);
-	}
-
-	/**
-	 * Returns the number of a free port in the given range.
-	 */
-	public static int getFreePort(int minPort, int maxPort) {
-		Assert.isTrue(minPort > 0, "'minPort' must be larger than 0");
-		Assert.isTrue(maxPort > minPort, "'maxPort' must be larger than minPort");
-		int portRange = maxPort - minPort;
-		int candidatePort;
-		int searchCounter = 0;
-		do {
-			if (++searchCounter > portRange) {
-				throw new IllegalStateException(
-						String.format("There were no ports available in the range %d to %d", minPort, maxPort));
-			}
-			candidatePort = getRandomPort(minPort, portRange);
-		}
-		while (!isPortAvailable(candidatePort));
-
-		return candidatePort;
-	}
-
-	private static int getRandomPort(int minPort, int portRange) {
-		return minPort + random.nextInt(portRange);
-	}
-
-	private static boolean isPortAvailable(int port) {
-		ServerSocket serverSocket;
-		try {
-			serverSocket = new ServerSocket();
-		}
-		catch (IOException ex) {
-			throw new IllegalStateException("Unable to create ServerSocket.", ex);
-		}
-
-		try {
-			InetSocketAddress sa = new InetSocketAddress(port);
-			serverSocket.bind(sa);
-			return true;
-		}
-		catch (IOException ex) {
-			return false;
-		}
-		finally {
-			try {
-				serverSocket.close();
-			}
-			catch (IOException ex) {
-				// ignore
-			}
-		}
-	}
-
-}
diff --git a/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java b/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
index 6617a787d52..d26b34565f1 100644
--- a/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
+++ b/spring-web/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import com.caucho.burlap.client.BurlapProxyFactory;
 import com.caucho.hessian.client.HessianProxyFactory;
 import junit.framework.TestCase;
 
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.remoting.RemoteAccessException;
 
 /**
diff --git a/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java b/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java
index 71c463177a5..b436e306ecd 100644
--- a/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java
+++ b/spring-web/src/test/java/org/springframework/remoting/httpinvoker/HttpInvokerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,8 +35,8 @@ import javax.servlet.http.HttpServletResponse;
 import junit.framework.TestCase;
 import org.aopalliance.intercept.MethodInvocation;
 
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
diff --git a/spring-webmvc/src/test/java/org/springframework/http/client/FreePortScanner.java b/spring-web/src/test/java/org/springframework/tests/web/FreePortScanner.java
similarity index 98%
rename from spring-webmvc/src/test/java/org/springframework/http/client/FreePortScanner.java
rename to spring-web/src/test/java/org/springframework/tests/web/FreePortScanner.java
index 83add2ceaff..9f5a3d9c339 100644
--- a/spring-webmvc/src/test/java/org/springframework/http/client/FreePortScanner.java
+++ b/spring-web/src/test/java/org/springframework/tests/web/FreePortScanner.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.http.client;
+package org.springframework.tests.web;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
diff --git a/spring-web/src/test/java/org/springframework/util/SerializationTestUtils.java b/spring-web/src/test/java/org/springframework/util/SerializationTestUtils.java
deleted file mode 100644
index dbe6421093e..00000000000
--- a/spring-web/src/test/java/org/springframework/util/SerializationTestUtils.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * The Spring Framework is published under the terms
- * of the Apache Software License.
- */
-
-package org.springframework.util;
-
-import java.awt.Point;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.NotSerializableException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-
-import junit.framework.TestCase;
-
-import org.springframework.beans.TestBean;
-
-/**
- * Utilities for testing serializability of objects.
- * Exposes static methods for use in other test cases.
- * Extends TestCase only to test itself.
- *
- * @author Rod Johnson
- */
-public class SerializationTestUtils extends TestCase {
-
-	public static void testSerialization(Object o) throws IOException {
-		OutputStream baos = new ByteArrayOutputStream();
-		ObjectOutputStream oos = new ObjectOutputStream(baos);
-		oos.writeObject(o);
-	}
-
-	public static boolean isSerializable(Object o) throws IOException {
-		try {
-			testSerialization(o);
-			return true;
-		}
-		catch (NotSerializableException ex) {
-			return false;
-		}
-	}
-
-	public static Object serializeAndDeserialize(Object o) throws IOException, ClassNotFoundException {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ObjectOutputStream oos = new ObjectOutputStream(baos);
-		oos.writeObject(o);
-		oos.flush();
-		baos.flush();
-		byte[] bytes = baos.toByteArray();
-
-		ByteArrayInputStream is = new ByteArrayInputStream(bytes);
-		ObjectInputStream ois = new ObjectInputStream(is);
-		Object o2 = ois.readObject();
-
-		return o2;
-	}
-
-	public SerializationTestUtils(String s) {
-		super(s);
-	}
-
-	public void testWithNonSerializableObject() throws IOException {
-		TestBean o = new TestBean();
-		assertFalse(o instanceof Serializable);
-
-		assertFalse(isSerializable(o));
-
-		try {
-			testSerialization(o);
-			fail();
-		}
-		catch (NotSerializableException ex) {
-			// Ok
-		}
-	}
-
-	public void testWithSerializableObject() throws Exception {
-		int x = 5;
-		int y = 10;
-		Point p = new Point(x, y);
-		assertTrue(p instanceof Serializable);
-
-		testSerialization(p);
-
-		assertTrue(isSerializable(p));
-
-		Point p2 = (Point) serializeAndDeserialize(p);
-		assertNotSame(p, p2);
-		assertEquals(x, (int) p2.getX());
-		assertEquals(y, (int) p2.getY());
-	}
-
-}
\ No newline at end of file
diff --git a/spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java b/spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java
index 9f6a1df756f..25d63e8b3a9 100644
--- a/spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java
+++ b/spring-web/src/test/java/org/springframework/web/bind/EscapedErrorsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.springframework.web.bind;
 
 import org.junit.Test;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.validation.BindException;
 import org.springframework.validation.Errors;
 import org.springframework.validation.FieldError;
diff --git a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java
index cf514b44b86..34340bd3e16 100644
--- a/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java
+++ b/spring-web/src/test/java/org/springframework/web/bind/ServletRequestDataBinderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,10 +24,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.springframework.beans.ITestBean;
+import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.beans.PropertyValue;
 import org.springframework.beans.PropertyValues;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 
 /**
diff --git a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java
index 3f194e9bd0f..b3e347fd5fb 100644
--- a/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java
+++ b/spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,10 +24,10 @@ import java.util.Map;
 import static org.junit.Assert.*;
 import org.junit.Test;
 
-import org.springframework.beans.ITestBean;
+import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.beans.PropertyValue;
 import org.springframework.beans.PropertyValues;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockMultipartFile;
 import org.springframework.mock.web.test.MockMultipartHttpServletRequest;
@@ -63,7 +63,7 @@ public class WebRequestDataBinderTests {
 
 	@Test
 	public void testBindingWithNestedObjectCreationThroughAutoGrow() throws Exception {
-		TestBean tb = new TestBean();
+		TestBean tb = new TestBeanWithConcreteSpouse();
 
 		WebRequestDataBinder binder = new WebRequestDataBinder(tb, "person");
 		binder.setIgnoreUnknownFields(false);
@@ -305,21 +305,30 @@ public class WebRequestDataBinderTests {
 
 	public static class EnumHolder {
 
-	   private MyEnum myEnum;
+		private MyEnum myEnum;
 
-	   public MyEnum getMyEnum() {
-		   return myEnum;
-	   }
+		public MyEnum getMyEnum() {
+			return myEnum;
+		}
 
-	   public void setMyEnum(MyEnum myEnum) {
-		   this.myEnum = myEnum;
-	   }
-   }
+		public void setMyEnum(MyEnum myEnum) {
+			this.myEnum = myEnum;
+		}
+	}
 
+	public enum MyEnum {
+		FOO, BAR
+	}
 
-   public enum MyEnum {
+	static class TestBeanWithConcreteSpouse extends TestBean {
+		public void setConcreteSpouse(TestBean spouse) {
+			this.spouses = new ITestBean[] {spouse};
+		}
+
+		public TestBean getConcreteSpouse() {
+			return (spouses != null ? (TestBean) spouses[0] : null);
+		}
+	}
 
-	   FOO, BAR
-   }
 
 }
diff --git a/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java b/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
index a02fcae95b9..ea09d9a3ddf 100644
--- a/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,8 +62,8 @@ import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.FreePortScanner;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.tests.web.FreePortScanner;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/RequestAndSessionScopedBeanTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestAndSessionScopedBeanTests.java
index 5c18203da6b..a4b7d6018ac 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/RequestAndSessionScopedBeanTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/RequestAndSessionScopedBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest;
 import static org.junit.Assert.*;
 import org.junit.Test;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.mock.web.test.MockHttpServletRequest;
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java
index 3b12ab2dbaf..6f88b6a9482 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/RequestScopeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ package org.springframework.web.context.request;
 
 import junit.framework.TestCase;
 
-import org.springframework.beans.DerivedTestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.DerivedTestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanCurrentlyInCreationException;
 import org.springframework.beans.factory.FactoryBean;
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/RequestScopedProxyTests.java b/spring-web/src/test/java/org/springframework/web/context/request/RequestScopedProxyTests.java
index 250e50c75c0..4a5703f34a0 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/RequestScopedProxyTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/RequestScopedProxyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@ import org.junit.Before;
 import org.junit.Test;
 
 import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.DerivedTestBean;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
-import org.springframework.beans.factory.DummyFactory;
+import org.springframework.tests.sample.beans.DerivedTestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
+import org.springframework.tests.sample.beans.factory.DummyFactory;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java b/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java
index c6b0c656fae..4e540a7d202 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/SessionScopeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@ import java.io.Serializable;
 import junit.framework.TestCase;
 
 import org.springframework.beans.BeansException;
-import org.springframework.beans.DerivedTestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.DerivedTestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
diff --git a/spring-web/src/test/java/org/springframework/web/context/request/WebApplicationContextScopeTests.java b/spring-web/src/test/java/org/springframework/web/context/request/WebApplicationContextScopeTests.java
index 53e2e0a4583..5c2ef5823c0 100644
--- a/spring-web/src/test/java/org/springframework/web/context/request/WebApplicationContextScopeTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/request/WebApplicationContextScopeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import javax.servlet.ServletContextEvent;
 import static org.junit.Assert.*;
 import org.junit.Test;
 
-import org.springframework.beans.DerivedTestBean;
+import org.springframework.tests.sample.beans.DerivedTestBean;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockServletContext;
diff --git a/spring-web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java b/spring-web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java
index 1d383013423..8412e2b667c 100644
--- a/spring-web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java
+++ b/spring-web/src/test/java/org/springframework/web/context/support/SpringBeanAutowiringSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@ package org.springframework.web.context.support;
 
 import org.junit.Test;
 
-import org.springframework.beans.ITestBean;
+import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.beans.MutablePropertyValues;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mock.web.test.MockServletContext;
diff --git a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java
index a2c27162a25..053a53150ac 100644
--- a/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/jsf/DelegatingVariableResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import javax.faces.el.VariableResolver;
 
 import junit.framework.TestCase;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.StaticWebApplicationContext;
 
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java
index 986df7e9fa5..170e8e2c9b8 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
 import org.junit.Before;
 import org.junit.Test;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.core.MethodParameter;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.validation.BindException;
diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java
index a9699262e48..1da19343914 100644
--- a/spring-web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java
+++ b/spring-web/src/test/java/org/springframework/web/method/annotation/SessionAttributesHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ import java.util.HashSet;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.SessionAttributes;
diff --git a/spring-web/src/test/resources/org/springframework/web/context/request/requestScopeTests.xml b/spring-web/src/test/resources/org/springframework/web/context/request/requestScopeTests.xml
index f2d06c527f4..3ed39dfd7aa 100644
--- a/spring-web/src/test/resources/org/springframework/web/context/request/requestScopeTests.xml
+++ b/spring-web/src/test/resources/org/springframework/web/context/request/requestScopeTests.xml
@@ -4,35 +4,35 @@
     xsi:schemaLocation="http://www.springframework.org/schema/beans
                 http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	
+	
         
 	
 
-	
+	
 
-	
+	
 
-	
+	
 		
 	
 
-	
+	
 		
 	
 
-  
+  
     
     
-      
+      
         
       
     
   
 
-  
+  
     
     
-      
+      
         
       
     
diff --git a/spring-web/src/test/resources/org/springframework/web/context/request/requestScopedProxyTests.xml b/spring-web/src/test/resources/org/springframework/web/context/request/requestScopedProxyTests.xml
index ee1313d4dc1..92759852b5b 100644
--- a/spring-web/src/test/resources/org/springframework/web/context/request/requestScopedProxyTests.xml
+++ b/spring-web/src/test/resources/org/springframework/web/context/request/requestScopedProxyTests.xml
@@ -5,47 +5,47 @@
 		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
-	
+	
 		
 		
 	
 
-	
+	
 		
 		
 	
 
-	
+	
 		
 		
 	
 
-	
+	
 		
 	
 
-	
+	
 		
 		
 	
 
-	
+	
 		
 		
 	
 
-	
+	
 		
-			
+			
 				
 				
 			
 		
 	
 
-	
+	
 		
-			
+			
 				
 				
 			
diff --git a/spring-web/src/test/resources/org/springframework/web/context/request/sessionScopeTests.xml b/spring-web/src/test/resources/org/springframework/web/context/request/sessionScopeTests.xml
index e4f05b9abe5..e92f639f8ca 100644
--- a/spring-web/src/test/resources/org/springframework/web/context/request/sessionScopeTests.xml
+++ b/spring-web/src/test/resources/org/springframework/web/context/request/sessionScopeTests.xml
@@ -3,8 +3,8 @@
 
 
 
-	
+	
 
-	
+	
 
 
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java
deleted file mode 100644
index a992a2ebfc6..00000000000
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/Colour.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import org.springframework.core.enums.ShortCodedLabeledEnum;
-
-/**
- * @author Rob Harrop
- */
-@SuppressWarnings("serial")
-public class Colour extends ShortCodedLabeledEnum {
-
-	public static final Colour RED = new Colour(0, "RED");
-	public static final Colour BLUE = new Colour(1, "BLUE");
-	public static final Colour GREEN = new Colour(2, "GREEN");
-	public static final Colour PURPLE = new Colour(3, "PURPLE");
-
-	private Colour(int code, String label) {
-		super(code, label);
-	}
-
-}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java
deleted file mode 100644
index c5360de5316..00000000000
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.Serializable;
-
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.beans.factory.DisposableBean;
-
-/**
- * @author Juergen Hoeller
- * @since 21.08.2003
- */
-@SuppressWarnings("serial")
-public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean {
-
-	private String beanName;
-
-	private boolean initialized;
-
-	private boolean destroyed;
-
-
-	public DerivedTestBean() {
-	}
-
-	public DerivedTestBean(String[] names) {
-		if (names == null || names.length < 2) {
-			throw new IllegalArgumentException("Invalid names array");
-		}
-		setName(names[0]);
-		setBeanName(names[1]);
-	}
-
-	public static DerivedTestBean create(String[] names) {
-		return new DerivedTestBean(names);
-	}
-
-
-	@Override
-	public void setBeanName(String beanName) {
-		if (this.beanName == null || beanName == null) {
-			this.beanName = beanName;
-		}
-	}
-
-	@Override
-	public String getBeanName() {
-		return beanName;
-	}
-
-	public void setSpouseRef(String name) {
-		setSpouse(new TestBean(name));
-	}
-
-
-	public void initialize() {
-		this.initialized = true;
-	}
-
-	public boolean wasInitialized() {
-		return initialized;
-	}
-
-
-	@Override
-	public void destroy() {
-		this.destroyed = true;
-	}
-
-	@Override
-	public boolean wasDestroyed() {
-		return destroyed;
-	}
-
-}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/INestedTestBean.java
deleted file mode 100644
index e0ae5f20a3f..00000000000
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/INestedTestBean.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-public interface INestedTestBean {
-
-	public String getCompany();
-
-}
\ No newline at end of file
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/IOther.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/IOther.java
deleted file mode 100644
index d7fb346185a..00000000000
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/IOther.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-public interface IOther {
-
-	void absquatulate();
-
-}
\ No newline at end of file
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/ITestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/ITestBean.java
deleted file mode 100644
index cdf5ef510dd..00000000000
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/ITestBean.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2002-2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.IOException;
-
-/**
- * Interface used for {@link org.springframework.beans.TestBean}.
- *
- * 
Two methods are the same as on Person, but if this
- * extends person it breaks quite a few tests..
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public interface ITestBean {
-
-	int getAge();
-
-	void setAge(int age);
-
-	String getName();
-
-	void setName(String name);
-
-	ITestBean getSpouse();
-
-	void setSpouse(ITestBean spouse);
-
-	ITestBean[] getSpouses();
-
-	String[] getStringArray();
-
-	void setStringArray(String[] stringArray);
-
-	/**
-	 * Throws a given (non-null) exception.
-	 */
-	void exceptional(Throwable t) throws Throwable;
-
-	Object returnsThis();
-
-	INestedTestBean getDoctor();
-
-	INestedTestBean getLawyer();
-
-	IndexedTestBean getNestedIndexedBean();
-
-	/**
-	 * Increment the age by one.
-	 * @return the previous age
-	 */
-	int haveBirthday();
-
-	void unreliableFileOperation() throws IOException;
-
-}
\ No newline at end of file
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/IndexedTestBean.java
deleted file mode 100644
index ddb091770ee..00000000000
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/IndexedTestBean.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2002-2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-/**
- * @author Juergen Hoeller
- * @since 11.11.2003
- */
-public class IndexedTestBean {
-
-	private TestBean[] array;
-
-	private Collection collection;
-
-	private List list;
-
-	private Set set;
-
-	private SortedSet sortedSet;
-
-	private Map map;
-
-	private SortedMap sortedMap;
-
-
-	public IndexedTestBean() {
-		this(true);
-	}
-
-	public IndexedTestBean(boolean populate) {
-		if (populate) {
-			populate();
-		}
-	}
-
-	public void populate() {
-		TestBean tb0 = new TestBean("name0", 0);
-		TestBean tb1 = new TestBean("name1", 0);
-		TestBean tb2 = new TestBean("name2", 0);
-		TestBean tb3 = new TestBean("name3", 0);
-		TestBean tb4 = new TestBean("name4", 0);
-		TestBean tb5 = new TestBean("name5", 0);
-		TestBean tb6 = new TestBean("name6", 0);
-		TestBean tb7 = new TestBean("name7", 0);
-		TestBean tbX = new TestBean("nameX", 0);
-		TestBean tbY = new TestBean("nameY", 0);
-		this.array = new TestBean[] {tb0, tb1};
-		this.list = new ArrayList();
-		this.list.add(tb2);
-		this.list.add(tb3);
-		this.set = new TreeSet();
-		this.set.add(tb6);
-		this.set.add(tb7);
-		this.map = new HashMap();
-		this.map.put("key1", tb4);
-		this.map.put("key2", tb5);
-		this.map.put("key.3", tb5);
-		List list = new ArrayList();
-		list.add(tbX);
-		list.add(tbY);
-		this.map.put("key4", list);
-	}
-
-
-	public TestBean[] getArray() {
-		return array;
-	}
-
-	public void setArray(TestBean[] array) {
-		this.array = array;
-	}
-
-	public Collection getCollection() {
-		return collection;
-	}
-
-	public void setCollection(Collection collection) {
-		this.collection = collection;
-	}
-
-	public List getList() {
-		return list;
-	}
-
-	public void setList(List list) {
-		this.list = list;
-	}
-
-	public Set getSet() {
-		return set;
-	}
-
-	public void setSet(Set set) {
-		this.set = set;
-	}
-
-	public SortedSet getSortedSet() {
-		return sortedSet;
-	}
-
-	public void setSortedSet(SortedSet sortedSet) {
-		this.sortedSet = sortedSet;
-	}
-
-	public Map getMap() {
-		return map;
-	}
-
-	public void setMap(Map map) {
-		this.map = map;
-	}
-
-	public SortedMap getSortedMap() {
-		return sortedMap;
-	}
-
-	public void setSortedMap(SortedMap sortedMap) {
-		this.sortedMap = sortedMap;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java
deleted file mode 100644
index 412891c439b..00000000000
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/NestedTestBean.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-/**
- * Simple nested test bean used for testing bean factories, AOP framework etc.
- *
- * @author Trevor D. Cook
- * @since 30.09.2003
- */
-public class NestedTestBean implements INestedTestBean {
-
-	private String company = "";
-
-	public NestedTestBean() {
-	}
-
-	public NestedTestBean(String company) {
-		setCompany(company);
-	}
-
-	public void setCompany(String company) {
-		this.company = (company != null ? company : "");
-	}
-
-	@Override
-	public String getCompany() {
-		return company;
-	}
-
-	public boolean equals(Object obj) {
-		if (!(obj instanceof NestedTestBean)) {
-			return false;
-		}
-		NestedTestBean ntb = (NestedTestBean) obj;
-		return this.company.equals(ntb.company);
-	}
-
-	public int hashCode() {
-		return this.company.hashCode();
-	}
-
-	public String toString() {
-		return "NestedTestBean: " + this.company;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java
deleted file mode 100644
index 6d71de75764..00000000000
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/TestBean.java
+++ /dev/null
@@ -1,457 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.util.ObjectUtils;
-
-/**
- * Simple test bean used for testing bean factories, the AOP framework etc.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @since 15 April 2001
- */
-public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOther, Comparable {
-
-	private String beanName;
-
-	private String country;
-
-	private BeanFactory beanFactory;
-
-	private boolean postProcessed;
-
-	private String name;
-
-	private String sex;
-
-	private int age;
-
-	private boolean jedi;
-
-	private ITestBean[] spouses;
-
-	private String touchy;
-
-	private String[] stringArray;
-
-	private Integer[] someIntegerArray;
-
-	private Date date = new Date();
-
-	private Float myFloat = new Float(0.0);
-
-	private Collection friends = new LinkedList();
-
-	private Set someSet = new HashSet();
-
-	private Map someMap = new HashMap();
-
-	private List someList = new ArrayList();
-
-	private Properties someProperties = new Properties();
-
-	private INestedTestBean doctor = new NestedTestBean();
-
-	private INestedTestBean lawyer = new NestedTestBean();
-
-	private IndexedTestBean nestedIndexedBean;
-
-	private boolean destroyed;
-
-	private Number someNumber;
-
-	private Colour favouriteColour;
-
-	private Boolean someBoolean;
-
-	private List otherColours;
-
-	private List pets;
-
-
-	public TestBean() {
-	}
-
-	public TestBean(String name) {
-		this.name = name;
-	}
-
-	public TestBean(ITestBean spouse) {
-		this.spouses = new ITestBean[] {spouse};
-	}
-
-	public TestBean(String name, int age) {
-		this.name = name;
-		this.age = age;
-	}
-
-	public TestBean(ITestBean spouse, Properties someProperties) {
-		this.spouses = new ITestBean[] {spouse};
-		this.someProperties = someProperties;
-	}
-
-	public TestBean(List someList) {
-		this.someList = someList;
-	}
-
-	public TestBean(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public TestBean(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public TestBean(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-
-	@Override
-	public void setBeanName(String beanName) {
-		this.beanName = beanName;
-	}
-
-	public String getBeanName() {
-		return beanName;
-	}
-
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) {
-		this.beanFactory = beanFactory;
-	}
-
-	public BeanFactory getBeanFactory() {
-		return beanFactory;
-	}
-
-	public void setPostProcessed(boolean postProcessed) {
-		this.postProcessed = postProcessed;
-	}
-
-	public boolean isPostProcessed() {
-		return postProcessed;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getSex() {
-		return sex;
-	}
-
-	public void setSex(String sex) {
-		this.sex = sex;
-		if (this.name == null) {
-			this.name = sex;
-		}
-	}
-
-	@Override
-	public int getAge() {
-		return age;
-	}
-
-	@Override
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-	public boolean isJedi() {
-		return jedi;
-	}
-
-	public void setJedi(boolean jedi) {
-		this.jedi = jedi;
-	}
-
-	@Override
-	public ITestBean getSpouse() {
-		return (spouses != null ? spouses[0] : null);
-	}
-
-	@Override
-	public void setSpouse(ITestBean spouse) {
-		this.spouses = new ITestBean[] {spouse};
-	}
-
-	@Override
-	public ITestBean[] getSpouses() {
-		return spouses;
-	}
-
-	public String getTouchy() {
-		return touchy;
-	}
-
-	public void setTouchy(String touchy) throws Exception {
-		if (touchy.indexOf('.') != -1) {
-			throw new Exception("Can't contain a .");
-		}
-		if (touchy.indexOf(',') != -1) {
-			throw new NumberFormatException("Number format exception: contains a ,");
-		}
-		this.touchy = touchy;
-	}
-
-	public String getCountry() {
-		return country;
-	}
-
-	public void setCountry(String country) {
-		this.country = country;
-	}
-
-	@Override
-	public String[] getStringArray() {
-		return stringArray;
-	}
-
-	@Override
-	public void setStringArray(String[] stringArray) {
-		this.stringArray = stringArray;
-	}
-
-	public Integer[] getSomeIntegerArray() {
-		return someIntegerArray;
-	}
-
-	public void setSomeIntegerArray(Integer[] someIntegerArray) {
-		this.someIntegerArray = someIntegerArray;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public Float getMyFloat() {
-		return myFloat;
-	}
-
-	public void setMyFloat(Float myFloat) {
-		this.myFloat = myFloat;
-	}
-
-	public Collection getFriends() {
-		return friends;
-	}
-
-	public void setFriends(Collection friends) {
-		this.friends = friends;
-	}
-
-	public Set getSomeSet() {
-		return someSet;
-	}
-
-	public void setSomeSet(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public Map getSomeMap() {
-		return someMap;
-	}
-
-	public void setSomeMap(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public List getSomeList() {
-		return someList;
-	}
-
-	public void setSomeList(List someList) {
-		this.someList = someList;
-	}
-
-	public Properties getSomeProperties() {
-		return someProperties;
-	}
-
-	public void setSomeProperties(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-	@Override
-	public INestedTestBean getDoctor() {
-		return doctor;
-	}
-
-	public void setDoctor(INestedTestBean doctor) {
-		this.doctor = doctor;
-	}
-
-	@Override
-	public INestedTestBean getLawyer() {
-		return lawyer;
-	}
-
-	public void setLawyer(INestedTestBean lawyer) {
-		this.lawyer = lawyer;
-	}
-
-	public Number getSomeNumber() {
-		return someNumber;
-	}
-
-	public void setSomeNumber(Number someNumber) {
-		this.someNumber = someNumber;
-	}
-
-	public Colour getFavouriteColour() {
-		return favouriteColour;
-	}
-
-	public void setFavouriteColour(Colour favouriteColour) {
-		this.favouriteColour = favouriteColour;
-	}
-
-	public Boolean getSomeBoolean() {
-		return someBoolean;
-	}
-
-	public void setSomeBoolean(Boolean someBoolean) {
-		this.someBoolean = someBoolean;
-	}
-
-	@Override
-	public IndexedTestBean getNestedIndexedBean() {
-		return nestedIndexedBean;
-	}
-
-	public void setNestedIndexedBean(IndexedTestBean nestedIndexedBean) {
-		this.nestedIndexedBean = nestedIndexedBean;
-	}
-
-	public List getOtherColours() {
-		return otherColours;
-	}
-
-	public void setOtherColours(List otherColours) {
-		this.otherColours = otherColours;
-	}
-
-	public List getPets() {
-		return pets;
-	}
-
-	public void setPets(List pets) {
-		this.pets = pets;
-	}
-
-
-	/**
-	 * @see org.springframework.beans.ITestBean#exceptional(Throwable)
-	 */
-	@Override
-	public void exceptional(Throwable t) throws Throwable {
-		if (t != null) {
-			throw t;
-		}
-	}
-
-	@Override
-	public void unreliableFileOperation() throws IOException {
-		throw new IOException();
-	}
-	/**
-	 * @see org.springframework.beans.ITestBean#returnsThis()
-	 */
-	@Override
-	public Object returnsThis() {
-		return this;
-	}
-
-	/**
-	 * @see org.springframework.beans.IOther#absquatulate()
-	 */
-	@Override
-	public void absquatulate() {
-	}
-
-	@Override
-	public int haveBirthday() {
-		return age++;
-	}
-
-
-	public void destroy() {
-		this.destroyed = true;
-	}
-
-	public boolean wasDestroyed() {
-		return destroyed;
-	}
-
-
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (other == null || !(other instanceof TestBean)) {
-			return false;
-		}
-		TestBean tb2 = (TestBean) other;
-		return (ObjectUtils.nullSafeEquals(this.name, tb2.name) && this.age == tb2.age);
-	}
-
-	public int hashCode() {
-		return this.age;
-	}
-
-	@Override
-	public int compareTo(Object other) {
-		if (this.name != null && other instanceof TestBean) {
-			return this.name.compareTo(((TestBean) other).getName());
-		}
-		else {
-			return 1;
-		}
-	}
-
-	public String toString() {
-		return this.name;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
deleted file mode 100644
index d6911ee72f5..00000000000
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans.factory;
-
-import java.beans.PropertyEditorSupport;
-import java.util.StringTokenizer;
-
-import junit.framework.TestCase;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.PropertyBatchUpdateException;
-import org.springframework.beans.TestBean;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-
-/**
- * Subclasses must implement setUp() to initialize bean factory
- * and any other variables they need.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public abstract class AbstractBeanFactoryTests extends TestCase {
-
-	protected abstract BeanFactory getBeanFactory();
-
-	/**
-	 * Roderick beans inherits from rod, overriding name only.
-	 */
-	public void testInheritance() {
-		assertTrue(getBeanFactory().containsBean("rod"));
-		assertTrue(getBeanFactory().containsBean("roderick"));
-		TestBean rod = (TestBean) getBeanFactory().getBean("rod");
-		TestBean roderick = (TestBean) getBeanFactory().getBean("roderick");
-		assertTrue("not == ", rod != roderick);
-		assertTrue("rod.name is Rod", rod.getName().equals("Rod"));
-		assertTrue("rod.age is 31", rod.getAge() == 31);
-		assertTrue("roderick.name is Roderick", roderick.getName().equals("Roderick"));
-		assertTrue("roderick.age was inherited", roderick.getAge() == rod.getAge());
-	}
-
-	public void testGetBeanWithNullArg() {
-		try {
-			getBeanFactory().getBean((String) null);
-			fail("Can't get null bean");
-		}
-		catch (IllegalArgumentException ex) {
-			// OK
-		}
-	}
-
-	/**
-	 * Test that InitializingBean objects receive the afterPropertiesSet() callback
-	 */
-	public void testInitializingBeanCallback() {
-		MustBeInitialized mbi = (MustBeInitialized) getBeanFactory().getBean("mustBeInitialized");
-		// The dummy business method will throw an exception if the
-		// afterPropertiesSet() callback wasn't invoked
-		mbi.businessMethod();
-	}
-
-	/**
-	 * Test that InitializingBean/BeanFactoryAware/DisposableBean objects receive the
-	 * afterPropertiesSet() callback before BeanFactoryAware callbacks
-	 */
-	public void testLifecycleCallbacks() {
-		LifecycleBean lb = (LifecycleBean) getBeanFactory().getBean("lifecycle");
-		assertEquals("lifecycle", lb.getBeanName());
-		// The dummy business method will throw an exception if the
-		// necessary callbacks weren't invoked in the right order.
-		lb.businessMethod();
-		assertTrue("Not destroyed", !lb.isDestroyed());
-	}
-
-	public void testFindsValidInstance() {
-		try {
-			Object o = getBeanFactory().getBean("rod");
-			assertTrue("Rod bean is a TestBean", o instanceof TestBean);
-			TestBean rod = (TestBean) o;
-			assertTrue("rod.name is Rod", rod.getName().equals("Rod"));
-			assertTrue("rod.age is 31", rod.getAge() == 31);
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-			fail("Shouldn't throw exception on getting valid instance");
-		}
-	}
-
-	public void testGetInstanceByMatchingClass() {
-		try {
-			Object o = getBeanFactory().getBean("rod", TestBean.class);
-			assertTrue("Rod bean is a TestBean", o instanceof TestBean);
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-			fail("Shouldn't throw exception on getting valid instance with matching class");
-		}
-	}
-
-	public void testGetInstanceByNonmatchingClass() {
-		try {
-			Object o = getBeanFactory().getBean("rod", BeanFactory.class);
-			fail("Rod bean is not of type BeanFactory; getBeanInstance(rod, BeanFactory.class) should throw BeanNotOfRequiredTypeException");
-		}
-		catch (BeanNotOfRequiredTypeException ex) {
-			// So far, so good
-			assertTrue("Exception has correct bean name", ex.getBeanName().equals("rod"));
-			assertTrue("Exception requiredType must be BeanFactory.class", ex.getRequiredType().equals(BeanFactory.class));
-			assertTrue("Exception actualType as TestBean.class", TestBean.class.isAssignableFrom(ex.getActualType()));
-			assertTrue("Actual type is correct", ex.getActualType() == getBeanFactory().getBean("rod").getClass());
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-			fail("Shouldn't throw exception on getting valid instance");
-		}
-	}
-
-	public void testGetSharedInstanceByMatchingClass() {
-		try {
-			Object o = getBeanFactory().getBean("rod", TestBean.class);
-			assertTrue("Rod bean is a TestBean", o instanceof TestBean);
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-			fail("Shouldn't throw exception on getting valid instance with matching class");
-		}
-	}
-
-	public void testGetSharedInstanceByMatchingClassNoCatch() {
-		Object o = getBeanFactory().getBean("rod", TestBean.class);
-		assertTrue("Rod bean is a TestBean", o instanceof TestBean);
-	}
-
-	public void testGetSharedInstanceByNonmatchingClass() {
-		try {
-			Object o = getBeanFactory().getBean("rod", BeanFactory.class);
-			fail("Rod bean is not of type BeanFactory; getBeanInstance(rod, BeanFactory.class) should throw BeanNotOfRequiredTypeException");
-		}
-		catch (BeanNotOfRequiredTypeException ex) {
-			// So far, so good
-			assertTrue("Exception has correct bean name", ex.getBeanName().equals("rod"));
-			assertTrue("Exception requiredType must be BeanFactory.class", ex.getRequiredType().equals(BeanFactory.class));
-			assertTrue("Exception actualType as TestBean.class", TestBean.class.isAssignableFrom(ex.getActualType()));
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-			fail("Shouldn't throw exception on getting valid instance");
-		}
-	}
-
-	public void testSharedInstancesAreEqual() {
-		try {
-			Object o = getBeanFactory().getBean("rod");
-			assertTrue("Rod bean1 is a TestBean", o instanceof TestBean);
-			Object o1 = getBeanFactory().getBean("rod");
-			assertTrue("Rod bean2 is a TestBean", o1 instanceof TestBean);
-			assertTrue("Object equals applies", o == o1);
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-			fail("Shouldn't throw exception on getting valid instance");
-		}
-	}
-
-	public void testPrototypeInstancesAreIndependent() {
-		TestBean tb1 = (TestBean) getBeanFactory().getBean("kathy");
-		TestBean tb2 = (TestBean) getBeanFactory().getBean("kathy");
-		assertTrue("ref equal DOES NOT apply", tb1 != tb2);
-		assertTrue("object equal true", tb1.equals(tb2));
-		tb1.setAge(1);
-		tb2.setAge(2);
-		assertTrue("1 age independent = 1", tb1.getAge() == 1);
-		assertTrue("2 age independent = 2", tb2.getAge() == 2);
-		assertTrue("object equal now false", !tb1.equals(tb2));
-	}
-
-	public void testNotThere() {
-		assertFalse(getBeanFactory().containsBean("Mr Squiggle"));
-		try {
-			Object o = getBeanFactory().getBean("Mr Squiggle");
-			fail("Can't find missing bean");
-		}
-		catch (BeansException ex) {
-			//ex.printStackTrace();
-			//fail("Shouldn't throw exception on getting valid instance");
-		}
-	}
-
-	public void testValidEmpty() {
-		try {
-			Object o = getBeanFactory().getBean("validEmpty");
-			assertTrue("validEmpty bean is a TestBean", o instanceof TestBean);
-			TestBean ve = (TestBean) o;
-			assertTrue("Valid empty has defaults", ve.getName() == null && ve.getAge() == 0 && ve.getSpouse() == null);
-		}
-		catch (BeansException ex) {
-			ex.printStackTrace();
-			fail("Shouldn't throw exception on valid empty");
-		}
-	}
-
-	public void xtestTypeMismatch() {
-		try {
-			Object o = getBeanFactory().getBean("typeMismatch");
-			fail("Shouldn't succeed with type mismatch");
-		}
-		catch (BeanCreationException wex) {
-			assertEquals("typeMismatch", wex.getBeanName());
-			assertTrue(wex.getCause() instanceof PropertyBatchUpdateException);
-			PropertyBatchUpdateException ex = (PropertyBatchUpdateException) wex.getCause();
-			// Further tests
-			assertTrue("Has one error ", ex.getExceptionCount() == 1);
-			assertTrue("Error is for field age", ex.getPropertyAccessException("age") != null);
-			assertTrue("We have rejected age in exception", ex.getPropertyAccessException("age").getPropertyChangeEvent().getNewValue().equals("34x"));
-		}
-	}
-
-	public void testGrandparentDefinitionFoundInBeanFactory() throws Exception {
-		TestBean dad = (TestBean) getBeanFactory().getBean("father");
-		assertTrue("Dad has correct name", dad.getName().equals("Albert"));
-	}
-
-	public void testFactorySingleton() throws Exception {
-		assertTrue(getBeanFactory().isSingleton("&singletonFactory"));
-		assertTrue(getBeanFactory().isSingleton("singletonFactory"));
-		TestBean tb = (TestBean) getBeanFactory().getBean("singletonFactory");
-		assertTrue("Singleton from factory has correct name, not " + tb.getName(), tb.getName().equals(DummyFactory.SINGLETON_NAME));
-		DummyFactory factory = (DummyFactory) getBeanFactory().getBean("&singletonFactory");
-		TestBean tb2 = (TestBean) getBeanFactory().getBean("singletonFactory");
-		assertTrue("Singleton references ==", tb == tb2);
-		assertTrue("FactoryBean is BeanFactoryAware", factory.getBeanFactory() != null);
-	}
-
-	public void testFactoryPrototype() throws Exception {
-		assertTrue(getBeanFactory().isSingleton("&prototypeFactory"));
-		assertFalse(getBeanFactory().isSingleton("prototypeFactory"));
-		TestBean tb = (TestBean) getBeanFactory().getBean("prototypeFactory");
-		assertTrue(!tb.getName().equals(DummyFactory.SINGLETON_NAME));
-		TestBean tb2 = (TestBean) getBeanFactory().getBean("prototypeFactory");
-		assertTrue("Prototype references !=", tb != tb2);
-	}
-
-	/**
-	 * Check that we can get the factory bean itself.
-	 * This is only possible if we're dealing with a factory
-	 * @throws Exception
-	 */
-	public void testGetFactoryItself() throws Exception {
-		DummyFactory factory = (DummyFactory) getBeanFactory().getBean("&singletonFactory");
-		assertTrue(factory != null);
-	}
-
-	/**
-	 * Check that afterPropertiesSet gets called on factory
-	 * @throws Exception
-	 */
-	public void testFactoryIsInitialized() throws Exception {
-		TestBean tb = (TestBean) getBeanFactory().getBean("singletonFactory");
-		DummyFactory factory = (DummyFactory) getBeanFactory().getBean("&singletonFactory");
-		assertTrue("Factory was initialized because it implemented InitializingBean", factory.wasInitialized());
-	}
-
-	/**
-	 * It should be illegal to dereference a normal bean
-	 * as a factory
-	 */
-	public void testRejectsFactoryGetOnNormalBean() {
-		try {
-			getBeanFactory().getBean("&rod");
-			fail("Shouldn't permit factory get on normal bean");
-		}
-		catch (BeanIsNotAFactoryException ex) {
-			// Ok
-		}
-	}
-
-	// TODO: refactor in AbstractBeanFactory (tests for AbstractBeanFactory)
-	// and rename this class
-	public void testAliasing() {
-		BeanFactory bf = getBeanFactory();
-		if (!(bf instanceof ConfigurableBeanFactory)) {
-			return;
-		}
-		ConfigurableBeanFactory cbf = (ConfigurableBeanFactory) bf;
-
-		String alias = "rods alias";
-		try {
-			cbf.getBean(alias);
-			fail("Shouldn't permit factory get on normal bean");
-		}
-		catch (NoSuchBeanDefinitionException ex) {
-			// Ok
-			assertTrue(alias.equals(ex.getBeanName()));
-		}
-
-		// Create alias
-		cbf.registerAlias("rod", alias);
-		Object rod = getBeanFactory().getBean("rod");
-		Object aliasRod = getBeanFactory().getBean(alias);
-		assertTrue(rod == aliasRod);
-	}
-
-
-	public static class TestBeanEditor extends PropertyEditorSupport {
-
-		@Override
-		public void setAsText(String text) {
-			TestBean tb = new TestBean();
-			StringTokenizer st = new StringTokenizer(text, "_");
-			tb.setName(st.nextToken());
-			tb.setAge(Integer.parseInt(st.nextToken()));
-			setValue(tb);
-		}
-	}
-
-}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java
deleted file mode 100644
index 855f23af396..00000000000
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans.factory;
-
-import org.springframework.beans.TestBean;
-
-/**
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public abstract class AbstractListableBeanFactoryTests extends AbstractBeanFactoryTests {
-
-	/** Subclasses must initialize this */
-	protected ListableBeanFactory getListableBeanFactory() {
-		BeanFactory bf = getBeanFactory();
-		if (!(bf instanceof ListableBeanFactory)) {
-			throw new IllegalStateException("ListableBeanFactory required");
-		}
-		return (ListableBeanFactory) bf;
-	}
-
-	/**
-	 * Subclasses can override this.
-	 */
-	public void testCount() {
-		assertCount(13);
-	}
-
-	protected final void assertCount(int count) {
-		String[] defnames = getListableBeanFactory().getBeanDefinitionNames();
-		assertTrue("We should have " + count + " beans, not " + defnames.length, defnames.length == count);
-	}
-
-	public void assertTestBeanCount(int count) {
-		String[] defNames = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, false);
-		assertTrue("We should have " + count + " beans for class org.springframework.beans.TestBean, not " +
-				defNames.length, defNames.length == count);
-
-		int countIncludingFactoryBeans = count + 2;
-		String[] names = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, true);
-		assertTrue("We should have " + countIncludingFactoryBeans +
-				" beans for class org.springframework.beans.TestBean, not " + names.length,
-				names.length == countIncludingFactoryBeans);
-	}
-
-	public void testGetDefinitionsForNoSuchClass() {
-		String[] defnames = getListableBeanFactory().getBeanNamesForType(String.class);
-		assertTrue("No string definitions", defnames.length == 0);
-	}
-
-	/**
-	 * Check that count refers to factory class, not bean class. (We don't know
-	 * what type factories may return, and it may even change over time.)
-	 */
-	public void testGetCountForFactoryClass() {
-		assertTrue("Should have 2 factories, not " +
-				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length,
-				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length == 2);
-
-		assertTrue("Should have 2 factories, not " +
-				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length,
-				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length == 2);
-	}
-
-	public void testContainsBeanDefinition() {
-		assertTrue(getListableBeanFactory().containsBeanDefinition("rod"));
-		assertTrue(getListableBeanFactory().containsBeanDefinition("roderick"));
-	}
-
-}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java
deleted file mode 100644
index 6fc7e36aa90..00000000000
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/DummyFactory.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans.factory;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.TestBean;
-import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
-
-/**
- * Simple factory to allow testing of FactoryBean support in AbstractBeanFactory.
- * Depending on whether its singleton property is set, it will return a singleton
- * or a prototype instance.
- *
- * 
Implements InitializingBean interface, so we can check that
- * factories get this lifecycle callback if they want.
- *
- * @author Rod Johnson
- * @since 10.03.2003
- */
-public class DummyFactory
-		implements FactoryBean, BeanNameAware, BeanFactoryAware, InitializingBean, DisposableBean {
-
-	public static final String SINGLETON_NAME = "Factory singleton";
-
-	private static boolean prototypeCreated;
-
-	/**
-	 * Clear static state.
-	 */
-	public static void reset() {
-		prototypeCreated = false;
-	}
-
-
-	/**
-	 * Default is for factories to return a singleton instance.
-	 */
-	private boolean singleton = true;
-
-	private String beanName;
-
-	private AutowireCapableBeanFactory beanFactory;
-
-	private boolean postProcessed;
-
-	private boolean initialized;
-
-	private TestBean testBean;
-
-	private TestBean otherTestBean;
-
-
-	public DummyFactory() {
-		this.testBean = new TestBean();
-		this.testBean.setName(SINGLETON_NAME);
-		this.testBean.setAge(25);
-	}
-
-	/**
-	 * Return if the bean managed by this factory is a singleton.
-	 * @see FactoryBean#isSingleton()
-	 */
-	@Override
-	public boolean isSingleton() {
-		return this.singleton;
-	}
-
-	/**
-	 * Set if the bean managed by this factory is a singleton.
-	 */
-	public void setSingleton(boolean singleton) {
-		this.singleton = singleton;
-	}
-
-	@Override
-	public void setBeanName(String beanName) {
-		this.beanName = beanName;
-	}
-
-	public String getBeanName() {
-		return beanName;
-	}
-
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) {
-		this.beanFactory = (AutowireCapableBeanFactory) beanFactory;
-		this.beanFactory.applyBeanPostProcessorsBeforeInitialization(this.testBean, this.beanName);
-	}
-
-	public BeanFactory getBeanFactory() {
-		return beanFactory;
-	}
-
-	public void setPostProcessed(boolean postProcessed) {
-		this.postProcessed = postProcessed;
-	}
-
-	public boolean isPostProcessed() {
-		return postProcessed;
-	}
-
-	public void setOtherTestBean(TestBean otherTestBean) {
-		this.otherTestBean = otherTestBean;
-		this.testBean.setSpouse(otherTestBean);
-	}
-
-	public TestBean getOtherTestBean() {
-		return otherTestBean;
-	}
-
-	@Override
-	public void afterPropertiesSet() {
-		if (initialized) {
-			throw new RuntimeException("Cannot call afterPropertiesSet twice on the one bean");
-		}
-		this.initialized = true;
-	}
-
-	/**
-	 * Was this initialized by invocation of the
-	 * afterPropertiesSet() method from the InitializingBean interface?
-	 */
-	public boolean wasInitialized() {
-		return initialized;
-	}
-
-	public static boolean wasPrototypeCreated() {
-		return prototypeCreated;
-	}
-
-
-	/**
-	 * Return the managed object, supporting both singleton
-	 * and prototype mode.
-	 * @see FactoryBean#getObject()
-	 */
-	@Override
-	public Object getObject() throws BeansException {
-		if (isSingleton()) {
-			return this.testBean;
-		}
-		else {
-			TestBean prototype = new TestBean("prototype created at " + System.currentTimeMillis(), 11);
-			if (this.beanFactory != null) {
-				this.beanFactory.applyBeanPostProcessorsBeforeInitialization(prototype, this.beanName);
-			}
-			prototypeCreated = true;
-			return prototype;
-		}
-	}
-
-	@Override
-	public Class getObjectType() {
-		return TestBean.class;
-	}
-
-
-	@Override
-	public void destroy() {
-		if (this.testBean != null) {
-			this.testBean.setName(null);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java
deleted file mode 100644
index 013a65a0e49..00000000000
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/LifecycleBean.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans.factory;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-
-/**
- * Simple test of BeanFactory initialization and lifecycle callbacks.
- *
- * @author Rod Johnson
- * @author Colin Sampaleanu
- * @since 12.03.2003
- */
-public class LifecycleBean implements BeanNameAware, BeanFactoryAware, InitializingBean, DisposableBean {
-
-	protected boolean initMethodDeclared = false;
-
-	protected String beanName;
-
-	protected BeanFactory owningFactory;
-
-	protected boolean postProcessedBeforeInit;
-
-	protected boolean inited;
-
-	protected boolean initedViaDeclaredInitMethod;
-
-	protected boolean postProcessedAfterInit;
-
-	protected boolean destroyed;
-
-
-	public void setInitMethodDeclared(boolean initMethodDeclared) {
-		this.initMethodDeclared = initMethodDeclared;
-	}
-
-	public boolean isInitMethodDeclared() {
-		return initMethodDeclared;
-	}
-
-	@Override
-	public void setBeanName(String name) {
-		this.beanName = name;
-	}
-
-	public String getBeanName() {
-		return beanName;
-	}
-
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) {
-		this.owningFactory = beanFactory;
-	}
-
-	public void postProcessBeforeInit() {
-		if (this.inited || this.initedViaDeclaredInitMethod) {
-			throw new RuntimeException("Factory called postProcessBeforeInit after afterPropertiesSet");
-		}
-		if (this.postProcessedBeforeInit) {
-			throw new RuntimeException("Factory called postProcessBeforeInit twice");
-		}
-		this.postProcessedBeforeInit = true;
-	}
-
-	@Override
-	public void afterPropertiesSet() {
-		if (this.owningFactory == null) {
-			throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean");
-		}
-		if (!this.postProcessedBeforeInit) {
-			throw new RuntimeException("Factory didn't call postProcessBeforeInit before afterPropertiesSet on lifecycle bean");
-		}
-		if (this.initedViaDeclaredInitMethod) {
-			throw new RuntimeException("Factory initialized via declared init method before initializing via afterPropertiesSet");
-		}
-		if (this.inited) {
-			throw new RuntimeException("Factory called afterPropertiesSet twice");
-		}
-		this.inited = true;
-	}
-
-	public void declaredInitMethod() {
-		if (!this.inited) {
-			throw new RuntimeException("Factory didn't call afterPropertiesSet before declared init method");
-		}
-
-		if (this.initedViaDeclaredInitMethod) {
-			throw new RuntimeException("Factory called declared init method twice");
-		}
-		this.initedViaDeclaredInitMethod = true;
-	}
-
-	public void postProcessAfterInit() {
-		if (!this.inited) {
-			throw new RuntimeException("Factory called postProcessAfterInit before afterPropertiesSet");
-		}
-		if (this.initMethodDeclared && !this.initedViaDeclaredInitMethod) {
-			throw new RuntimeException("Factory called postProcessAfterInit before calling declared init method");
-		}
-		if (this.postProcessedAfterInit) {
-			throw new RuntimeException("Factory called postProcessAfterInit twice");
-		}
-		this.postProcessedAfterInit = true;
-	}
-
-	/**
-	 * Dummy business method that will fail unless the factory
-	 * managed the bean's lifecycle correctly
-	 */
-	public void businessMethod() {
-		if (!this.inited || (this.initMethodDeclared && !this.initedViaDeclaredInitMethod) ||
-				!this.postProcessedAfterInit) {
-			throw new RuntimeException("Factory didn't initialize lifecycle object correctly");
-		}
-	}
-
-	@Override
-	public void destroy() {
-		if (this.destroyed) {
-			throw new IllegalStateException("Already destroyed");
-		}
-		this.destroyed = true;
-	}
-
-	public boolean isDestroyed() {
-		return destroyed;
-	}
-
-
-	public static class PostProcessor implements BeanPostProcessor {
-
-		@Override
-		public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
-			if (bean instanceof LifecycleBean) {
-				((LifecycleBean) bean).postProcessBeforeInit();
-			}
-			return bean;
-		}
-
-		@Override
-		public Object postProcessAfterInitialization(Object bean, String name) throws BeansException {
-			if (bean instanceof LifecycleBean) {
-				((LifecycleBean) bean).postProcessAfterInit();
-			}
-			return bean;
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
deleted file mode 100644
index b9a7925ad82..00000000000
--- a/spring-webmvc-portlet/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans.factory;
-
-import org.springframework.beans.factory.InitializingBean;
-
-/**
- * Simple test of BeanFactory initialization
- * @author Rod Johnson
- * @since 12.03.2003
- */
-public class MustBeInitialized implements InitializingBean {
-
-	private boolean inited;
-
-	/**
-	 * @see InitializingBean#afterPropertiesSet()
-	 */
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		this.inited = true;
-	}
-
-	/**
-	 * Dummy business method that will fail unless the factory
-	 * managed the bean's lifecycle correctly
-	 */
-	public void businessMethod() {
-		if (!this.inited)
-			throw new RuntimeException("Factory didn't call afterPropertiesSet() on MustBeInitialized object");
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
deleted file mode 100644
index a7207435209..00000000000
--- a/spring-webmvc-portlet/src/test/java/org/springframework/context/AbstractApplicationContextTests.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.context;
-
-import java.util.Locale;
-
-import org.springframework.beans.TestBean;
-import org.springframework.beans.factory.AbstractListableBeanFactoryTests;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.LifecycleBean;
-
-/**
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public abstract class AbstractApplicationContextTests extends AbstractListableBeanFactoryTests {
-
-	/** Must be supplied as XML */
-	public static final String TEST_NAMESPACE = "testNamespace";
-
-	protected ConfigurableApplicationContext applicationContext;
-
-	/** Subclass must register this */
-	protected TestListener listener = new TestListener();
-
-	protected TestListener parentListener = new TestListener();
-
-	@Override
-	protected void setUp() throws Exception {
-		this.applicationContext = createContext();
-	}
-
-	@Override
-	protected BeanFactory getBeanFactory() {
-		return applicationContext;
-	}
-
-	protected ApplicationContext getApplicationContext() {
-		return applicationContext;
-	}
-
-	/**
-	 * Must register a TestListener.
-	 * Must register standard beans.
-	 * Parent must register rod with name Roderick
-	 * and father with name Albert.
-	 */
-	protected abstract ConfigurableApplicationContext createContext() throws Exception;
-
-	public void testContextAwareSingletonWasCalledBack() throws Exception {
-		ACATester aca = (ACATester) applicationContext.getBean("aca");
-		assertTrue("has had context set", aca.getApplicationContext() == applicationContext);
-		Object aca2 = applicationContext.getBean("aca");
-		assertTrue("Same instance", aca == aca2);
-		assertTrue("Says is singleton", applicationContext.isSingleton("aca"));
-	}
-
-	public void testContextAwarePrototypeWasCalledBack() throws Exception {
-		ACATester aca = (ACATester) applicationContext.getBean("aca-prototype");
-		assertTrue("has had context set", aca.getApplicationContext() == applicationContext);
-		Object aca2 = applicationContext.getBean("aca-prototype");
-		assertTrue("NOT Same instance", aca != aca2);
-		assertTrue("Says is prototype", !applicationContext.isSingleton("aca-prototype"));
-	}
-
-	public void testParentNonNull() {
-		assertTrue("parent isn't null", applicationContext.getParent() != null);
-	}
-
-	public void testGrandparentNull() {
-		assertTrue("grandparent is null", applicationContext.getParent().getParent() == null);
-	}
-
-	public void testOverrideWorked() throws Exception {
-		TestBean rod = (TestBean) applicationContext.getParent().getBean("rod");
-		assertTrue("Parent's name differs", rod.getName().equals("Roderick"));
-	}
-
-	public void testGrandparentDefinitionFound() throws Exception {
-		TestBean dad = (TestBean) applicationContext.getBean("father");
-		assertTrue("Dad has correct name", dad.getName().equals("Albert"));
-	}
-
-	public void testGrandparentTypedDefinitionFound() throws Exception {
-		TestBean dad = applicationContext.getBean("father", TestBean.class);
-		assertTrue("Dad has correct name", dad.getName().equals("Albert"));
-	}
-
-	public void testCloseTriggersDestroy() {
-		LifecycleBean lb = (LifecycleBean) applicationContext.getBean("lifecycle");
-		assertTrue("Not destroyed", !lb.isDestroyed());
-		applicationContext.close();
-		if (applicationContext.getParent() != null) {
-			((ConfigurableApplicationContext) applicationContext.getParent()).close();
-		}
-		assertTrue("Destroyed", lb.isDestroyed());
-		applicationContext.close();
-		if (applicationContext.getParent() != null) {
-			((ConfigurableApplicationContext) applicationContext.getParent()).close();
-		}
-		assertTrue("Destroyed", lb.isDestroyed());
-	}
-
-	public void testMessageSource() throws NoSuchMessageException {
-		assertEquals("message1", applicationContext.getMessage("code1", null, Locale.getDefault()));
-		assertEquals("message2", applicationContext.getMessage("code2", null, Locale.getDefault()));
-
-		try {
-			applicationContext.getMessage("code0", null, Locale.getDefault());
-			fail("looking for code0 should throw a NoSuchMessageException");
-		}
-		catch (NoSuchMessageException ex) {
-			// that's how it should be
-		}
-	}
-
-	public void testEvents() throws Exception {
-		listener.zeroCounter();
-		parentListener.zeroCounter();
-		assertTrue("0 events before publication", listener.getEventCount() == 0);
-		assertTrue("0 parent events before publication", parentListener.getEventCount() == 0);
-		this.applicationContext.publishEvent(new MyEvent(this));
-		assertTrue("1 events after publication, not " + listener.getEventCount(), listener.getEventCount() == 1);
-		assertTrue("1 parent events after publication", parentListener.getEventCount() == 1);
-	}
-
-	public void testBeanAutomaticallyHearsEvents() throws Exception {
-		//String[] listenerNames = ((ListableBeanFactory) applicationContext).getBeanDefinitionNames(ApplicationListener.class);
-		//assertTrue("listeners include beanThatListens", Arrays.asList(listenerNames).contains("beanThatListens"));
-		BeanThatListens b = (BeanThatListens) applicationContext.getBean("beanThatListens");
-		b.zero();
-		assertTrue("0 events before publication", b.getEventCount() == 0);
-		this.applicationContext.publishEvent(new MyEvent(this));
-		assertTrue("1 events after publication, not " + b.getEventCount(), b.getEventCount() == 1);
-	}
-
-
-	@SuppressWarnings("serial")
-	public static class MyEvent extends ApplicationEvent {
-
-		public MyEvent(Object source) {
-			super(source);
-		}
-	}
-
-}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java
index 14acac1ceb9..37d4c9715fb 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/context/LifecycleContextBean.java
@@ -3,7 +3,7 @@ package org.springframework.context;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.LifecycleBean;
+import org.springframework.tests.sample.beans.LifecycleBean;
 
 /**
  * Simple bean to test ApplicationContext lifecycle methods for beans
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
deleted file mode 100644
index d580974a608..00000000000
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/DelegatingServletOutputStream.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.mock.web;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import javax.servlet.ServletOutputStream;
-
-import org.springframework.util.Assert;
-
-/**
- * Delegating implementation of {@link javax.servlet.ServletOutputStream}.
- *
- * 
Used by {@link MockHttpServletResponse}; typically not directly
- * used for testing application controllers.
- *
- * @author Juergen Hoeller
- * @since 1.0.2
- * @see MockHttpServletResponse
- */
-public class DelegatingServletOutputStream extends ServletOutputStream {
-
-	private final OutputStream targetStream;
-
-
-	/**
-	 * Create a DelegatingServletOutputStream for the given target stream.
-	 * @param targetStream the target stream (never {@code null})
-	 */
-	public DelegatingServletOutputStream(OutputStream targetStream) {
-		Assert.notNull(targetStream, "Target OutputStream must not be null");
-		this.targetStream = targetStream;
-	}
-
-	/**
-	 * Return the underlying target stream (never {@code null}).
-	 */
-	public final OutputStream getTargetStream() {
-		return this.targetStream;
-	}
-
-
-	@Override
-	public void write(int b) throws IOException {
-		this.targetStream.write(b);
-	}
-
-	@Override
-	public void flush() throws IOException {
-		super.flush();
-		this.targetStream.flush();
-	}
-
-	@Override
-	public void close() throws IOException {
-		super.close();
-		this.targetStream.close();
-	}
-
-}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/HeaderValueHolder.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
deleted file mode 100644
index e8f5e91dfb6..00000000000
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/HeaderValueHolder.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.mock.web;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.util.Assert;
-import org.springframework.util.CollectionUtils;
-
-/**
- * Internal helper class that serves as value holder for request headers.
- *
- * @author Juergen Hoeller
- * @author Rick Evans
- * @since 2.0.1
- */
-class HeaderValueHolder {
-
-	private final List values = new LinkedList();
-
-
-	public void setValue(Object value) {
-		this.values.clear();
-		this.values.add(value);
-	}
-
-	public void addValue(Object value) {
-		this.values.add(value);
-	}
-
-	public void addValues(Collection values) {
-		this.values.addAll(values);
-	}
-
-	public void addValueArray(Object values) {
-		CollectionUtils.mergeArrayIntoCollection(values, this.values);
-	}
-
-	public List getValues() {
-		return Collections.unmodifiableList(this.values);
-	}
-
-	public List getStringValues() {
-		List stringList = new ArrayList(this.values.size());
-		for (Object value : this.values) {
-			stringList.add(value.toString());
-		}
-		return Collections.unmodifiableList(stringList);
-	}
-
-	public Object getValue() {
-		return (!this.values.isEmpty() ? this.values.get(0) : null);
-	}
-
-	public String getStringValue() {
-		return (!this.values.isEmpty() ? this.values.get(0).toString() : null);
-	}
-
-
-	/**
-	 * Find a HeaderValueHolder by name, ignoring casing.
-	 * @param headers the Map of header names to HeaderValueHolders
-	 * @param name the name of the desired header
-	 * @return the corresponding HeaderValueHolder,
-	 * or {@code null} if none found
-	 */
-	public static HeaderValueHolder getByName(Map headers, String name) {
-		Assert.notNull(name, "Header name must not be null");
-		for (String headerName : headers.keySet()) {
-			if (headerName.equalsIgnoreCase(name)) {
-				return headers.get(headerName);
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
deleted file mode 100644
index 5a2b7fd1aa8..00000000000
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpServletResponse.java
+++ /dev/null
@@ -1,641 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.mock.web;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.util.Assert;
-import org.springframework.util.LinkedCaseInsensitiveMap;
-import org.springframework.web.util.WebUtils;
-
-/**
- * Mock implementation of the {@link javax.servlet.http.HttpServletResponse} interface.
- *
- * 
Compatible with Servlet 2.5 as well as Servlet 3.0.
- *
- * @author Juergen Hoeller
- * @author Rod Johnson
- * @since 1.0.2
- */
-public class MockHttpServletResponse implements HttpServletResponse {
-
-	private static final String CHARSET_PREFIX = "charset=";
-
-	private static final String CONTENT_TYPE_HEADER = "Content-Type";
-
-	private static final String CONTENT_LENGTH_HEADER = "Content-Length";
-
-	private static final String LOCATION_HEADER = "Location";
-
-	//---------------------------------------------------------------------
-	// ServletResponse properties
-	//---------------------------------------------------------------------
-
-	private boolean outputStreamAccessAllowed = true;
-
-	private boolean writerAccessAllowed = true;
-
-	private String characterEncoding = WebUtils.DEFAULT_CHARACTER_ENCODING;
-
-	private boolean charset = false;
-
-	private final ByteArrayOutputStream content = new ByteArrayOutputStream();
-
-	private final ServletOutputStream outputStream = new ResponseServletOutputStream(this.content);
-
-	private PrintWriter writer;
-
-	private int contentLength = 0;
-
-	private String contentType;
-
-	private int bufferSize = 4096;
-
-	private boolean committed;
-
-	private Locale locale = Locale.getDefault();
-
-
-	//---------------------------------------------------------------------
-	// HttpServletResponse properties
-	//---------------------------------------------------------------------
-
-	private final List cookies = new ArrayList();
-
-	private final Map headers = new LinkedCaseInsensitiveMap();
-
-	private int status = HttpServletResponse.SC_OK;
-
-	private String errorMessage;
-
-	private String forwardedUrl;
-
-	private final List includedUrls = new ArrayList();
-
-
-	//---------------------------------------------------------------------
-	// ServletResponse interface
-	//---------------------------------------------------------------------
-
-	/**
-	 * Set whether {@link #getOutputStream()} access is allowed.
-	 * 
Default is {@code true}.
-	 */
-	public void setOutputStreamAccessAllowed(boolean outputStreamAccessAllowed) {
-		this.outputStreamAccessAllowed = outputStreamAccessAllowed;
-	}
-
-	/**
-	 * Return whether {@link #getOutputStream()} access is allowed.
-	 */
-	public boolean isOutputStreamAccessAllowed() {
-		return this.outputStreamAccessAllowed;
-	}
-
-	/**
-	 * Set whether {@link #getWriter()} access is allowed.
-	 * 
Default is {@code true}.
-	 */
-	public void setWriterAccessAllowed(boolean writerAccessAllowed) {
-		this.writerAccessAllowed = writerAccessAllowed;
-	}
-
-	/**
-	 * Return whether {@link #getOutputStream()} access is allowed.
-	 */
-	public boolean isWriterAccessAllowed() {
-		return this.writerAccessAllowed;
-	}
-
-	@Override
-	public void setCharacterEncoding(String characterEncoding) {
-		this.characterEncoding = characterEncoding;
-		this.charset = true;
-		updateContentTypeHeader();
-	}
-
-	private void updateContentTypeHeader() {
-		if (this.contentType != null) {
-			StringBuilder sb = new StringBuilder(this.contentType);
-			if (this.contentType.toLowerCase().indexOf(CHARSET_PREFIX) == -1 && this.charset) {
-				sb.append(";").append(CHARSET_PREFIX).append(this.characterEncoding);
-			}
-			doAddHeaderValue(CONTENT_TYPE_HEADER, sb.toString(), true);
-		}
-	}
-
-	@Override
-	public String getCharacterEncoding() {
-		return this.characterEncoding;
-	}
-
-	@Override
-	public ServletOutputStream getOutputStream() {
-		if (!this.outputStreamAccessAllowed) {
-			throw new IllegalStateException("OutputStream access not allowed");
-		}
-		return this.outputStream;
-	}
-
-	@Override
-	public PrintWriter getWriter() throws UnsupportedEncodingException {
-		if (!this.writerAccessAllowed) {
-			throw new IllegalStateException("Writer access not allowed");
-		}
-		if (this.writer == null) {
-			Writer targetWriter = (this.characterEncoding != null ?
-					new OutputStreamWriter(this.content, this.characterEncoding) : new OutputStreamWriter(this.content));
-			this.writer = new ResponsePrintWriter(targetWriter);
-		}
-		return this.writer;
-	}
-
-	public byte[] getContentAsByteArray() {
-		flushBuffer();
-		return this.content.toByteArray();
-	}
-
-	public String getContentAsString() throws UnsupportedEncodingException {
-		flushBuffer();
-		return (this.characterEncoding != null) ?
-				this.content.toString(this.characterEncoding) : this.content.toString();
-	}
-
-	@Override
-	public void setContentLength(int contentLength) {
-		this.contentLength = contentLength;
-		doAddHeaderValue(CONTENT_LENGTH_HEADER, contentLength, true);
-	}
-
-	public int getContentLength() {
-		return this.contentLength;
-	}
-
-	@Override
-	public void setContentType(String contentType) {
-		this.contentType = contentType;
-		if (contentType != null) {
-			int charsetIndex = contentType.toLowerCase().indexOf(CHARSET_PREFIX);
-			if (charsetIndex != -1) {
-				String encoding = contentType.substring(charsetIndex + CHARSET_PREFIX.length());
-				this.characterEncoding = encoding;
-				this.charset = true;
-			}
-			updateContentTypeHeader();
-		}
-	}
-
-	@Override
-	public String getContentType() {
-		return this.contentType;
-	}
-
-	@Override
-	public void setBufferSize(int bufferSize) {
-		this.bufferSize = bufferSize;
-	}
-
-	@Override
-	public int getBufferSize() {
-		return this.bufferSize;
-	}
-
-	@Override
-	public void flushBuffer() {
-		setCommitted(true);
-	}
-
-	@Override
-	public void resetBuffer() {
-		if (isCommitted()) {
-			throw new IllegalStateException("Cannot reset buffer - response is already committed");
-		}
-		this.content.reset();
-	}
-
-	private void setCommittedIfBufferSizeExceeded() {
-		int bufSize = getBufferSize();
-		if (bufSize > 0 && this.content.size() > bufSize) {
-			setCommitted(true);
-		}
-	}
-
-	public void setCommitted(boolean committed) {
-		this.committed = committed;
-	}
-
-	@Override
-	public boolean isCommitted() {
-		return this.committed;
-	}
-
-	@Override
-	public void reset() {
-		resetBuffer();
-		this.characterEncoding = null;
-		this.contentLength = 0;
-		this.contentType = null;
-		this.locale = null;
-		this.cookies.clear();
-		this.headers.clear();
-		this.status = HttpServletResponse.SC_OK;
-		this.errorMessage = null;
-	}
-
-	@Override
-	public void setLocale(Locale locale) {
-		this.locale = locale;
-	}
-
-	@Override
-	public Locale getLocale() {
-		return this.locale;
-	}
-
-
-	//---------------------------------------------------------------------
-	// HttpServletResponse interface
-	//---------------------------------------------------------------------
-
-	@Override
-	public void addCookie(Cookie cookie) {
-		Assert.notNull(cookie, "Cookie must not be null");
-		this.cookies.add(cookie);
-	}
-
-	public Cookie[] getCookies() {
-		return this.cookies.toArray(new Cookie[this.cookies.size()]);
-	}
-
-	public Cookie getCookie(String name) {
-		Assert.notNull(name, "Cookie name must not be null");
-		for (Cookie cookie : this.cookies) {
-			if (name.equals(cookie.getName())) {
-				return cookie;
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public boolean containsHeader(String name) {
-		return (HeaderValueHolder.getByName(this.headers, name) != null);
-	}
-
-	/**
-	 * Return the names of all specified headers as a Set of Strings.
-	 * 
As of Servlet 3.0, this method is also defined HttpServletResponse.
-	 * @return the {@code Set} of header name {@code Strings}, or an empty {@code Set} if none
-	 */
-	public Set getHeaderNames() {
-		return this.headers.keySet();
-	}
-
-	/**
-	 * Return the primary value for the given header as a String, if any.
-	 * Will return the first value in case of multiple values.
-	 * 
As of Servlet 3.0, this method is also defined in HttpServletResponse.
-	 * As of Spring 3.1, it returns a stringified value for Servlet 3.0 compatibility.
-	 * Consider using {@link #getHeaderValue(String)} for raw Object access.
-	 * @param name the name of the header
-	 * @return the associated header value, or {@code null} if none
-	 */
-	public String getHeader(String name) {
-		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
-		return (header != null ? header.getStringValue() : null);
-	}
-
-	/**
-	 * Return all values for the given header as a List of Strings.
-	 * 
As of Servlet 3.0, this method is also defined in HttpServletResponse.
-	 * As of Spring 3.1, it returns a List of stringified values for Servlet 3.0 compatibility.
-	 * Consider using {@link #getHeaderValues(String)} for raw Object access.
-	 * @param name the name of the header
-	 * @return the associated header values, or an empty List if none
-	 */
-	public List getHeaders(String name) {
-		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
-		if (header != null) {
-			return header.getStringValues();
-		}
-		else {
-			return Collections.emptyList();
-		}
-	}
-
-	/**
-	 * Return the primary value for the given header, if any.
-	 * 
Will return the first value in case of multiple values.
-	 * @param name the name of the header
-	 * @return the associated header value, or {@code null} if none
-	 */
-	public Object getHeaderValue(String name) {
-		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
-		return (header != null ? header.getValue() : null);
-	}
-
-	/**
-	 * Return all values for the given header as a List of value objects.
-	 * @param name the name of the header
-	 * @return the associated header values, or an empty List if none
-	 */
-	public List getHeaderValues(String name) {
-		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
-		if (header != null) {
-			return header.getValues();
-		}
-		else {
-			return Collections.emptyList();
-		}
-	}
-
-	/**
-	 * The default implementation returns the given URL String as-is.
-	 * 
Can be overridden in subclasses, appending a session id or the like.
-	 */
-	@Override
-	public String encodeURL(String url) {
-		return url;
-	}
-
-	/**
-	 * The default implementation delegates to {@link #encodeURL},
-	 * returning the given URL String as-is.
-	 * 
Can be overridden in subclasses, appending a session id or the like
-	 * in a redirect-specific fashion. For general URL encoding rules,
-	 * override the common {@link #encodeURL} method instead, applying
-	 * to redirect URLs as well as to general URLs.
-	 */
-	@Override
-	public String encodeRedirectURL(String url) {
-		return encodeURL(url);
-	}
-
-	@Override
-	public String encodeUrl(String url) {
-		return encodeURL(url);
-	}
-
-	@Override
-	public String encodeRedirectUrl(String url) {
-		return encodeRedirectURL(url);
-	}
-
-	@Override
-	public void sendError(int status, String errorMessage) throws IOException {
-		if (isCommitted()) {
-			throw new IllegalStateException("Cannot set error status - response is already committed");
-		}
-		this.status = status;
-		this.errorMessage = errorMessage;
-		setCommitted(true);
-	}
-
-	@Override
-	public void sendError(int status) throws IOException {
-		if (isCommitted()) {
-			throw new IllegalStateException("Cannot set error status - response is already committed");
-		}
-		this.status = status;
-		setCommitted(true);
-	}
-
-	@Override
-	public void sendRedirect(String url) throws IOException {
-		if (isCommitted()) {
-			throw new IllegalStateException("Cannot send redirect - response is already committed");
-		}
-		Assert.notNull(url, "Redirect URL must not be null");
-		setHeader(LOCATION_HEADER, url);
-		setStatus(HttpServletResponse.SC_MOVED_TEMPORARILY);
-		setCommitted(true);
-	}
-
-	public String getRedirectedUrl() {
-		return getHeader(LOCATION_HEADER);
-	}
-
-	@Override
-	public void setDateHeader(String name, long value) {
-		setHeaderValue(name, value);
-	}
-
-	@Override
-	public void addDateHeader(String name, long value) {
-		addHeaderValue(name, value);
-	}
-
-	@Override
-	public void setHeader(String name, String value) {
-		setHeaderValue(name, value);
-	}
-
-	@Override
-	public void addHeader(String name, String value) {
-		addHeaderValue(name, value);
-	}
-
-	@Override
-	public void setIntHeader(String name, int value) {
-		setHeaderValue(name, value);
-	}
-
-	@Override
-	public void addIntHeader(String name, int value) {
-		addHeaderValue(name, value);
-	}
-
-	private void setHeaderValue(String name, Object value) {
-		if (setSpecialHeader(name, value)) {
-			return;
-		}
-		doAddHeaderValue(name, value, true);
-	}
-
-	private void addHeaderValue(String name, Object value) {
-		if (setSpecialHeader(name, value)) {
-			return;
-		}
-		doAddHeaderValue(name, value, false);
-	}
-
-	private boolean setSpecialHeader(String name, Object value) {
-		if (CONTENT_TYPE_HEADER.equalsIgnoreCase(name)) {
-			setContentType((String) value);
-			return true;
-		}
-		else if (CONTENT_LENGTH_HEADER.equalsIgnoreCase(name)) {
-			setContentLength(Integer.parseInt((String) value));
-			return true;
-		}
-		else {
-			return false;
-		}
-	}
-
-	private void doAddHeaderValue(String name, Object value, boolean replace) {
-		HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
-		Assert.notNull(value, "Header value must not be null");
-		if (header == null) {
-			header = new HeaderValueHolder();
-			this.headers.put(name, header);
-		}
-		if (replace) {
-			header.setValue(value);
-		}
-		else {
-			header.addValue(value);
-		}
-	}
-
-	@Override
-	public void setStatus(int status) {
-		this.status = status;
-	}
-
-	@Override
-	public void setStatus(int status, String errorMessage) {
-		this.status = status;
-		this.errorMessage = errorMessage;
-	}
-
-	public int getStatus() {
-		return this.status;
-	}
-
-	public String getErrorMessage() {
-		return this.errorMessage;
-	}
-
-
-	//---------------------------------------------------------------------
-	// Methods for MockRequestDispatcher
-	//---------------------------------------------------------------------
-
-	public void setForwardedUrl(String forwardedUrl) {
-		this.forwardedUrl = forwardedUrl;
-	}
-
-	public String getForwardedUrl() {
-		return this.forwardedUrl;
-	}
-
-	public void setIncludedUrl(String includedUrl) {
-		this.includedUrls.clear();
-		if (includedUrl != null) {
-			this.includedUrls.add(includedUrl);
-		}
-	}
-
-	public String getIncludedUrl() {
-		int count = this.includedUrls.size();
-		if (count > 1) {
-			throw new IllegalStateException(
-					"More than 1 URL included - check getIncludedUrls instead: " + this.includedUrls);
-		}
-		return (count == 1 ? this.includedUrls.get(0) : null);
-	}
-
-	public void addIncludedUrl(String includedUrl) {
-		Assert.notNull(includedUrl, "Included URL must not be null");
-		this.includedUrls.add(includedUrl);
-	}
-
-	public List getIncludedUrls() {
-		return this.includedUrls;
-	}
-
-
-	/**
-	 * Inner class that adapts the ServletOutputStream to mark the
-	 * response as committed once the buffer size is exceeded.
-	 */
-	private class ResponseServletOutputStream extends DelegatingServletOutputStream {
-
-		public ResponseServletOutputStream(OutputStream out) {
-			super(out);
-		}
-
-		@Override
-		public void write(int b) throws IOException {
-			super.write(b);
-			super.flush();
-			setCommittedIfBufferSizeExceeded();
-		}
-
-		@Override
-		public void flush() throws IOException {
-			super.flush();
-			setCommitted(true);
-		}
-	}
-
-
-	/**
-	 * Inner class that adapts the PrintWriter to mark the
-	 * response as committed once the buffer size is exceeded.
-	 */
-	private class ResponsePrintWriter extends PrintWriter {
-
-		public ResponsePrintWriter(Writer out) {
-			super(out, true);
-		}
-
-		@Override
-		public void write(char buf[], int off, int len) {
-			super.write(buf, off, len);
-			super.flush();
-			setCommittedIfBufferSizeExceeded();
-		}
-
-		@Override
-		public void write(String s, int off, int len) {
-			super.write(s, off, len);
-			super.flush();
-			setCommittedIfBufferSizeExceeded();
-		}
-
-		@Override
-		public void write(int c) {
-			super.write(c);
-			super.flush();
-			setCommittedIfBufferSizeExceeded();
-		}
-
-		@Override
-		public void flush() {
-			super.flush();
-			setCommitted(true);
-		}
-	}
-
-}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java
deleted file mode 100644
index 82a89b61a38..00000000000
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockHttpSession.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.mock.web;
-
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionBindingEvent;
-import javax.servlet.http.HttpSessionBindingListener;
-import javax.servlet.http.HttpSessionContext;
-
-import org.springframework.util.Assert;
-
-/**
- * Mock implementation of the {@link javax.servlet.http.HttpSession} interface.
- *
- * 
Compatible with Servlet 2.5 as well as Servlet 3.0.
- *
- * 
Used for testing the web framework; also useful for testing application
- * controllers.
- *
- * @author Juergen Hoeller
- * @author Rod Johnson
- * @author Mark Fisher
- * @author Sam Brannen
- * @since 1.0.2
- */
-@SuppressWarnings("deprecation")
-public class MockHttpSession implements HttpSession {
-
-	public static final String SESSION_COOKIE_NAME = "JSESSION";
-
-	private static int nextId = 1;
-
-	private final String id;
-
-	private final long creationTime = System.currentTimeMillis();
-
-	private int maxInactiveInterval;
-
-	private long lastAccessedTime = System.currentTimeMillis();
-
-	private final ServletContext servletContext;
-
-	private final Map attributes = new LinkedHashMap();
-
-	private boolean invalid = false;
-
-	private boolean isNew = true;
-
-
-	/**
-	 * Create a new MockHttpSession with a default {@link MockServletContext}.
-	 *
-	 * @see MockServletContext
-	 */
-	public MockHttpSession() {
-		this(null);
-	}
-
-	/**
-	 * Create a new MockHttpSession.
-	 *
-	 * @param servletContext the ServletContext that the session runs in
-	 */
-	public MockHttpSession(ServletContext servletContext) {
-		this(servletContext, null);
-	}
-
-	/**
-	 * Create a new MockHttpSession.
-	 *
-	 * @param servletContext the ServletContext that the session runs in
-	 * @param id a unique identifier for this session
-	 */
-	public MockHttpSession(ServletContext servletContext, String id) {
-		this.servletContext = (servletContext != null ? servletContext : new MockServletContext());
-		this.id = (id != null ? id : Integer.toString(nextId++));
-	}
-
-	@Override
-	public long getCreationTime() {
-		return this.creationTime;
-	}
-
-	@Override
-	public String getId() {
-		return this.id;
-	}
-
-	public void access() {
-		this.lastAccessedTime = System.currentTimeMillis();
-		this.isNew = false;
-	}
-
-	@Override
-	public long getLastAccessedTime() {
-		return this.lastAccessedTime;
-	}
-
-	@Override
-	public ServletContext getServletContext() {
-		return this.servletContext;
-	}
-
-	@Override
-	public void setMaxInactiveInterval(int interval) {
-		this.maxInactiveInterval = interval;
-	}
-
-	@Override
-	public int getMaxInactiveInterval() {
-		return this.maxInactiveInterval;
-	}
-
-	@Override
-	public HttpSessionContext getSessionContext() {
-		throw new UnsupportedOperationException("getSessionContext");
-	}
-
-	@Override
-	public Object getAttribute(String name) {
-		Assert.notNull(name, "Attribute name must not be null");
-		return this.attributes.get(name);
-	}
-
-	@Override
-	public Object getValue(String name) {
-		return getAttribute(name);
-	}
-
-	@Override
-	public Enumeration getAttributeNames() {
-		return Collections.enumeration(this.attributes.keySet());
-	}
-
-	@Override
-	public String[] getValueNames() {
-		return this.attributes.keySet().toArray(new String[this.attributes.size()]);
-	}
-
-	@Override
-	public void setAttribute(String name, Object value) {
-		Assert.notNull(name, "Attribute name must not be null");
-		if (value != null) {
-			this.attributes.put(name, value);
-			if (value instanceof HttpSessionBindingListener) {
-				((HttpSessionBindingListener) value).valueBound(new HttpSessionBindingEvent(this, name, value));
-			}
-		}
-		else {
-			removeAttribute(name);
-		}
-	}
-
-	@Override
-	public void putValue(String name, Object value) {
-		setAttribute(name, value);
-	}
-
-	@Override
-	public void removeAttribute(String name) {
-		Assert.notNull(name, "Attribute name must not be null");
-		Object value = this.attributes.remove(name);
-		if (value instanceof HttpSessionBindingListener) {
-			((HttpSessionBindingListener) value).valueUnbound(new HttpSessionBindingEvent(this, name, value));
-		}
-	}
-
-	@Override
-	public void removeValue(String name) {
-		removeAttribute(name);
-	}
-
-	/**
-	 * Clear all of this session's attributes.
-	 */
-	public void clearAttributes() {
-		for (Iterator> it = this.attributes.entrySet().iterator(); it.hasNext();) {
-			Map.Entry entry = it.next();
-			String name = entry.getKey();
-			Object value = entry.getValue();
-			it.remove();
-			if (value instanceof HttpSessionBindingListener) {
-				((HttpSessionBindingListener) value).valueUnbound(new HttpSessionBindingEvent(this, name, value));
-			}
-		}
-	}
-
-	/**
-	 * Invalidates this session then unbinds any objects bound to it.
-	 *
-	 * @throws IllegalStateException if this method is called on an already invalidated session
-	 */
-	@Override
-	public void invalidate() {
-		if (this.invalid) {
-			throw new IllegalStateException("The session has already been invalidated");
-		}
-
-		// else
-		this.invalid = true;
-		clearAttributes();
-	}
-
-	public boolean isInvalid() {
-		return this.invalid;
-	}
-
-	public void setNew(boolean value) {
-		this.isNew = value;
-	}
-
-	@Override
-	public boolean isNew() {
-		return this.isNew;
-	}
-
-	/**
-	 * Serialize the attributes of this session into an object that can be
-	 * turned into a byte array with standard Java serialization.
-	 *
-	 * @return a representation of this session's serialized state
-	 */
-	public Serializable serializeState() {
-		HashMap state = new HashMap();
-		for (Iterator> it = this.attributes.entrySet().iterator(); it.hasNext();) {
-			Map.Entry entry = it.next();
-			String name = entry.getKey();
-			Object value = entry.getValue();
-			it.remove();
-			if (value instanceof Serializable) {
-				state.put(name, (Serializable) value);
-			}
-			else {
-				// Not serializable... Servlet containers usually automatically
-				// unbind the attribute in this case.
-				if (value instanceof HttpSessionBindingListener) {
-					((HttpSessionBindingListener) value).valueUnbound(new HttpSessionBindingEvent(this, name, value));
-				}
-			}
-		}
-		return state;
-	}
-
-	/**
-	 * Deserialize the attributes of this session from a state object created by
-	 * {@link #serializeState()}.
-	 *
-	 * @param state a representation of this session's serialized state
-	 */
-	@SuppressWarnings("unchecked")
-	public void deserializeState(Serializable state) {
-		Assert.isTrue(state instanceof Map, "Serialized state needs to be of type [java.util.Map]");
-		this.attributes.putAll((Map) state);
-	}
-
-}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java
deleted file mode 100644
index 7d154808d3c..00000000000
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockMultipartFile.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.mock.web;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import org.springframework.util.Assert;
-import org.springframework.util.FileCopyUtils;
-import org.springframework.web.multipart.MultipartFile;
-
-/**
- * Mock implementation of the {@link org.springframework.web.multipart.MultipartFile}
- * interface.
- *
- * 
Useful in conjunction with a {@link MockMultipartHttpServletRequest}
- * for testing application controllers that access multipart uploads.
- *
- * @author Juergen Hoeller
- * @author Eric Crampton
- * @since 2.0
- * @see MockMultipartHttpServletRequest
- */
-public class MockMultipartFile implements MultipartFile {
-
-	private final String name;
-
-	private String originalFilename;
-
-	private String contentType;
-
-	private final byte[] content;
-
-
-	/**
-	 * Create a new MockMultipartFile with the given content.
-	 * @param name the name of the file
-	 * @param content the content of the file
-	 */
-	public MockMultipartFile(String name, byte[] content) {
-		this(name, "", null, content);
-	}
-
-	/**
-	 * Create a new MockMultipartFile with the given content.
-	 * @param name the name of the file
-	 * @param contentStream the content of the file as stream
-	 * @throws IOException if reading from the stream failed
-	 */
-	public MockMultipartFile(String name, InputStream contentStream) throws IOException {
-		this(name, "", null, FileCopyUtils.copyToByteArray(contentStream));
-	}
-
-	/**
-	 * Create a new MockMultipartFile with the given content.
-	 * @param name the name of the file
-	 * @param originalFilename the original filename (as on the client's machine)
-	 * @param contentType the content type (if known)
-	 * @param content the content of the file
-	 */
-	public MockMultipartFile(String name, String originalFilename, String contentType, byte[] content) {
-		Assert.hasLength(name, "Name must not be null");
-		this.name = name;
-		this.originalFilename = (originalFilename != null ? originalFilename : "");
-		this.contentType = contentType;
-		this.content = (content != null ? content : new byte[0]);
-	}
-
-	/**
-	 * Create a new MockMultipartFile with the given content.
-	 * @param name the name of the file
-	 * @param originalFilename the original filename (as on the client's machine)
-	 * @param contentType the content type (if known)
-	 * @param contentStream the content of the file as stream
-	 * @throws IOException if reading from the stream failed
-	 */
-	public MockMultipartFile(String name, String originalFilename, String contentType, InputStream contentStream)
-			throws IOException {
-
-		this(name, originalFilename, contentType, FileCopyUtils.copyToByteArray(contentStream));
-	}
-
-
-	@Override
-	public String getName() {
-		return this.name;
-	}
-
-	@Override
-	public String getOriginalFilename() {
-		return this.originalFilename;
-	}
-
-	@Override
-	public String getContentType() {
-		return this.contentType;
-	}
-
-	@Override
-	public boolean isEmpty() {
-		return (this.content.length == 0);
-	}
-
-	@Override
-	public long getSize() {
-		return this.content.length;
-	}
-
-	@Override
-	public byte[] getBytes() throws IOException {
-		return this.content;
-	}
-
-	@Override
-	public InputStream getInputStream() throws IOException {
-		return new ByteArrayInputStream(this.content);
-	}
-
-	@Override
-	public void transferTo(File dest) throws IOException, IllegalStateException {
-		FileCopyUtils.copy(this.content, dest);
-	}
-
-}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
deleted file mode 100644
index e43172c1982..00000000000
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockRequestDispatcher.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.mock.web;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.util.Assert;
-
-/**
- * Mock implementation of the {@link javax.servlet.RequestDispatcher} interface.
- *
- * 
Used for testing the web framework; typically not necessary for
- * testing application controllers.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @author Sam Brannen
- * @since 1.0.2
- */
-public class MockRequestDispatcher implements RequestDispatcher {
-
-	private final Log logger = LogFactory.getLog(getClass());
-
-	private final String resource;
-
-
-	/**
-	 * Create a new MockRequestDispatcher for the given resource.
-	 * @param resource the server resource to dispatch to, located at a
-	 * particular path or given by a particular name
-	 */
-	public MockRequestDispatcher(String resource) {
-		Assert.notNull(resource, "resource must not be null");
-		this.resource = resource;
-	}
-
-
-	@Override
-	public void forward(ServletRequest request, ServletResponse response) {
-		Assert.notNull(request, "Request must not be null");
-		Assert.notNull(response, "Response must not be null");
-		if (response.isCommitted()) {
-			throw new IllegalStateException("Cannot perform forward - response is already committed");
-		}
-		getMockHttpServletResponse(response).setForwardedUrl(this.resource);
-		if (logger.isDebugEnabled()) {
-			logger.debug("MockRequestDispatcher: forwarding to [" + this.resource + "]");
-		}
-	}
-
-	@Override
-	public void include(ServletRequest request, ServletResponse response) {
-		Assert.notNull(request, "Request must not be null");
-		Assert.notNull(response, "Response must not be null");
-		getMockHttpServletResponse(response).addIncludedUrl(this.resource);
-		if (logger.isDebugEnabled()) {
-			logger.debug("MockRequestDispatcher: including [" + this.resource + "]");
-		}
-	}
-
-	/**
-	 * Obtain the underlying {@link MockHttpServletResponse}, unwrapping
-	 * {@link HttpServletResponseWrapper} decorators if necessary.
-	 */
-	protected MockHttpServletResponse getMockHttpServletResponse(ServletResponse response) {
-		if (response instanceof MockHttpServletResponse) {
-			return (MockHttpServletResponse) response;
-		}
-		if (response instanceof HttpServletResponseWrapper) {
-			return getMockHttpServletResponse(((HttpServletResponseWrapper) response).getResponse());
-		}
-		throw new IllegalArgumentException("MockRequestDispatcher requires MockHttpServletResponse");
-	}
-
-}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockServletContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockServletContext.java
deleted file mode 100644
index cf3e6e26c16..00000000000
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/MockServletContext.java
+++ /dev/null
@@ -1,516 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.mock.web;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-import javax.activation.FileTypeMap;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.core.io.DefaultResourceLoader;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.util.WebUtils;
-
-/**
- * Mock implementation of the {@link javax.servlet.ServletContext} interface.
- *
- * 
Compatible with Servlet 2.5 and partially with Servlet 3.0. Can be configured to
- * expose a specific version through {@link #setMajorVersion}/{@link #setMinorVersion};
- * default is 2.5. Note that Servlet 3.0 support is limited: servlet, filter and listener
- * registration methods are not supported; neither is cookie or JSP configuration.
- * We generally do not recommend to unit-test your ServletContainerInitializers and
- * WebApplicationInitializers which is where those registration methods would be used.
- *
- * 
Used for testing the Spring web framework; only rarely necessary for testing
- * application controllers. As long as application components don't explicitly
- * access the {@code ServletContext}, {@code ClassPathXmlApplicationContext} or
- * {@code FileSystemXmlApplicationContext} can be used to load the context files
- * for testing, even for {@code DispatcherServlet} context definitions.
- *
- * 
For setting up a full {@code WebApplicationContext} in a test environment,
- * you can use {@code AnnotationConfigWebApplicationContext},
- * {@code XmlWebApplicationContext}, or {@code GenericWebApplicationContext},
- * passing in an appropriate {@code MockServletContext} instance. You might want
- * to configure your {@code MockServletContext} with a {@code FileSystemResourceLoader}
- * in that case to ensure that resource paths are interpreted as relative filesystem
- * locations.
- *
- * 
A common setup is to point your JVM working directory to the root of your
- * web application directory, in combination with filesystem-based resource loading.
- * This allows to load the context files as used in the web application, with
- * relative paths getting interpreted correctly. Such a setup will work with both
- * {@code FileSystemXmlApplicationContext} (which will load straight from the
- * filesystem) and {@code XmlWebApplicationContext} with an underlying
- * {@code MockServletContext} (as long as the {@code MockServletContext} has been
- * configured with a {@code FileSystemResourceLoader}).
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @author Sam Brannen
- * @since 1.0.2
- * @see #MockServletContext(org.springframework.core.io.ResourceLoader)
- * @see org.springframework.web.context.support.AnnotationConfigWebApplicationContext
- * @see org.springframework.web.context.support.XmlWebApplicationContext
- * @see org.springframework.web.context.support.GenericWebApplicationContext
- * @see org.springframework.context.support.ClassPathXmlApplicationContext
- * @see org.springframework.context.support.FileSystemXmlApplicationContext
- */
-public class MockServletContext implements ServletContext {
-
-	/** Default Servlet name used by Tomcat, Jetty, JBoss, and GlassFish: {@value}. */
-	private static final String COMMON_DEFAULT_SERVLET_NAME = "default";
-
-	private static final String TEMP_DIR_SYSTEM_PROPERTY = "java.io.tmpdir";
-
-	private final Log logger = LogFactory.getLog(getClass());
-
-	private final Map contexts = new HashMap();
-
-	private final Map initParameters = new LinkedHashMap();
-
-	private final Map attributes = new LinkedHashMap();
-
-	private final Set declaredRoles = new HashSet();
-
-	private final Map namedRequestDispatchers = new HashMap();
-
-	private final ResourceLoader resourceLoader;
-
-	private final String resourceBasePath;
-
-	private String contextPath = "";
-
-	private int majorVersion = 2;
-
-	private int minorVersion = 5;
-
-	private int effectiveMajorVersion = 2;
-
-	private int effectiveMinorVersion = 5;
-
-	private String servletContextName = "MockServletContext";
-
-	private String defaultServletName = COMMON_DEFAULT_SERVLET_NAME;
-
-
-	/**
-	 * Create a new MockServletContext, using no base path and a
-	 * DefaultResourceLoader (i.e. the classpath root as WAR root).
-	 * @see org.springframework.core.io.DefaultResourceLoader
-	 */
-	public MockServletContext() {
-		this("", null);
-	}
-
-	/**
-	 * Create a new MockServletContext, using a DefaultResourceLoader.
-	 * @param resourceBasePath the root directory of the WAR (should not end with a slash)
-	 * @see org.springframework.core.io.DefaultResourceLoader
-	 */
-	public MockServletContext(String resourceBasePath) {
-		this(resourceBasePath, null);
-	}
-
-	/**
-	 * Create a new MockServletContext, using the specified ResourceLoader
-	 * and no base path.
-	 * @param resourceLoader the ResourceLoader to use (or null for the default)
-	 */
-	public MockServletContext(ResourceLoader resourceLoader) {
-		this("", resourceLoader);
-	}
-
-	/**
-	 * Create a new MockServletContext using the supplied resource base path and
-	 * resource loader.
-	 * 
Registers a {@link MockRequestDispatcher} for the Servlet named
-	 * {@value #COMMON_DEFAULT_SERVLET_NAME}.
-	 * @param resourceBasePath the root directory of the WAR (should not end with a slash)
-	 * @param resourceLoader the ResourceLoader to use (or null for the default)
-	 * @see #registerNamedDispatcher
-	 */
-	public MockServletContext(String resourceBasePath, ResourceLoader resourceLoader) {
-		this.resourceLoader = (resourceLoader != null ? resourceLoader : new DefaultResourceLoader());
-		this.resourceBasePath = (resourceBasePath != null ? resourceBasePath : "");
-
-		// Use JVM temp dir as ServletContext temp dir.
-		String tempDir = System.getProperty(TEMP_DIR_SYSTEM_PROPERTY);
-		if (tempDir != null) {
-			this.attributes.put(WebUtils.TEMP_DIR_CONTEXT_ATTRIBUTE, new File(tempDir));
-		}
-
-		registerNamedDispatcher(this.defaultServletName, new MockRequestDispatcher(this.defaultServletName));
-	}
-
-	/**
-	 * Build a full resource location for the given path,
-	 * prepending the resource base path of this MockServletContext.
-	 * @param path the path as specified
-	 * @return the full resource path
-	 */
-	protected String getResourceLocation(String path) {
-		if (!path.startsWith("/")) {
-			path = "/" + path;
-		}
-		return this.resourceBasePath + path;
-	}
-
-	public void setContextPath(String contextPath) {
-		this.contextPath = (contextPath != null ? contextPath : "");
-	}
-
-	/* This is a Servlet API 2.5 method. */
-	@Override
-	public String getContextPath() {
-		return this.contextPath;
-	}
-
-	public void registerContext(String contextPath, ServletContext context) {
-		this.contexts.put(contextPath, context);
-	}
-
-	@Override
-	public ServletContext getContext(String contextPath) {
-		if (this.contextPath.equals(contextPath)) {
-			return this;
-		}
-		return this.contexts.get(contextPath);
-	}
-
-	public void setMajorVersion(int majorVersion) {
-		this.majorVersion = majorVersion;
-	}
-
-	@Override
-	public int getMajorVersion() {
-		return this.majorVersion;
-	}
-
-	public void setMinorVersion(int minorVersion) {
-		this.minorVersion = minorVersion;
-	}
-
-	@Override
-	public int getMinorVersion() {
-		return this.minorVersion;
-	}
-
-	public void setEffectiveMajorVersion(int effectiveMajorVersion) {
-		this.effectiveMajorVersion = effectiveMajorVersion;
-	}
-
-	public int getEffectiveMajorVersion() {
-		return this.effectiveMajorVersion;
-	}
-
-	public void setEffectiveMinorVersion(int effectiveMinorVersion) {
-		this.effectiveMinorVersion = effectiveMinorVersion;
-	}
-
-	public int getEffectiveMinorVersion() {
-		return this.effectiveMinorVersion;
-	}
-
-	@Override
-	public String getMimeType(String filePath) {
-		return MimeTypeResolver.getMimeType(filePath);
-	}
-
-	@Override
-	public Set getResourcePaths(String path) {
-		String actualPath = (path.endsWith("/") ? path : path + "/");
-		Resource resource = this.resourceLoader.getResource(getResourceLocation(actualPath));
-		try {
-			File file = resource.getFile();
-			String[] fileList = file.list();
-			if (ObjectUtils.isEmpty(fileList)) {
-				return null;
-			}
-			Set resourcePaths = new LinkedHashSet(fileList.length);
-			for (String fileEntry : fileList) {
-				String resultPath = actualPath + fileEntry;
-				if (resource.createRelative(fileEntry).getFile().isDirectory()) {
-					resultPath += "/";
-				}
-				resourcePaths.add(resultPath);
-			}
-			return resourcePaths;
-		}
-		catch (IOException ex) {
-			logger.warn("Couldn't get resource paths for " + resource, ex);
-			return null;
-		}
-	}
-
-	@Override
-	public URL getResource(String path) throws MalformedURLException {
-		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
-		if (!resource.exists()) {
-			return null;
-		}
-		try {
-			return resource.getURL();
-		}
-		catch (MalformedURLException ex) {
-			throw ex;
-		}
-		catch (IOException ex) {
-			logger.warn("Couldn't get URL for " + resource, ex);
-			return null;
-		}
-	}
-
-	@Override
-	public InputStream getResourceAsStream(String path) {
-		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
-		if (!resource.exists()) {
-			return null;
-		}
-		try {
-			return resource.getInputStream();
-		}
-		catch (IOException ex) {
-			logger.warn("Couldn't open InputStream for " + resource, ex);
-			return null;
-		}
-	}
-
-	@Override
-	public RequestDispatcher getRequestDispatcher(String path) {
-		if (!path.startsWith("/")) {
-			throw new IllegalArgumentException("RequestDispatcher path at ServletContext level must start with '/'");
-		}
-		return new MockRequestDispatcher(path);
-	}
-
-	@Override
-	public RequestDispatcher getNamedDispatcher(String path) {
-		return this.namedRequestDispatchers.get(path);
-	}
-
-	/**
-	 * Register a {@link RequestDispatcher} (typically a {@link MockRequestDispatcher})
-	 * that acts as a wrapper for the named Servlet.
-	 *
-	 * @param name the name of the wrapped Servlet
-	 * @param requestDispatcher the dispatcher that wraps the named Servlet
-	 * @see #getNamedDispatcher
-	 * @see #unregisterNamedDispatcher
-	 */
-	public void registerNamedDispatcher(String name, RequestDispatcher requestDispatcher) {
-		Assert.notNull(name, "RequestDispatcher name must not be null");
-		Assert.notNull(requestDispatcher, "RequestDispatcher must not be null");
-		this.namedRequestDispatchers.put(name, requestDispatcher);
-	}
-
-	/**
-	 * Unregister the {@link RequestDispatcher} with the given name.
-	 *
-	 * @param name the name of the dispatcher to unregister
-	 * @see #getNamedDispatcher
-	 * @see #registerNamedDispatcher
-	 */
-	public void unregisterNamedDispatcher(String name) {
-		Assert.notNull(name, "RequestDispatcher name must not be null");
-		this.namedRequestDispatchers.remove(name);
-	}
-
-	/**
-	 * Get the name of the default {@code Servlet}.
-	 * 
Defaults to {@value #COMMON_DEFAULT_SERVLET_NAME}.
-	 * @see #setDefaultServletName
-	 */
-	public String getDefaultServletName() {
-		return this.defaultServletName;
-	}
-
-	/**
-	 * Set the name of the default {@code Servlet}.
-	 * 
Also {@link #unregisterNamedDispatcher unregisters} the current default
-	 * {@link RequestDispatcher} and {@link #registerNamedDispatcher replaces}
-	 * it with a {@link MockRequestDispatcher} for the provided
-	 * {@code defaultServletName}.
-	 * @param defaultServletName the name of the default {@code Servlet};
-	 * never {@code null} or empty
-	 * @see #getDefaultServletName
-	 */
-	public void setDefaultServletName(String defaultServletName) {
-		Assert.hasText(defaultServletName, "defaultServletName must not be null or empty");
-		unregisterNamedDispatcher(this.defaultServletName);
-		this.defaultServletName = defaultServletName;
-		registerNamedDispatcher(this.defaultServletName, new MockRequestDispatcher(this.defaultServletName));
-	}
-
-	@Override
-	public Servlet getServlet(String name) {
-		return null;
-	}
-
-	@Override
-	public Enumeration getServlets() {
-		return Collections.enumeration(new HashSet());
-	}
-
-	@Override
-	public Enumeration getServletNames() {
-		return Collections.enumeration(new HashSet());
-	}
-
-	@Override
-	public void log(String message) {
-		logger.info(message);
-	}
-
-	@Override
-	public void log(Exception ex, String message) {
-		logger.info(message, ex);
-	}
-
-	@Override
-	public void log(String message, Throwable ex) {
-		logger.info(message, ex);
-	}
-
-	@Override
-	public String getRealPath(String path) {
-		Resource resource = this.resourceLoader.getResource(getResourceLocation(path));
-		try {
-			return resource.getFile().getAbsolutePath();
-		}
-		catch (IOException ex) {
-			logger.warn("Couldn't determine real path of resource " + resource, ex);
-			return null;
-		}
-	}
-
-	@Override
-	public String getServerInfo() {
-		return "MockServletContext";
-	}
-
-	@Override
-	public String getInitParameter(String name) {
-		Assert.notNull(name, "Parameter name must not be null");
-		return this.initParameters.get(name);
-	}
-
-	@Override
-	public Enumeration getInitParameterNames() {
-		return Collections.enumeration(this.initParameters.keySet());
-	}
-
-	public boolean setInitParameter(String name, String value) {
-		Assert.notNull(name, "Parameter name must not be null");
-		if (this.initParameters.containsKey(name)) {
-			return false;
-		}
-		this.initParameters.put(name, value);
-		return true;
-	}
-
-	public void addInitParameter(String name, String value) {
-		Assert.notNull(name, "Parameter name must not be null");
-		this.initParameters.put(name, value);
-	}
-
-	@Override
-	public Object getAttribute(String name) {
-		Assert.notNull(name, "Attribute name must not be null");
-		return this.attributes.get(name);
-	}
-
-	@Override
-	public Enumeration getAttributeNames() {
-		return new Vector(this.attributes.keySet()).elements();
-	}
-
-	@Override
-	public void setAttribute(String name, Object value) {
-		Assert.notNull(name, "Attribute name must not be null");
-		if (value != null) {
-			this.attributes.put(name, value);
-		}
-		else {
-			this.attributes.remove(name);
-		}
-	}
-
-	@Override
-	public void removeAttribute(String name) {
-		Assert.notNull(name, "Attribute name must not be null");
-		this.attributes.remove(name);
-	}
-
-	public void setServletContextName(String servletContextName) {
-		this.servletContextName = servletContextName;
-	}
-
-	@Override
-	public String getServletContextName() {
-		return this.servletContextName;
-	}
-
-	public ClassLoader getClassLoader() {
-		return ClassUtils.getDefaultClassLoader();
-	}
-
-	public void declareRoles(String... roleNames) {
-		Assert.notNull(roleNames, "Role names array must not be null");
-		for (String roleName : roleNames) {
-			Assert.hasLength(roleName, "Role name must not be empty");
-			this.declaredRoles.add(roleName);
-		}
-	}
-
-	public Set getDeclaredRoles() {
-		return Collections.unmodifiableSet(this.declaredRoles);
-	}
-
-
-	/**
-	 * Inner factory class used to introduce a Java Activation Framework
-	 * dependency when actually asked to resolve a MIME type.
-	 */
-	private static class MimeTypeResolver {
-
-		public static String getMimeType(String filePath) {
-			return FileTypeMap.getDefaultFileTypeMap().getContentType(filePath);
-		}
-	}
-
-}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java
index 963ae040f27..da8aa73cac6 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/mock/web/portlet/MockPortletSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,12 +21,13 @@ import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+
 import javax.portlet.PortletContext;
 import javax.portlet.PortletSession;
 import javax.servlet.http.HttpSessionBindingEvent;
 import javax.servlet.http.HttpSessionBindingListener;
 
-import org.springframework.mock.web.MockHttpSession;
+import org.springframework.mock.web.test.MockHttpSession;
 
 /**
  * Mock implementation of the {@link javax.portlet.PortletSession} interface.
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java
index 6cb7e3ae5f3..b1b1459ee75 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/ComplexPortletApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
 import javax.portlet.EventRequest;
@@ -47,9 +48,9 @@ import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.core.Ordered;
-import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.mock.web.portlet.MockPortletConfig;
 import org.springframework.mock.web.portlet.MockPortletContext;
+import org.springframework.mock.web.test.MockMultipartFile;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.multipart.MaxUploadSizeExceededException;
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/DispatcherPortletTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/DispatcherPortletTests.java
index 46ea7b2ba04..fdb7d9df461 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/DispatcherPortletTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/DispatcherPortletTests.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2002-2012 the original author or authors.
+* Copyright 2002-2013 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ import javax.portlet.PortletSession;
 
 import junit.framework.TestCase;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.i18n.LocaleContext;
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java
index 7bd390f9d29..3f53c7edfad 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/SimplePortletApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ import javax.portlet.RenderResponse;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.PropertyValue;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.ManagedMap;
 import org.springframework.validation.BindException;
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java
index 3f46ddd3a83..3bf24624893 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestDataBinderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@ import java.util.Set;
 
 import junit.framework.TestCase;
 
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.beans.propertyeditors.StringArrayPropertyEditor;
 import org.springframework.mock.web.portlet.MockPortletRequest;
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java
index 8aeeb819b5d..bec09daa5e2 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/AbstractXmlWebApplicationContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.springframework.web.portlet.context;
 
 import javax.servlet.ServletException;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.AbstractApplicationContextTests;
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletApplicationContextScopeTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletApplicationContextScopeTests.java
index 452ddb3c520..288b901f372 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletApplicationContextScopeTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/PortletApplicationContextScopeTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,18 +16,20 @@
 
 package org.springframework.web.portlet.context;
 
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
 import javax.portlet.PortletContext;
 import javax.portlet.PortletSession;
 import javax.servlet.ServletContextEvent;
 
-import static org.junit.Assert.*;
 import org.junit.Test;
-
-import org.springframework.beans.DerivedTestBean;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
-import org.springframework.mock.web.MockServletContext;
 import org.springframework.mock.web.portlet.MockRenderRequest;
 import org.springframework.mock.web.portlet.ServletWrappingPortletContext;
+import org.springframework.mock.web.test.MockServletContext;
+import org.springframework.tests.sample.beans.DerivedTestBean;
 import org.springframework.web.context.ContextCleanupListener;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -125,4 +127,4 @@ public class PortletApplicationContextScopeTests {
 		assertTrue(bean.wasDestroyed());
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/applicationContext.xml b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/applicationContext.xml
index 04bc32bb88d..9a4a2163138 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/applicationContext.xml
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/applicationContext.xml
@@ -9,7 +9,7 @@
 
 	
 
-	
+	
 
 	
 
 	
-	
+	
 		
 			dummy
 		
@@ -45,7 +45,7 @@
 			Tests of lifecycle callbacks
 		-->
 	
+		class="org.springframework.tests.sample.beans.MustBeInitialized">
 	
 
 	
 
-	
+	
 		yetanotherdummy
 	
 
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml
index 4002703b211..85885f238d0 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/WEB-INF/test-servlet.xml
@@ -15,7 +15,7 @@
 
 	
 
-	
+	
 		Rod
 		31
 		
@@ -28,32 +28,32 @@
 		31
 	
 
-	
+	
 
-	
+	
 		Kerry
 		34
 		
 	
 
-	
+	
 		typeMismatch
 		34x
 		
 	
 
-	
+	
 	
 
-	
+	
 		false
 	
 	
-	
+	
 		listenerVeto
 		66
 	
 
-	
+	
 
 
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java
index 9ec0c1be3bb..2df278bba00 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/context/XmlPortletApplicationContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import javax.portlet.PortletConfig;
 import javax.portlet.PortletContext;
 
 import org.springframework.beans.BeansException;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java
index bad17962411..2ea777d8c40 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/CommandControllerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,8 +32,8 @@ import javax.portlet.WindowState;
 
 import junit.framework.TestCase;
 
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.mock.web.portlet.MockActionRequest;
 import org.springframework.mock.web.portlet.MockActionResponse;
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java
index 4705be2f542..600dc7e8fa6 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/Portlet20AnnotationControllerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,9 +41,9 @@ import javax.servlet.http.Cookie;
 import org.junit.Test;
 
 import org.springframework.beans.BeansException;
-import org.springframework.beans.DerivedTestBean;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.DerivedTestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java
index 072476b61da..7a58b4a1c45 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/mvc/annotation/PortletAnnotationControllerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,9 +38,9 @@ import javax.servlet.http.HttpServletResponse;
 import junit.framework.TestCase;
 
 import org.springframework.beans.BeansException;
-import org.springframework.beans.DerivedTestBean;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.DerivedTestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
diff --git a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java
index c291a8e74b1..8fd99d5357f 100644
--- a/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java
+++ b/spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/util/PortletUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,8 +27,8 @@ import javax.portlet.PortletSession;
 
 import org.junit.Test;
 
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.mock.web.portlet.MockActionRequest;
 import org.springframework.mock.web.portlet.MockActionResponse;
 import org.springframework.mock.web.portlet.MockPortletContext;
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/BeanWithObjectProperty.java b/spring-webmvc/src/test/java/org/springframework/beans/BeanWithObjectProperty.java
deleted file mode 100644
index bb5e71f5cd0..00000000000
--- a/spring-webmvc/src/test/java/org/springframework/beans/BeanWithObjectProperty.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2002-2005 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-/**
- * @author Juergen Hoeller
- * @since 17.08.2004
- */
-public class BeanWithObjectProperty {
-
-	private Object object;
-
-	public Object getObject() {
-		return object;
-	}
-
-	public void setObject(Object object) {
-		this.object = object;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/Colour.java b/spring-webmvc/src/test/java/org/springframework/beans/Colour.java
deleted file mode 100644
index a992a2ebfc6..00000000000
--- a/spring-webmvc/src/test/java/org/springframework/beans/Colour.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import org.springframework.core.enums.ShortCodedLabeledEnum;
-
-/**
- * @author Rob Harrop
- */
-@SuppressWarnings("serial")
-public class Colour extends ShortCodedLabeledEnum {
-
-	public static final Colour RED = new Colour(0, "RED");
-	public static final Colour BLUE = new Colour(1, "BLUE");
-	public static final Colour GREEN = new Colour(2, "GREEN");
-	public static final Colour PURPLE = new Colour(3, "PURPLE");
-
-	private Colour(int code, String label) {
-		super(code, label);
-	}
-
-}
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java
deleted file mode 100644
index c5360de5316..00000000000
--- a/spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.Serializable;
-
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.beans.factory.DisposableBean;
-
-/**
- * @author Juergen Hoeller
- * @since 21.08.2003
- */
-@SuppressWarnings("serial")
-public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean {
-
-	private String beanName;
-
-	private boolean initialized;
-
-	private boolean destroyed;
-
-
-	public DerivedTestBean() {
-	}
-
-	public DerivedTestBean(String[] names) {
-		if (names == null || names.length < 2) {
-			throw new IllegalArgumentException("Invalid names array");
-		}
-		setName(names[0]);
-		setBeanName(names[1]);
-	}
-
-	public static DerivedTestBean create(String[] names) {
-		return new DerivedTestBean(names);
-	}
-
-
-	@Override
-	public void setBeanName(String beanName) {
-		if (this.beanName == null || beanName == null) {
-			this.beanName = beanName;
-		}
-	}
-
-	@Override
-	public String getBeanName() {
-		return beanName;
-	}
-
-	public void setSpouseRef(String name) {
-		setSpouse(new TestBean(name));
-	}
-
-
-	public void initialize() {
-		this.initialized = true;
-	}
-
-	public boolean wasInitialized() {
-		return initialized;
-	}
-
-
-	@Override
-	public void destroy() {
-		this.destroyed = true;
-	}
-
-	@Override
-	public boolean wasDestroyed() {
-		return destroyed;
-	}
-
-}
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/GenericBean.java b/spring-webmvc/src/test/java/org/springframework/beans/GenericBean.java
deleted file mode 100644
index 00dd127e47c..00000000000
--- a/spring-webmvc/src/test/java/org/springframework/beans/GenericBean.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright 2002-2010 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.springframework.core.io.Resource;
-
-/**
- * @author Juergen Hoeller
- */
-public class GenericBean {
-
-	private Set integerSet;
-
-	private Set testBeanSet;
-
-	private List resourceList;
-
-	private List> listOfLists;
-
-	private ArrayList listOfArrays;
-
-	private List> listOfMaps;
-
-	private Map plainMap;
-
-	private Map shortMap;
-
-	private HashMap longMap;
-
-	private Map> collectionMap;
-
-	private Map> mapOfMaps;
-
-	private Map> mapOfLists;
-
-	private CustomEnum customEnum;
-
-	private T genericProperty;
-
-	private List genericListProperty;
-
-
-	public GenericBean() {
-	}
-
-	public GenericBean(Set integerSet) {
-		this.integerSet = integerSet;
-	}
-
-	public GenericBean(Set integerSet, List resourceList) {
-		this.integerSet = integerSet;
-		this.resourceList = resourceList;
-	}
-
-	public GenericBean(HashSet integerSet, Map shortMap) {
-		this.integerSet = integerSet;
-		this.shortMap = shortMap;
-	}
-
-	public GenericBean(Map shortMap, Resource resource) {
-		this.shortMap = shortMap;
-		this.resourceList = Collections.singletonList(resource);
-	}
-
-	public GenericBean(Map plainMap, Map shortMap) {
-		this.plainMap = plainMap;
-		this.shortMap = shortMap;
-	}
-
-	public GenericBean(HashMap longMap) {
-		this.longMap = longMap;
-	}
-
-	public GenericBean(boolean someFlag, Map> collectionMap) {
-		this.collectionMap = collectionMap;
-	}
-
-
-	public Set getIntegerSet() {
-		return integerSet;
-	}
-
-	public void setIntegerSet(Set integerSet) {
-		this.integerSet = integerSet;
-	}
-
-	public Set getTestBeanSet() {
-		return testBeanSet;
-	}
-
-	public void setTestBeanSet(Set testBeanSet) {
-		this.testBeanSet = testBeanSet;
-	}
-
-	public List getResourceList() {
-		return resourceList;
-	}
-
-	public void setResourceList(List resourceList) {
-		this.resourceList = resourceList;
-	}
-
-	public List> getListOfLists() {
-		return listOfLists;
-	}
-
-	public ArrayList getListOfArrays() {
-		return listOfArrays;
-	}
-
-	public void setListOfArrays(ArrayList listOfArrays) {
-		this.listOfArrays = listOfArrays;
-	}
-
-	public void setListOfLists(List> listOfLists) {
-		this.listOfLists = listOfLists;
-	}
-
-	public List> getListOfMaps() {
-		return listOfMaps;
-	}
-
-	public void setListOfMaps(List> listOfMaps) {
-		this.listOfMaps = listOfMaps;
-	}
-
-	public Map getPlainMap() {
-		return plainMap;
-	}
-
-	public Map getShortMap() {
-		return shortMap;
-	}
-
-	public void setShortMap(Map shortMap) {
-		this.shortMap = shortMap;
-	}
-
-	public HashMap getLongMap() {
-		return longMap;
-	}
-
-	public void setLongMap(HashMap longMap) {
-		this.longMap = longMap;
-	}
-
-	public Map> getCollectionMap() {
-		return collectionMap;
-	}
-
-	public void setCollectionMap(Map> collectionMap) {
-		this.collectionMap = collectionMap;
-	}
-
-	public Map> getMapOfMaps() {
-		return mapOfMaps;
-	}
-
-	public void setMapOfMaps(Map> mapOfMaps) {
-		this.mapOfMaps = mapOfMaps;
-	}
-
-	public Map> getMapOfLists() {
-		return mapOfLists;
-	}
-
-	public void setMapOfLists(Map> mapOfLists) {
-		this.mapOfLists = mapOfLists;
-	}
-
-	public T getGenericProperty() {
-		return genericProperty;
-	}
-
-	public void setGenericProperty(T genericProperty) {
-		this.genericProperty = genericProperty;
-	}
-
-	public List getGenericListProperty() {
-		return genericListProperty;
-	}
-
-	public void setGenericListProperty(List genericListProperty) {
-		this.genericListProperty = genericListProperty;
-	}
-
-	public CustomEnum getCustomEnum() {
-		return customEnum;
-	}
-
-	public void setCustomEnum(CustomEnum customEnum) {
-		this.customEnum = customEnum;
-	}
-
-
-	public static GenericBean createInstance(Set integerSet) {
-		return new GenericBean(integerSet);
-	}
-
-	public static GenericBean createInstance(Set integerSet, List resourceList) {
-		return new GenericBean(integerSet, resourceList);
-	}
-
-	public static GenericBean createInstance(HashSet integerSet, Map shortMap) {
-		return new GenericBean(integerSet, shortMap);
-	}
-
-	public static GenericBean createInstance(Map shortMap, Resource resource) {
-		return new GenericBean(shortMap, resource);
-	}
-
-	public static GenericBean createInstance(Map map, Map shortMap) {
-		return new GenericBean(map, shortMap);
-	}
-
-	public static GenericBean createInstance(HashMap longMap) {
-		return new GenericBean(longMap);
-	}
-
-	public static GenericBean createInstance(boolean someFlag, Map> collectionMap) {
-		return new GenericBean(someFlag, collectionMap);
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/INestedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/INestedTestBean.java
deleted file mode 100644
index e0ae5f20a3f..00000000000
--- a/spring-webmvc/src/test/java/org/springframework/beans/INestedTestBean.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-public interface INestedTestBean {
-
-	public String getCompany();
-
-}
\ No newline at end of file
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/IOther.java b/spring-webmvc/src/test/java/org/springframework/beans/IOther.java
deleted file mode 100644
index d7fb346185a..00000000000
--- a/spring-webmvc/src/test/java/org/springframework/beans/IOther.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-public interface IOther {
-
-	void absquatulate();
-
-}
\ No newline at end of file
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/ITestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/ITestBean.java
deleted file mode 100644
index cdf5ef510dd..00000000000
--- a/spring-webmvc/src/test/java/org/springframework/beans/ITestBean.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2002-2007 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.IOException;
-
-/**
- * Interface used for {@link org.springframework.beans.TestBean}.
- *
- * 
Two methods are the same as on Person, but if this
- * extends person it breaks quite a few tests..
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public interface ITestBean {
-
-	int getAge();
-
-	void setAge(int age);
-
-	String getName();
-
-	void setName(String name);
-
-	ITestBean getSpouse();
-
-	void setSpouse(ITestBean spouse);
-
-	ITestBean[] getSpouses();
-
-	String[] getStringArray();
-
-	void setStringArray(String[] stringArray);
-
-	/**
-	 * Throws a given (non-null) exception.
-	 */
-	void exceptional(Throwable t) throws Throwable;
-
-	Object returnsThis();
-
-	INestedTestBean getDoctor();
-
-	INestedTestBean getLawyer();
-
-	IndexedTestBean getNestedIndexedBean();
-
-	/**
-	 * Increment the age by one.
-	 * @return the previous age
-	 */
-	int haveBirthday();
-
-	void unreliableFileOperation() throws IOException;
-
-}
\ No newline at end of file
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/IndexedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/IndexedTestBean.java
deleted file mode 100644
index ddb091770ee..00000000000
--- a/spring-webmvc/src/test/java/org/springframework/beans/IndexedTestBean.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2002-2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-/**
- * @author Juergen Hoeller
- * @since 11.11.2003
- */
-public class IndexedTestBean {
-
-	private TestBean[] array;
-
-	private Collection collection;
-
-	private List list;
-
-	private Set set;
-
-	private SortedSet sortedSet;
-
-	private Map map;
-
-	private SortedMap sortedMap;
-
-
-	public IndexedTestBean() {
-		this(true);
-	}
-
-	public IndexedTestBean(boolean populate) {
-		if (populate) {
-			populate();
-		}
-	}
-
-	public void populate() {
-		TestBean tb0 = new TestBean("name0", 0);
-		TestBean tb1 = new TestBean("name1", 0);
-		TestBean tb2 = new TestBean("name2", 0);
-		TestBean tb3 = new TestBean("name3", 0);
-		TestBean tb4 = new TestBean("name4", 0);
-		TestBean tb5 = new TestBean("name5", 0);
-		TestBean tb6 = new TestBean("name6", 0);
-		TestBean tb7 = new TestBean("name7", 0);
-		TestBean tbX = new TestBean("nameX", 0);
-		TestBean tbY = new TestBean("nameY", 0);
-		this.array = new TestBean[] {tb0, tb1};
-		this.list = new ArrayList();
-		this.list.add(tb2);
-		this.list.add(tb3);
-		this.set = new TreeSet();
-		this.set.add(tb6);
-		this.set.add(tb7);
-		this.map = new HashMap();
-		this.map.put("key1", tb4);
-		this.map.put("key2", tb5);
-		this.map.put("key.3", tb5);
-		List list = new ArrayList();
-		list.add(tbX);
-		list.add(tbY);
-		this.map.put("key4", list);
-	}
-
-
-	public TestBean[] getArray() {
-		return array;
-	}
-
-	public void setArray(TestBean[] array) {
-		this.array = array;
-	}
-
-	public Collection getCollection() {
-		return collection;
-	}
-
-	public void setCollection(Collection collection) {
-		this.collection = collection;
-	}
-
-	public List getList() {
-		return list;
-	}
-
-	public void setList(List list) {
-		this.list = list;
-	}
-
-	public Set getSet() {
-		return set;
-	}
-
-	public void setSet(Set set) {
-		this.set = set;
-	}
-
-	public SortedSet getSortedSet() {
-		return sortedSet;
-	}
-
-	public void setSortedSet(SortedSet sortedSet) {
-		this.sortedSet = sortedSet;
-	}
-
-	public Map getMap() {
-		return map;
-	}
-
-	public void setMap(Map map) {
-		this.map = map;
-	}
-
-	public SortedMap getSortedMap() {
-		return sortedMap;
-	}
-
-	public void setSortedMap(SortedMap sortedMap) {
-		this.sortedMap = sortedMap;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java
deleted file mode 100644
index 412891c439b..00000000000
--- a/spring-webmvc/src/test/java/org/springframework/beans/NestedTestBean.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-/**
- * Simple nested test bean used for testing bean factories, AOP framework etc.
- *
- * @author Trevor D. Cook
- * @since 30.09.2003
- */
-public class NestedTestBean implements INestedTestBean {
-
-	private String company = "";
-
-	public NestedTestBean() {
-	}
-
-	public NestedTestBean(String company) {
-		setCompany(company);
-	}
-
-	public void setCompany(String company) {
-		this.company = (company != null ? company : "");
-	}
-
-	@Override
-	public String getCompany() {
-		return company;
-	}
-
-	public boolean equals(Object obj) {
-		if (!(obj instanceof NestedTestBean)) {
-			return false;
-		}
-		NestedTestBean ntb = (NestedTestBean) obj;
-		return this.company.equals(ntb.company);
-	}
-
-	public int hashCode() {
-		return this.company.hashCode();
-	}
-
-	public String toString() {
-		return "NestedTestBean: " + this.company;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/Pet.java b/spring-webmvc/src/test/java/org/springframework/beans/Pet.java
deleted file mode 100644
index 35d9c736c13..00000000000
--- a/spring-webmvc/src/test/java/org/springframework/beans/Pet.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2002-2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-/**
- * @author Rob Harrop
- * @since 2.0
- */
-public class Pet {
-
-	private String name;
-
-	public Pet(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public String toString() {
-		return getName();
-	}
-
-	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
-
-		final Pet pet = (Pet) o;
-
-		if (name != null ? !name.equals(pet.name) : pet.name != null) return false;
-
-		return true;
-	}
-
-	public int hashCode() {
-		return (name != null ? name.hashCode() : 0);
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java b/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java
deleted file mode 100644
index 6d71de75764..00000000000
--- a/spring-webmvc/src/test/java/org/springframework/beans/TestBean.java
+++ /dev/null
@@ -1,457 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.util.ObjectUtils;
-
-/**
- * Simple test bean used for testing bean factories, the AOP framework etc.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @since 15 April 2001
- */
-public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOther, Comparable {
-
-	private String beanName;
-
-	private String country;
-
-	private BeanFactory beanFactory;
-
-	private boolean postProcessed;
-
-	private String name;
-
-	private String sex;
-
-	private int age;
-
-	private boolean jedi;
-
-	private ITestBean[] spouses;
-
-	private String touchy;
-
-	private String[] stringArray;
-
-	private Integer[] someIntegerArray;
-
-	private Date date = new Date();
-
-	private Float myFloat = new Float(0.0);
-
-	private Collection friends = new LinkedList();
-
-	private Set someSet = new HashSet();
-
-	private Map someMap = new HashMap();
-
-	private List someList = new ArrayList();
-
-	private Properties someProperties = new Properties();
-
-	private INestedTestBean doctor = new NestedTestBean();
-
-	private INestedTestBean lawyer = new NestedTestBean();
-
-	private IndexedTestBean nestedIndexedBean;
-
-	private boolean destroyed;
-
-	private Number someNumber;
-
-	private Colour favouriteColour;
-
-	private Boolean someBoolean;
-
-	private List otherColours;
-
-	private List pets;
-
-
-	public TestBean() {
-	}
-
-	public TestBean(String name) {
-		this.name = name;
-	}
-
-	public TestBean(ITestBean spouse) {
-		this.spouses = new ITestBean[] {spouse};
-	}
-
-	public TestBean(String name, int age) {
-		this.name = name;
-		this.age = age;
-	}
-
-	public TestBean(ITestBean spouse, Properties someProperties) {
-		this.spouses = new ITestBean[] {spouse};
-		this.someProperties = someProperties;
-	}
-
-	public TestBean(List someList) {
-		this.someList = someList;
-	}
-
-	public TestBean(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public TestBean(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public TestBean(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-
-	@Override
-	public void setBeanName(String beanName) {
-		this.beanName = beanName;
-	}
-
-	public String getBeanName() {
-		return beanName;
-	}
-
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) {
-		this.beanFactory = beanFactory;
-	}
-
-	public BeanFactory getBeanFactory() {
-		return beanFactory;
-	}
-
-	public void setPostProcessed(boolean postProcessed) {
-		this.postProcessed = postProcessed;
-	}
-
-	public boolean isPostProcessed() {
-		return postProcessed;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getSex() {
-		return sex;
-	}
-
-	public void setSex(String sex) {
-		this.sex = sex;
-		if (this.name == null) {
-			this.name = sex;
-		}
-	}
-
-	@Override
-	public int getAge() {
-		return age;
-	}
-
-	@Override
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-	public boolean isJedi() {
-		return jedi;
-	}
-
-	public void setJedi(boolean jedi) {
-		this.jedi = jedi;
-	}
-
-	@Override
-	public ITestBean getSpouse() {
-		return (spouses != null ? spouses[0] : null);
-	}
-
-	@Override
-	public void setSpouse(ITestBean spouse) {
-		this.spouses = new ITestBean[] {spouse};
-	}
-
-	@Override
-	public ITestBean[] getSpouses() {
-		return spouses;
-	}
-
-	public String getTouchy() {
-		return touchy;
-	}
-
-	public void setTouchy(String touchy) throws Exception {
-		if (touchy.indexOf('.') != -1) {
-			throw new Exception("Can't contain a .");
-		}
-		if (touchy.indexOf(',') != -1) {
-			throw new NumberFormatException("Number format exception: contains a ,");
-		}
-		this.touchy = touchy;
-	}
-
-	public String getCountry() {
-		return country;
-	}
-
-	public void setCountry(String country) {
-		this.country = country;
-	}
-
-	@Override
-	public String[] getStringArray() {
-		return stringArray;
-	}
-
-	@Override
-	public void setStringArray(String[] stringArray) {
-		this.stringArray = stringArray;
-	}
-
-	public Integer[] getSomeIntegerArray() {
-		return someIntegerArray;
-	}
-
-	public void setSomeIntegerArray(Integer[] someIntegerArray) {
-		this.someIntegerArray = someIntegerArray;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public Float getMyFloat() {
-		return myFloat;
-	}
-
-	public void setMyFloat(Float myFloat) {
-		this.myFloat = myFloat;
-	}
-
-	public Collection getFriends() {
-		return friends;
-	}
-
-	public void setFriends(Collection friends) {
-		this.friends = friends;
-	}
-
-	public Set getSomeSet() {
-		return someSet;
-	}
-
-	public void setSomeSet(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public Map getSomeMap() {
-		return someMap;
-	}
-
-	public void setSomeMap(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public List getSomeList() {
-		return someList;
-	}
-
-	public void setSomeList(List someList) {
-		this.someList = someList;
-	}
-
-	public Properties getSomeProperties() {
-		return someProperties;
-	}
-
-	public void setSomeProperties(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-	@Override
-	public INestedTestBean getDoctor() {
-		return doctor;
-	}
-
-	public void setDoctor(INestedTestBean doctor) {
-		this.doctor = doctor;
-	}
-
-	@Override
-	public INestedTestBean getLawyer() {
-		return lawyer;
-	}
-
-	public void setLawyer(INestedTestBean lawyer) {
-		this.lawyer = lawyer;
-	}
-
-	public Number getSomeNumber() {
-		return someNumber;
-	}
-
-	public void setSomeNumber(Number someNumber) {
-		this.someNumber = someNumber;
-	}
-
-	public Colour getFavouriteColour() {
-		return favouriteColour;
-	}
-
-	public void setFavouriteColour(Colour favouriteColour) {
-		this.favouriteColour = favouriteColour;
-	}
-
-	public Boolean getSomeBoolean() {
-		return someBoolean;
-	}
-
-	public void setSomeBoolean(Boolean someBoolean) {
-		this.someBoolean = someBoolean;
-	}
-
-	@Override
-	public IndexedTestBean getNestedIndexedBean() {
-		return nestedIndexedBean;
-	}
-
-	public void setNestedIndexedBean(IndexedTestBean nestedIndexedBean) {
-		this.nestedIndexedBean = nestedIndexedBean;
-	}
-
-	public List getOtherColours() {
-		return otherColours;
-	}
-
-	public void setOtherColours(List otherColours) {
-		this.otherColours = otherColours;
-	}
-
-	public List getPets() {
-		return pets;
-	}
-
-	public void setPets(List pets) {
-		this.pets = pets;
-	}
-
-
-	/**
-	 * @see org.springframework.beans.ITestBean#exceptional(Throwable)
-	 */
-	@Override
-	public void exceptional(Throwable t) throws Throwable {
-		if (t != null) {
-			throw t;
-		}
-	}
-
-	@Override
-	public void unreliableFileOperation() throws IOException {
-		throw new IOException();
-	}
-	/**
-	 * @see org.springframework.beans.ITestBean#returnsThis()
-	 */
-	@Override
-	public Object returnsThis() {
-		return this;
-	}
-
-	/**
-	 * @see org.springframework.beans.IOther#absquatulate()
-	 */
-	@Override
-	public void absquatulate() {
-	}
-
-	@Override
-	public int haveBirthday() {
-		return age++;
-	}
-
-
-	public void destroy() {
-		this.destroyed = true;
-	}
-
-	public boolean wasDestroyed() {
-		return destroyed;
-	}
-
-
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (other == null || !(other instanceof TestBean)) {
-			return false;
-		}
-		TestBean tb2 = (TestBean) other;
-		return (ObjectUtils.nullSafeEquals(this.name, tb2.name) && this.age == tb2.age);
-	}
-
-	public int hashCode() {
-		return this.age;
-	}
-
-	@Override
-	public int compareTo(Object other) {
-		if (this.name != null && other instanceof TestBean) {
-			return this.name.compareTo(((TestBean) other).getName());
-		}
-		else {
-			return 1;
-		}
-	}
-
-	public String toString() {
-		return this.name;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java
deleted file mode 100644
index 6fc7e36aa90..00000000000
--- a/spring-webmvc/src/test/java/org/springframework/beans/factory/DummyFactory.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans.factory;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.TestBean;
-import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
-
-/**
- * Simple factory to allow testing of FactoryBean support in AbstractBeanFactory.
- * Depending on whether its singleton property is set, it will return a singleton
- * or a prototype instance.
- *
- * 
Implements InitializingBean interface, so we can check that
- * factories get this lifecycle callback if they want.
- *
- * @author Rod Johnson
- * @since 10.03.2003
- */
-public class DummyFactory
-		implements FactoryBean, BeanNameAware, BeanFactoryAware, InitializingBean, DisposableBean {
-
-	public static final String SINGLETON_NAME = "Factory singleton";
-
-	private static boolean prototypeCreated;
-
-	/**
-	 * Clear static state.
-	 */
-	public static void reset() {
-		prototypeCreated = false;
-	}
-
-
-	/**
-	 * Default is for factories to return a singleton instance.
-	 */
-	private boolean singleton = true;
-
-	private String beanName;
-
-	private AutowireCapableBeanFactory beanFactory;
-
-	private boolean postProcessed;
-
-	private boolean initialized;
-
-	private TestBean testBean;
-
-	private TestBean otherTestBean;
-
-
-	public DummyFactory() {
-		this.testBean = new TestBean();
-		this.testBean.setName(SINGLETON_NAME);
-		this.testBean.setAge(25);
-	}
-
-	/**
-	 * Return if the bean managed by this factory is a singleton.
-	 * @see FactoryBean#isSingleton()
-	 */
-	@Override
-	public boolean isSingleton() {
-		return this.singleton;
-	}
-
-	/**
-	 * Set if the bean managed by this factory is a singleton.
-	 */
-	public void setSingleton(boolean singleton) {
-		this.singleton = singleton;
-	}
-
-	@Override
-	public void setBeanName(String beanName) {
-		this.beanName = beanName;
-	}
-
-	public String getBeanName() {
-		return beanName;
-	}
-
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) {
-		this.beanFactory = (AutowireCapableBeanFactory) beanFactory;
-		this.beanFactory.applyBeanPostProcessorsBeforeInitialization(this.testBean, this.beanName);
-	}
-
-	public BeanFactory getBeanFactory() {
-		return beanFactory;
-	}
-
-	public void setPostProcessed(boolean postProcessed) {
-		this.postProcessed = postProcessed;
-	}
-
-	public boolean isPostProcessed() {
-		return postProcessed;
-	}
-
-	public void setOtherTestBean(TestBean otherTestBean) {
-		this.otherTestBean = otherTestBean;
-		this.testBean.setSpouse(otherTestBean);
-	}
-
-	public TestBean getOtherTestBean() {
-		return otherTestBean;
-	}
-
-	@Override
-	public void afterPropertiesSet() {
-		if (initialized) {
-			throw new RuntimeException("Cannot call afterPropertiesSet twice on the one bean");
-		}
-		this.initialized = true;
-	}
-
-	/**
-	 * Was this initialized by invocation of the
-	 * afterPropertiesSet() method from the InitializingBean interface?
-	 */
-	public boolean wasInitialized() {
-		return initialized;
-	}
-
-	public static boolean wasPrototypeCreated() {
-		return prototypeCreated;
-	}
-
-
-	/**
-	 * Return the managed object, supporting both singleton
-	 * and prototype mode.
-	 * @see FactoryBean#getObject()
-	 */
-	@Override
-	public Object getObject() throws BeansException {
-		if (isSingleton()) {
-			return this.testBean;
-		}
-		else {
-			TestBean prototype = new TestBean("prototype created at " + System.currentTimeMillis(), 11);
-			if (this.beanFactory != null) {
-				this.beanFactory.applyBeanPostProcessorsBeforeInitialization(prototype, this.beanName);
-			}
-			prototypeCreated = true;
-			return prototype;
-		}
-	}
-
-	@Override
-	public Class getObjectType() {
-		return TestBean.class;
-	}
-
-
-	@Override
-	public void destroy() {
-		if (this.testBean != null) {
-			this.testBean.setName(null);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java
deleted file mode 100644
index 013a65a0e49..00000000000
--- a/spring-webmvc/src/test/java/org/springframework/beans/factory/LifecycleBean.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans.factory;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-
-/**
- * Simple test of BeanFactory initialization and lifecycle callbacks.
- *
- * @author Rod Johnson
- * @author Colin Sampaleanu
- * @since 12.03.2003
- */
-public class LifecycleBean implements BeanNameAware, BeanFactoryAware, InitializingBean, DisposableBean {
-
-	protected boolean initMethodDeclared = false;
-
-	protected String beanName;
-
-	protected BeanFactory owningFactory;
-
-	protected boolean postProcessedBeforeInit;
-
-	protected boolean inited;
-
-	protected boolean initedViaDeclaredInitMethod;
-
-	protected boolean postProcessedAfterInit;
-
-	protected boolean destroyed;
-
-
-	public void setInitMethodDeclared(boolean initMethodDeclared) {
-		this.initMethodDeclared = initMethodDeclared;
-	}
-
-	public boolean isInitMethodDeclared() {
-		return initMethodDeclared;
-	}
-
-	@Override
-	public void setBeanName(String name) {
-		this.beanName = name;
-	}
-
-	public String getBeanName() {
-		return beanName;
-	}
-
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) {
-		this.owningFactory = beanFactory;
-	}
-
-	public void postProcessBeforeInit() {
-		if (this.inited || this.initedViaDeclaredInitMethod) {
-			throw new RuntimeException("Factory called postProcessBeforeInit after afterPropertiesSet");
-		}
-		if (this.postProcessedBeforeInit) {
-			throw new RuntimeException("Factory called postProcessBeforeInit twice");
-		}
-		this.postProcessedBeforeInit = true;
-	}
-
-	@Override
-	public void afterPropertiesSet() {
-		if (this.owningFactory == null) {
-			throw new RuntimeException("Factory didn't call setBeanFactory before afterPropertiesSet on lifecycle bean");
-		}
-		if (!this.postProcessedBeforeInit) {
-			throw new RuntimeException("Factory didn't call postProcessBeforeInit before afterPropertiesSet on lifecycle bean");
-		}
-		if (this.initedViaDeclaredInitMethod) {
-			throw new RuntimeException("Factory initialized via declared init method before initializing via afterPropertiesSet");
-		}
-		if (this.inited) {
-			throw new RuntimeException("Factory called afterPropertiesSet twice");
-		}
-		this.inited = true;
-	}
-
-	public void declaredInitMethod() {
-		if (!this.inited) {
-			throw new RuntimeException("Factory didn't call afterPropertiesSet before declared init method");
-		}
-
-		if (this.initedViaDeclaredInitMethod) {
-			throw new RuntimeException("Factory called declared init method twice");
-		}
-		this.initedViaDeclaredInitMethod = true;
-	}
-
-	public void postProcessAfterInit() {
-		if (!this.inited) {
-			throw new RuntimeException("Factory called postProcessAfterInit before afterPropertiesSet");
-		}
-		if (this.initMethodDeclared && !this.initedViaDeclaredInitMethod) {
-			throw new RuntimeException("Factory called postProcessAfterInit before calling declared init method");
-		}
-		if (this.postProcessedAfterInit) {
-			throw new RuntimeException("Factory called postProcessAfterInit twice");
-		}
-		this.postProcessedAfterInit = true;
-	}
-
-	/**
-	 * Dummy business method that will fail unless the factory
-	 * managed the bean's lifecycle correctly
-	 */
-	public void businessMethod() {
-		if (!this.inited || (this.initMethodDeclared && !this.initedViaDeclaredInitMethod) ||
-				!this.postProcessedAfterInit) {
-			throw new RuntimeException("Factory didn't initialize lifecycle object correctly");
-		}
-	}
-
-	@Override
-	public void destroy() {
-		if (this.destroyed) {
-			throw new IllegalStateException("Already destroyed");
-		}
-		this.destroyed = true;
-	}
-
-	public boolean isDestroyed() {
-		return destroyed;
-	}
-
-
-	public static class PostProcessor implements BeanPostProcessor {
-
-		@Override
-		public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
-			if (bean instanceof LifecycleBean) {
-				((LifecycleBean) bean).postProcessBeforeInit();
-			}
-			return bean;
-		}
-
-		@Override
-		public Object postProcessAfterInitialization(Object bean, String name) throws BeansException {
-			if (bean instanceof LifecycleBean) {
-				((LifecycleBean) bean).postProcessAfterInit();
-			}
-			return bean;
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
deleted file mode 100644
index b9a7925ad82..00000000000
--- a/spring-webmvc/src/test/java/org/springframework/beans/factory/MustBeInitialized.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans.factory;
-
-import org.springframework.beans.factory.InitializingBean;
-
-/**
- * Simple test of BeanFactory initialization
- * @author Rod Johnson
- * @since 12.03.2003
- */
-public class MustBeInitialized implements InitializingBean {
-
-	private boolean inited;
-
-	/**
-	 * @see InitializingBean#afterPropertiesSet()
-	 */
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		this.inited = true;
-	}
-
-	/**
-	 * Dummy business method that will fail unless the factory
-	 * managed the bean's lifecycle correctly
-	 */
-	public void businessMethod() {
-		if (!this.inited)
-			throw new RuntimeException("Factory didn't call afterPropertiesSet() on MustBeInitialized object");
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java b/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java
index 14acac1ceb9..37d4c9715fb 100644
--- a/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java
+++ b/spring-webmvc/src/test/java/org/springframework/context/LifecycleContextBean.java
@@ -3,7 +3,7 @@ package org.springframework.context;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.LifecycleBean;
+import org.springframework.tests.sample.beans.LifecycleBean;
 
 /**
  * Simple bean to test ApplicationContext lifecycle methods for beans
diff --git a/spring-webmvc/src/test/java/org/springframework/ui/jasperreports/PersonBean.java b/spring-webmvc/src/test/java/org/springframework/ui/jasperreports/PersonBean.java
deleted file mode 100644
index 3d0bce4c841..00000000000
--- a/spring-webmvc/src/test/java/org/springframework/ui/jasperreports/PersonBean.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2002-2005 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ui.jasperreports;
-
-/**
- * @author Rob Harrop
- */
-public class PersonBean {
-
-	private int id;
-
-	private String name;
-
-	private String street;
-
-	private String city;
-
-	public String getCity() {
-		return city;
-	}
-
-	public void setCity(String city) {
-		this.city = city;
-	}
-
-	public int getId() {
-		return id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getStreet() {
-		return street;
-	}
-
-	public void setStreet(String street) {
-		this.street = street;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webmvc/src/test/java/org/springframework/ui/jasperreports/ProductBean.java b/spring-webmvc/src/test/java/org/springframework/ui/jasperreports/ProductBean.java
deleted file mode 100644
index 070fa2dc426..00000000000
--- a/spring-webmvc/src/test/java/org/springframework/ui/jasperreports/ProductBean.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2002-2005 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.ui.jasperreports;
-
-/**
- * @author Rob Harrop
- */
-public class ProductBean {
-
-	private int id;
-
-	private String name;
-
-	private float quantity;
-
-	private float price;
-
-	public int getId() {
-		return id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public float getQuantity() {
-		return quantity;
-	}
-
-	public void setQuantity(float quantity) {
-		this.quantity = quantity;
-	}
-
-	public float getPrice() {
-		return price;
-	}
-
-	public void setPrice(float price) {
-		this.price = price;
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webmvc/src/test/java/org/springframework/util/SerializationTestUtils.java b/spring-webmvc/src/test/java/org/springframework/util/SerializationTestUtils.java
deleted file mode 100644
index 9ae4f54ec24..00000000000
--- a/spring-webmvc/src/test/java/org/springframework/util/SerializationTestUtils.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2002-2009 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.NotSerializableException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-
-/**
- * Utilities for testing serializability of objects.
- * Exposes static methods for use in other test cases.
- *
- * @author Rod Johnson
- */
-public class SerializationTestUtils {
-
-	public static void testSerialization(Object o) throws IOException {
-		OutputStream baos = new ByteArrayOutputStream();
-		ObjectOutputStream oos = new ObjectOutputStream(baos);
-		oos.writeObject(o);
-	}
-
-	public static boolean isSerializable(Object o) throws IOException {
-		try {
-			testSerialization(o);
-			return true;
-		}
-		catch (NotSerializableException ex) {
-			return false;
-		}
-	}
-
-	public static Object serializeAndDeserialize(Object o) throws IOException, ClassNotFoundException {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ObjectOutputStream oos = new ObjectOutputStream(baos);
-		oos.writeObject(o);
-		oos.flush();
-		baos.flush();
-		byte[] bytes = baos.toByteArray();
-
-		ByteArrayInputStream is = new ByteArrayInputStream(bytes);
-		ObjectInputStream ois = new ObjectInputStream(is);
-		Object o2 = ois.readObject();
-		return o2;
-	}
-
-}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java
deleted file mode 100644
index facc86bace1..00000000000
--- a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractApplicationContextTests.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.context;
-
-import java.util.Locale;
-
-import org.springframework.beans.TestBean;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.LifecycleBean;
-import org.springframework.context.ACATester;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationEvent;
-import org.springframework.context.BeanThatListens;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.NoSuchMessageException;
-import org.springframework.context.TestListener;
-
-/**
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public abstract class AbstractApplicationContextTests extends AbstractListableBeanFactoryTests {
-
-	/** Must be supplied as XML */
-	public static final String TEST_NAMESPACE = "testNamespace";
-
-	protected ConfigurableApplicationContext applicationContext;
-
-	/** Subclass must register this */
-	protected TestListener listener = new TestListener();
-
-	protected TestListener parentListener = new TestListener();
-
-	@Override
-	protected void setUp() throws Exception {
-		this.applicationContext = createContext();
-	}
-
-	@Override
-	protected BeanFactory getBeanFactory() {
-		return applicationContext;
-	}
-
-	protected ApplicationContext getApplicationContext() {
-		return applicationContext;
-	}
-
-	/**
-	 * Must register a TestListener.
-	 * Must register standard beans.
-	 * Parent must register rod with name Roderick
-	 * and father with name Albert.
-	 */
-	protected abstract ConfigurableApplicationContext createContext() throws Exception;
-
-	public void testContextAwareSingletonWasCalledBack() throws Exception {
-		ACATester aca = (ACATester) applicationContext.getBean("aca");
-		assertTrue("has had context set", aca.getApplicationContext() == applicationContext);
-		Object aca2 = applicationContext.getBean("aca");
-		assertTrue("Same instance", aca == aca2);
-		assertTrue("Says is singleton", applicationContext.isSingleton("aca"));
-	}
-
-	public void testContextAwarePrototypeWasCalledBack() throws Exception {
-		ACATester aca = (ACATester) applicationContext.getBean("aca-prototype");
-		assertTrue("has had context set", aca.getApplicationContext() == applicationContext);
-		Object aca2 = applicationContext.getBean("aca-prototype");
-		assertTrue("NOT Same instance", aca != aca2);
-		assertTrue("Says is prototype", !applicationContext.isSingleton("aca-prototype"));
-	}
-
-	public void testParentNonNull() {
-		assertTrue("parent isn't null", applicationContext.getParent() != null);
-	}
-
-	public void testGrandparentNull() {
-		assertTrue("grandparent is null", applicationContext.getParent().getParent() == null);
-	}
-
-	public void testOverrideWorked() throws Exception {
-		TestBean rod = (TestBean) applicationContext.getParent().getBean("rod");
-		assertTrue("Parent's name differs", rod.getName().equals("Roderick"));
-	}
-
-	public void testGrandparentDefinitionFound() throws Exception {
-		TestBean dad = (TestBean) applicationContext.getBean("father");
-		assertTrue("Dad has correct name", dad.getName().equals("Albert"));
-	}
-
-	public void testGrandparentTypedDefinitionFound() throws Exception {
-		TestBean dad = applicationContext.getBean("father", TestBean.class);
-		assertTrue("Dad has correct name", dad.getName().equals("Albert"));
-	}
-
-	public void testCloseTriggersDestroy() {
-		LifecycleBean lb = (LifecycleBean) applicationContext.getBean("lifecycle");
-		assertTrue("Not destroyed", !lb.isDestroyed());
-		applicationContext.close();
-		if (applicationContext.getParent() != null) {
-			((ConfigurableApplicationContext) applicationContext.getParent()).close();
-		}
-		assertTrue("Destroyed", lb.isDestroyed());
-		applicationContext.close();
-		if (applicationContext.getParent() != null) {
-			((ConfigurableApplicationContext) applicationContext.getParent()).close();
-		}
-		assertTrue("Destroyed", lb.isDestroyed());
-	}
-
-	public void testMessageSource() throws NoSuchMessageException {
-		assertEquals("message1", applicationContext.getMessage("code1", null, Locale.getDefault()));
-		assertEquals("message2", applicationContext.getMessage("code2", null, Locale.getDefault()));
-
-		try {
-			applicationContext.getMessage("code0", null, Locale.getDefault());
-			fail("looking for code0 should throw a NoSuchMessageException");
-		}
-		catch (NoSuchMessageException ex) {
-			// that's how it should be
-		}
-	}
-
-	public void testEvents() throws Exception {
-		listener.zeroCounter();
-		parentListener.zeroCounter();
-		assertTrue("0 events before publication", listener.getEventCount() == 0);
-		assertTrue("0 parent events before publication", parentListener.getEventCount() == 0);
-		this.applicationContext.publishEvent(new MyEvent(this));
-		assertTrue("1 events after publication, not " + listener.getEventCount(), listener.getEventCount() == 1);
-		assertTrue("1 parent events after publication", parentListener.getEventCount() == 1);
-	}
-
-	public void testBeanAutomaticallyHearsEvents() throws Exception {
-		//String[] listenerNames = ((ListableBeanFactory) applicationContext).getBeanDefinitionNames(ApplicationListener.class);
-		//assertTrue("listeners include beanThatListens", Arrays.asList(listenerNames).contains("beanThatListens"));
-		BeanThatListens b = (BeanThatListens) applicationContext.getBean("beanThatListens");
-		b.zero();
-		assertTrue("0 events before publication", b.getEventCount() == 0);
-		this.applicationContext.publishEvent(new MyEvent(this));
-		assertTrue("1 events after publication, not " + b.getEventCount(), b.getEventCount() == 1);
-	}
-
-
-	@SuppressWarnings("serial")
-	public static class MyEvent extends ApplicationEvent {
-
-		public MyEvent(Object source) {
-			super(source);
-		}
-	}
-
-}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java
deleted file mode 100644
index e51cb8d151a..00000000000
--- a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractBeanFactoryTests.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.context;
-
-import java.beans.PropertyEditorSupport;
-import java.util.StringTokenizer;
-
-import junit.framework.TestCase;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.PropertyBatchUpdateException;
-import org.springframework.beans.TestBean;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanIsNotAFactoryException;
-import org.springframework.beans.factory.BeanNotOfRequiredTypeException;
-import org.springframework.beans.factory.DummyFactory;
-import org.springframework.beans.factory.LifecycleBean;
-import org.springframework.beans.factory.MustBeInitialized;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-
-/**
- * Subclasses must implement setUp() to initialize bean factory
- * and any other variables they need.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public abstract class AbstractBeanFactoryTests extends TestCase {
-
-	protected abstract BeanFactory getBeanFactory();
-
-	/**
-	 * Roderick beans inherits from rod, overriding name only.
-	 */
-	public void testInheritance() {
-		assertTrue(getBeanFactory().containsBean("rod"));
-		assertTrue(getBeanFactory().containsBean("roderick"));
-		TestBean rod = (TestBean) getBeanFactory().getBean("rod");
-		TestBean roderick = (TestBean) getBeanFactory().getBean("roderick");
-		assertTrue("not == ", rod != roderick);
-		assertTrue("rod.name is Rod", rod.getName().equals("Rod"));
-		assertTrue("rod.age is 31", rod.getAge() == 31);
-		assertTrue("roderick.name is Roderick", roderick.getName().equals("Roderick"));
-		assertTrue("roderick.age was inherited", roderick.getAge() == rod.getAge());
-	}
-
-	public void testGetBeanWithNullArg() {
-		try {
-			getBeanFactory().getBean((String) null);
-			fail("Can't get null bean");
-		}
-		catch (IllegalArgumentException ex) {
-			// OK
-		}
-	}
-
-	/**
-	 * Test that InitializingBean objects receive the afterPropertiesSet() callback
-	 */
-	public void testInitializingBeanCallback() {
-		MustBeInitialized mbi = (MustBeInitialized) getBeanFactory().getBean("mustBeInitialized");
-		// The dummy business method will throw an exception if the
-		// afterPropertiesSet() callback wasn't invoked
-		mbi.businessMethod();
-	}
-
-	/**
-	 * Test that InitializingBean/BeanFactoryAware/DisposableBean objects receive the
-	 * afterPropertiesSet() callback before BeanFactoryAware callbacks
-	 */
-	public void testLifecycleCallbacks() {
-		LifecycleBean lb = (LifecycleBean) getBeanFactory().getBean("lifecycle");
-		assertEquals("lifecycle", lb.getBeanName());
-		// The dummy business method will throw an exception if the
-		// necessary callbacks weren't invoked in the right order.
-		lb.businessMethod();
-		assertTrue("Not destroyed", !lb.isDestroyed());
-	}
-
-	public void testFindsValidInstance() {
-		try {
-			Object o = getBeanFactory().getBean("rod");
-			assertTrue("Rod bean is a TestBean", o instanceof TestBean);
-			TestBean rod = (TestBean) o;
-			assertTrue("rod.name is Rod", rod.getName().equals("Rod"));
-			assertTrue("rod.age is 31", rod.getAge() == 31);
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-			fail("Shouldn't throw exception on getting valid instance");
-		}
-	}
-
-	public void testGetInstanceByMatchingClass() {
-		try {
-			Object o = getBeanFactory().getBean("rod", TestBean.class);
-			assertTrue("Rod bean is a TestBean", o instanceof TestBean);
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-			fail("Shouldn't throw exception on getting valid instance with matching class");
-		}
-	}
-
-	public void testGetInstanceByNonmatchingClass() {
-		try {
-			Object o = getBeanFactory().getBean("rod", BeanFactory.class);
-			fail("Rod bean is not of type BeanFactory; getBeanInstance(rod, BeanFactory.class) should throw BeanNotOfRequiredTypeException");
-		}
-		catch (BeanNotOfRequiredTypeException ex) {
-			// So far, so good
-			assertTrue("Exception has correct bean name", ex.getBeanName().equals("rod"));
-			assertTrue("Exception requiredType must be BeanFactory.class", ex.getRequiredType().equals(BeanFactory.class));
-			assertTrue("Exception actualType as TestBean.class", TestBean.class.isAssignableFrom(ex.getActualType()));
-			assertTrue("Actual type is correct", ex.getActualType() == getBeanFactory().getBean("rod").getClass());
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-			fail("Shouldn't throw exception on getting valid instance");
-		}
-	}
-
-	public void testGetSharedInstanceByMatchingClass() {
-		try {
-			Object o = getBeanFactory().getBean("rod", TestBean.class);
-			assertTrue("Rod bean is a TestBean", o instanceof TestBean);
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-			fail("Shouldn't throw exception on getting valid instance with matching class");
-		}
-	}
-
-	public void testGetSharedInstanceByMatchingClassNoCatch() {
-		Object o = getBeanFactory().getBean("rod", TestBean.class);
-		assertTrue("Rod bean is a TestBean", o instanceof TestBean);
-	}
-
-	public void testGetSharedInstanceByNonmatchingClass() {
-		try {
-			Object o = getBeanFactory().getBean("rod", BeanFactory.class);
-			fail("Rod bean is not of type BeanFactory; getBeanInstance(rod, BeanFactory.class) should throw BeanNotOfRequiredTypeException");
-		}
-		catch (BeanNotOfRequiredTypeException ex) {
-			// So far, so good
-			assertTrue("Exception has correct bean name", ex.getBeanName().equals("rod"));
-			assertTrue("Exception requiredType must be BeanFactory.class", ex.getRequiredType().equals(BeanFactory.class));
-			assertTrue("Exception actualType as TestBean.class", TestBean.class.isAssignableFrom(ex.getActualType()));
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-			fail("Shouldn't throw exception on getting valid instance");
-		}
-	}
-
-	public void testSharedInstancesAreEqual() {
-		try {
-			Object o = getBeanFactory().getBean("rod");
-			assertTrue("Rod bean1 is a TestBean", o instanceof TestBean);
-			Object o1 = getBeanFactory().getBean("rod");
-			assertTrue("Rod bean2 is a TestBean", o1 instanceof TestBean);
-			assertTrue("Object equals applies", o == o1);
-		}
-		catch (Exception ex) {
-			ex.printStackTrace();
-			fail("Shouldn't throw exception on getting valid instance");
-		}
-	}
-
-	public void testPrototypeInstancesAreIndependent() {
-		TestBean tb1 = (TestBean) getBeanFactory().getBean("kathy");
-		TestBean tb2 = (TestBean) getBeanFactory().getBean("kathy");
-		assertTrue("ref equal DOES NOT apply", tb1 != tb2);
-		assertTrue("object equal true", tb1.equals(tb2));
-		tb1.setAge(1);
-		tb2.setAge(2);
-		assertTrue("1 age independent = 1", tb1.getAge() == 1);
-		assertTrue("2 age independent = 2", tb2.getAge() == 2);
-		assertTrue("object equal now false", !tb1.equals(tb2));
-	}
-
-	public void testNotThere() {
-		assertFalse(getBeanFactory().containsBean("Mr Squiggle"));
-		try {
-			Object o = getBeanFactory().getBean("Mr Squiggle");
-			fail("Can't find missing bean");
-		}
-		catch (BeansException ex) {
-			//ex.printStackTrace();
-			//fail("Shouldn't throw exception on getting valid instance");
-		}
-	}
-
-	public void testValidEmpty() {
-		try {
-			Object o = getBeanFactory().getBean("validEmpty");
-			assertTrue("validEmpty bean is a TestBean", o instanceof TestBean);
-			TestBean ve = (TestBean) o;
-			assertTrue("Valid empty has defaults", ve.getName() == null && ve.getAge() == 0 && ve.getSpouse() == null);
-		}
-		catch (BeansException ex) {
-			ex.printStackTrace();
-			fail("Shouldn't throw exception on valid empty");
-		}
-	}
-
-	public void xtestTypeMismatch() {
-		try {
-			Object o = getBeanFactory().getBean("typeMismatch");
-			fail("Shouldn't succeed with type mismatch");
-		}
-		catch (BeanCreationException wex) {
-			assertEquals("typeMismatch", wex.getBeanName());
-			assertTrue(wex.getCause() instanceof PropertyBatchUpdateException);
-			PropertyBatchUpdateException ex = (PropertyBatchUpdateException) wex.getCause();
-			// Further tests
-			assertTrue("Has one error ", ex.getExceptionCount() == 1);
-			assertTrue("Error is for field age", ex.getPropertyAccessException("age") != null);
-			assertTrue("We have rejected age in exception", ex.getPropertyAccessException("age").getPropertyChangeEvent().getNewValue().equals("34x"));
-		}
-	}
-
-	public void testGrandparentDefinitionFoundInBeanFactory() throws Exception {
-		TestBean dad = (TestBean) getBeanFactory().getBean("father");
-		assertTrue("Dad has correct name", dad.getName().equals("Albert"));
-	}
-
-	public void testFactorySingleton() throws Exception {
-		assertTrue(getBeanFactory().isSingleton("&singletonFactory"));
-		assertTrue(getBeanFactory().isSingleton("singletonFactory"));
-		TestBean tb = (TestBean) getBeanFactory().getBean("singletonFactory");
-		assertTrue("Singleton from factory has correct name, not " + tb.getName(), tb.getName().equals(DummyFactory.SINGLETON_NAME));
-		DummyFactory factory = (DummyFactory) getBeanFactory().getBean("&singletonFactory");
-		TestBean tb2 = (TestBean) getBeanFactory().getBean("singletonFactory");
-		assertTrue("Singleton references ==", tb == tb2);
-		assertTrue("FactoryBean is BeanFactoryAware", factory.getBeanFactory() != null);
-	}
-
-	public void testFactoryPrototype() throws Exception {
-		assertTrue(getBeanFactory().isSingleton("&prototypeFactory"));
-		assertFalse(getBeanFactory().isSingleton("prototypeFactory"));
-		TestBean tb = (TestBean) getBeanFactory().getBean("prototypeFactory");
-		assertTrue(!tb.getName().equals(DummyFactory.SINGLETON_NAME));
-		TestBean tb2 = (TestBean) getBeanFactory().getBean("prototypeFactory");
-		assertTrue("Prototype references !=", tb != tb2);
-	}
-
-	/**
-	 * Check that we can get the factory bean itself.
-	 * This is only possible if we're dealing with a factory
-	 * @throws Exception
-	 */
-	public void testGetFactoryItself() throws Exception {
-		DummyFactory factory = (DummyFactory) getBeanFactory().getBean("&singletonFactory");
-		assertTrue(factory != null);
-	}
-
-	/**
-	 * Check that afterPropertiesSet gets called on factory
-	 * @throws Exception
-	 */
-	public void testFactoryIsInitialized() throws Exception {
-		TestBean tb = (TestBean) getBeanFactory().getBean("singletonFactory");
-		DummyFactory factory = (DummyFactory) getBeanFactory().getBean("&singletonFactory");
-		assertTrue("Factory was initialized because it implemented InitializingBean", factory.wasInitialized());
-	}
-
-	/**
-	 * It should be illegal to dereference a normal bean
-	 * as a factory
-	 */
-	public void testRejectsFactoryGetOnNormalBean() {
-		try {
-			getBeanFactory().getBean("&rod");
-			fail("Shouldn't permit factory get on normal bean");
-		}
-		catch (BeanIsNotAFactoryException ex) {
-			// Ok
-		}
-	}
-
-	// TODO: refactor in AbstractBeanFactory (tests for AbstractBeanFactory)
-	// and rename this class
-	public void testAliasing() {
-		BeanFactory bf = getBeanFactory();
-		if (!(bf instanceof ConfigurableBeanFactory)) {
-			return;
-		}
-		ConfigurableBeanFactory cbf = (ConfigurableBeanFactory) bf;
-
-		String alias = "rods alias";
-		try {
-			cbf.getBean(alias);
-			fail("Shouldn't permit factory get on normal bean");
-		}
-		catch (NoSuchBeanDefinitionException ex) {
-			// Ok
-			assertTrue(alias.equals(ex.getBeanName()));
-		}
-
-		// Create alias
-		cbf.registerAlias("rod", alias);
-		Object rod = getBeanFactory().getBean("rod");
-		Object aliasRod = getBeanFactory().getBean(alias);
-		assertTrue(rod == aliasRod);
-	}
-
-
-	public static class TestBeanEditor extends PropertyEditorSupport {
-
-		@Override
-		public void setAsText(String text) {
-			TestBean tb = new TestBean();
-			StringTokenizer st = new StringTokenizer(text, "_");
-			tb.setName(st.nextToken());
-			tb.setAge(Integer.parseInt(st.nextToken()));
-			setValue(tb);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractListableBeanFactoryTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/AbstractListableBeanFactoryTests.java
deleted file mode 100644
index 2b089f87482..00000000000
--- a/spring-webmvc/src/test/java/org/springframework/web/context/AbstractListableBeanFactoryTests.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.springframework.web.context;
-
-import org.springframework.beans.TestBean;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.ListableBeanFactory;
-
-/**
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public abstract class AbstractListableBeanFactoryTests extends AbstractBeanFactoryTests {
-
-	/** Subclasses must initialize this */
-	protected ListableBeanFactory getListableBeanFactory() {
-		BeanFactory bf = getBeanFactory();
-		if (!(bf instanceof ListableBeanFactory)) {
-			throw new IllegalStateException("ListableBeanFactory required");
-		}
-		return (ListableBeanFactory) bf;
-	}
-
-	/**
-	 * Subclasses can override this.
-	 */
-	public void testCount() {
-		assertCount(13);
-	}
-
-	protected final void assertCount(int count) {
-		String[] defnames = getListableBeanFactory().getBeanDefinitionNames();
-		assertTrue("We should have " + count + " beans, not " + defnames.length, defnames.length == count);
-	}
-
-	public void assertTestBeanCount(int count) {
-		String[] defNames = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, false);
-		assertTrue("We should have " + count + " beans for class org.springframework.beans.TestBean, not " +
-				defNames.length, defNames.length == count);
-
-		int countIncludingFactoryBeans = count + 2;
-		String[] names = getListableBeanFactory().getBeanNamesForType(TestBean.class, true, true);
-		assertTrue("We should have " + countIncludingFactoryBeans +
-				" beans for class org.springframework.beans.TestBean, not " + names.length,
-				names.length == countIncludingFactoryBeans);
-	}
-
-	public void testGetDefinitionsForNoSuchClass() {
-		String[] defnames = getListableBeanFactory().getBeanNamesForType(String.class);
-		assertTrue("No string definitions", defnames.length == 0);
-	}
-
-	/**
-	 * Check that count refers to factory class, not bean class. (We don't know
-	 * what type factories may return, and it may even change over time.)
-	 */
-	public void testGetCountForFactoryClass() {
-		assertTrue("Should have 2 factories, not " +
-				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length,
-				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length == 2);
-
-		assertTrue("Should have 2 factories, not " +
-				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length,
-				getListableBeanFactory().getBeanNamesForType(FactoryBean.class).length == 2);
-	}
-
-	public void testContainsBeanDefinition() {
-		assertTrue(getListableBeanFactory().containsBeanDefinition("rod"));
-		assertTrue(getListableBeanFactory().containsBeanDefinition("roderick"));
-	}
-
-}
\ No newline at end of file
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
index a84b83f7ad6..15a7e36fea4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/ContextLoaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,10 +36,10 @@ import javax.servlet.ServletContextListener;
 
 import org.junit.Test;
 import org.springframework.beans.BeansException;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.springframework.beans.factory.LifecycleBean;
+import org.springframework.tests.sample.beans.LifecycleBean;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextException;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/ResourceBundleMessageSourceTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/ResourceBundleMessageSourceTests.java
deleted file mode 100644
index b9710dd7980..00000000000
--- a/spring-webmvc/src/test/java/org/springframework/web/context/ResourceBundleMessageSourceTests.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.web.context;
-
-import java.util.Date;
-import java.util.Locale;
-
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.MessageSource;
-import org.springframework.context.NoSuchMessageException;
-import org.springframework.context.support.AbstractMessageSource;
-import org.springframework.mock.web.test.MockServletContext;
-import org.springframework.ui.context.Theme;
-import org.springframework.ui.context.ThemeSource;
-import org.springframework.web.context.support.StaticWebApplicationContext;
-import org.springframework.web.context.support.XmlWebApplicationContext;
-import org.springframework.web.servlet.theme.AbstractThemeResolver;
-
-/**
- * Creates a WebApplicationContext that points to a "web.xml" file that
- * contains the entry for what file to use for the applicationContext
- * (file "org/springframework/web/context/WEB-INF/applicationContext.xml").
- * That file then has an entry for a bean called "messageSource".
- * Whatever the basename property is set to for this bean is what the name of
- * a properties file in the classpath must be (in our case the name is
- * "messages" - note no package names).
- * Thus the catalog filename will be in the root of where the classes are compiled
- * to and will be called "messages_XX_YY.properties" where "XX" and "YY" are the
- * language and country codes known by the ResourceBundle class.
- *
- * 
NOTE: The main method of this class is the "createWebApplicationContext(...)" method,
- * and it was copied from org.springframework.web.context.XmlWebApplicationContextTests.
- *
- * @author Rod Johnson
- * @author Jean-Pierre Pawlak
- */
-public class ResourceBundleMessageSourceTests extends AbstractApplicationContextTests {
-
-	/**
-	 * We use ticket WAR root for file structure.
-	 * We don't attempt to read web.xml.
-	 */
-	public static final String WAR_ROOT = "/org/springframework/web/context";
-
-	private ConfigurableWebApplicationContext root;
-
-	private MessageSource themeMsgSource;
-
-	@Override
-	protected ConfigurableApplicationContext createContext() throws Exception {
-		root = new XmlWebApplicationContext();
-		MockServletContext sc = new MockServletContext();
-		root.setServletContext(sc);
-		root.setConfigLocations(new String[] {"/org/springframework/web/context/WEB-INF/applicationContext.xml"});
-		root.refresh();
-
-		ConfigurableWebApplicationContext wac = new XmlWebApplicationContext();
-		wac.setParent(root);
-		wac.setServletContext(sc);
-		wac.setNamespace("test-servlet");
-		wac.setConfigLocations(new String[] {"/org/springframework/web/context/WEB-INF/test-servlet.xml"});
-		wac.refresh();
-
-		Theme theme = ((ThemeSource) wac).getTheme(AbstractThemeResolver.ORIGINAL_DEFAULT_THEME_NAME);
-		assertNotNull(theme);
-		assertTrue("Theme name has to be the default theme name", AbstractThemeResolver.ORIGINAL_DEFAULT_THEME_NAME.equals(theme.getName()));
-		themeMsgSource = theme.getMessageSource();
-		assertNotNull(themeMsgSource);
-		return wac;
-	}
-
-	@Override
-	public void testCount() {
-		assertTrue("should have 14 beans, not " +
-				this.applicationContext.getBeanDefinitionCount(),
-				this.applicationContext.getBeanDefinitionCount() == 14);
-	}
-
-	/**
-	 * Overridden as we can't trust superclass method.
-	 * @see org.springframework.context.AbstractApplicationContextTests#testEvents()
-	 */
-	@Override
-	public void testEvents() throws Exception {
-		// Do nothing
-	}
-
-	public void testRootMessageSourceWithUseCodeAsDefaultMessage() throws NoSuchMessageException {
-		AbstractMessageSource messageSource = (AbstractMessageSource) root.getBean("messageSource");
-		messageSource.setUseCodeAsDefaultMessage(true);
-
-		assertEquals("message1", applicationContext.getMessage("code1", null, Locale.getDefault()));
-		assertEquals("message2", applicationContext.getMessage("code2", null, Locale.getDefault()));
-
-		try {
-			applicationContext.getMessage("code0", null, Locale.getDefault());
-			fail("looking for code0 should throw a NoSuchMessageException");
-		}
-		catch (NoSuchMessageException ex) {
-			// that's how it should be
-		}
-	}
-
-	/**
-	 * @see org.springframework.context.support.AbstractMessageSource for more details.
-	 * NOTE: Messages are contained within the "test/org/springframework/web/context/WEB-INF/messagesXXX.properties" files.
-	 */
-	public void testGetMessageWithDefaultPassedInAndFoundInMsgCatalog() {
-		assertTrue("valid msg from resourcebundle with default msg passed in returned default msg. Expected msg from catalog.",
-				getApplicationContext().getMessage("message.format.example2", null, "This is a default msg if not found in msg.cat.", Locale.US
-				)
-				.equals("This is a test message in the message catalog with no args."));
-		// getApplicationContext().getTheme("theme").getMessageSource().getMessage()
-	}
-
-	/**
-	 * @see org.springframework.context.support.AbstractMessageSource for more details.
-	 * NOTE: Messages are contained within the "test/org/springframework/web/context/WEB-INF/messagesXXX.properties" files.
-	 */
-	public void testGetMessageWithDefaultPassedInAndNotFoundInMsgCatalog() {
-		assertTrue("bogus msg from resourcebundle with default msg passed in returned default msg",
-				getApplicationContext().getMessage("bogus.message", null, "This is a default msg if not found in msg.cat.", Locale.UK
-				)
-				.equals("This is a default msg if not found in msg.cat."));
-	}
-
-	/**
-	 * The underlying implementation uses a hashMap to cache messageFormats
-	 * once a message has been asked for.  This test is an attempt to
-	 * make sure the cache is being used properly.
-	 * NOTE: Messages are contained within the "test/org/springframework/web/context/WEB-INF/messagesXXX.properties" files.
-	 * @see org.springframework.context.support.AbstractMessageSource for more details.
-	 */
-	public void testGetMessageWithMessageAlreadyLookedFor() throws Exception {
-		Object[] arguments = {
-			new Integer(7), new Date(System.currentTimeMillis()),
-			"a disturbance in the Force"
-		};
-
-		// The first time searching, we don't care about for this test
-		getApplicationContext().getMessage("message.format.example1", arguments, Locale.US);
-
-		// Now msg better be as expected
-		assertTrue("2nd search within MsgFormat cache returned expected message for Locale.US",
-				getApplicationContext().getMessage("message.format.example1", arguments, Locale.US
-				)
-				.indexOf("there was \"a disturbance in the Force\" on planet 7.") != -1);
-
-		Object[] newArguments = {
-			new Integer(8), new Date(System.currentTimeMillis()),
-			"a disturbance in the Force"
-		};
-
-		// Now msg better be as expected even with different args
-		assertTrue("2nd search within MsgFormat cache with different args returned expected message for Locale.US",
-				getApplicationContext().getMessage("message.format.example1", newArguments, Locale.US
-				)
-				.indexOf("there was \"a disturbance in the Force\" on planet 8.") != -1);
-	}
-
-	/**
-	 * @see org.springframework.context.support.AbstractMessageSource for more details.
-	 * NOTE: Messages are contained within the "test/org/springframework/web/context/WEB-INF/messagesXXX.properties" files.
-	 * Example taken from the javadocs for the java.text.MessageFormat class
-	 */
-	public void testGetMessageWithNoDefaultPassedInAndFoundInMsgCatalog() throws Exception {
-		Object[] arguments = {
-			new Integer(7), new Date(System.currentTimeMillis()),
-			"a disturbance in the Force"
-		};
-
-		/*
-		 Try with Locale.US
-		 Since the msg has a time value in it, we will use String.indexOf(...)
-		 to just look for a substring without the time.  This is because it is
-		 possible that by the time we store a time variable in this method
-		 and the time the ResourceBundleMessageSource resolves the msg the
-		 minutes of the time might not be the same.
-		 */
-		assertTrue("msg from resourcebundle for Locale.US substituting args for placeholders is as expected",
-				getApplicationContext().getMessage("message.format.example1", arguments, Locale.US
-				)
-				.indexOf("there was \"a disturbance in the Force\" on planet 7.") != -1);
-
-		// Try with Locale.UK
-		assertTrue("msg from resourcebundle for Locale.UK substituting args for placeholders is as expected",
-				getApplicationContext().getMessage("message.format.example1", arguments, Locale.UK
-				)
-				.indexOf("there was \"a disturbance in the Force\" on station number 7.") != -1);
-
-		// Try with Locale.US - different test msg that requires no args
-		assertTrue("msg from resourcebundle that requires no args for Locale.US is as expected",
-				getApplicationContext().getMessage("message.format.example2", null, Locale.US)
-				.equals("This is a test message in the message catalog with no args."));
-	}
-
-	/**
-	 * @see org.springframework.context.support.AbstractMessageSource for more details.
-	 * NOTE: Messages are contained within the "test/org/springframework/web/context/WEB-INF/messagesXXX.properties" files.
-	 */
-	public void testGetMessageWithNoDefaultPassedInAndNotFoundInMsgCatalog() {
-		// Expecting an exception
-		try {
-			getApplicationContext().getMessage("bogus.message", null, Locale.UK);
-			fail("bogus msg from resourcebundle without default msg should have thrown exception");
-		}
-		catch (NoSuchMessageException tExcept) {
-			assertTrue("bogus msg from resourcebundle without default msg threw expected exception",
-					true);
-		}
-	}
-
-	public void testGetMultipleBasenamesForMessageSource() throws NoSuchMessageException {
-		assertEquals("message1", getApplicationContext().getMessage("code1", null, Locale.UK));
-		assertEquals("message2", getApplicationContext().getMessage("code2", null, Locale.UK));
-		assertEquals("message3", getApplicationContext().getMessage("code3", null, Locale.UK));
-	}
-
-	/**
-	 * @see org.springframework.context.support.AbstractMessageSource for more details.
-	 * NOTE: Messages are contained within the "test/org/springframework/web/context/WEB-INF/themeXXX.properties" files.
-	 */
-	public void testGetMessageWithDefaultPassedInAndFoundInThemeCatalog() {
-		// Try with Locale.US
-		String msg = getThemeMessage("theme.example1", null, "This is a default theme msg if not found in theme cat.", Locale.US);
-		assertTrue("valid msg from theme resourcebundle with default msg passed in returned default msg.  Expected msg from catalog. Received: " + msg,
-				msg.equals("This is a test message in the theme message catalog."));
-		// Try with Locale.UK
-		msg = getThemeMessage("theme.example1", null, "This is a default theme msg if not found in theme cat.", Locale.UK);
-		assertTrue("valid msg from theme resourcebundle with default msg passed in returned default msg.  Expected msg from catalog.",
-				msg.equals("This is a test message in the theme message catalog with no args."));
-	}
-
-	/**
-	 * @see org.springframework.context.support.AbstractMessageSource for more details.
-	 * NOTE: Messages are contained within the "test/org/springframework/web/context/WEB-INF/themeXXX.properties" files.
-	 */
-	public void testGetMessageWithDefaultPassedInAndNotFoundInThemeCatalog() {
-		assertTrue("bogus msg from theme resourcebundle with default msg passed in returned default msg",
-				getThemeMessage("bogus.message", null, "This is a default msg if not found in theme cat.", Locale.UK
-				)
-				.equals("This is a default msg if not found in theme cat."));
-	}
-
-	public void testThemeSourceNesting() throws NoSuchMessageException {
-		String overriddenMsg = getThemeMessage("theme.example2", null, null, Locale.UK);
-		MessageSource ms = ((ThemeSource) root).getTheme(AbstractThemeResolver.ORIGINAL_DEFAULT_THEME_NAME).getMessageSource();
-		String originalMsg = ms.getMessage("theme.example2", null, Locale.UK);
-		assertTrue("correct overridden msg", "test-message2".equals(overriddenMsg));
-		assertTrue("correct original msg", "message2".equals(originalMsg));
-	}
-
-	public void testThemeSourceNestingWithParentDefault() throws NoSuchMessageException {
-		StaticWebApplicationContext leaf = new StaticWebApplicationContext();
-		leaf.setParent(getApplicationContext());
-		leaf.refresh();
-		assertNotNull("theme still found", leaf.getTheme("theme"));
-		MessageSource ms = leaf.getTheme("theme").getMessageSource();
-		String msg = ms.getMessage("theme.example2", null, null, Locale.UK);
-		assertEquals("correct overridden msg", "test-message2", msg);
-	}
-
-	private String getThemeMessage(String code, Object args[], String defaultMessage, Locale locale) {
-		return themeMsgSource.getMessage(code, args, defaultMessage, locale);
-	}
-
-}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml
index e25d3317379..6080b76eb0a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/ContextLoaderTests-acc-context.xml
@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	
+	
 		
 	
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/applicationContext.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/applicationContext.xml
index 3a59552ded2..b4d7c366f24 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/applicationContext.xml
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/applicationContext.xml
@@ -9,7 +9,7 @@
 
 	
 
-	
+	
 
 	
 
 	
-	
+	
 		
 			dummy
 		
@@ -45,7 +45,7 @@
 			Tests of lifecycle callbacks
 		-->
 	
+		class="org.springframework.tests.sample.beans.MustBeInitialized">
 	
 
 	31
 	
 
-	
+	
 
-	
+	
 		Kerry
 		34
 		
 	
 
-	
+	
 		typeMismatch
 		34x
 		
@@ -31,20 +31,20 @@
 	
 	
+		class="org.springframework.tests.sample.beans.factory.DummyFactory">
 	
 
 	
+		class="org.springframework.tests.sample.beans.factory.DummyFactory">
 		false
 	
 	
-	
+	
 		
 		listenerVeto
 		66
 	
 
-	
+	
 
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/contextInclude.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/contextInclude.xml
index 2e4938383be..5f178d50ebb 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/contextInclude.xml
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/contextInclude.xml
@@ -1,6 +1,6 @@
 
 
-	
+	
 		yetanotherdummy
 	
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/sessionContext.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/sessionContext.xml
index 7da590d1f21..eb7bf0f6eae 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/sessionContext.xml
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/sessionContext.xml
@@ -3,12 +3,12 @@
 
 
 
-	
+	
 		
 		
 	
 
-	
+	
 		
 		
 	
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/test-servlet.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/test-servlet.xml
index 4002703b211..85885f238d0 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/test-servlet.xml
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/test-servlet.xml
@@ -15,7 +15,7 @@
 
 	
 
-	
+	
 		Rod
 		31
 		
@@ -28,32 +28,32 @@
 		31
 	
 
-	
+	
 
-	
+	
 		Kerry
 		34
 		
 	
 
-	
+	
 		typeMismatch
 		34x
 		
 	
 
-	
+	
 	
 
-	
+	
 		false
 	
 	
-	
+	
 		listenerVeto
 		66
 	
 
-	
+	
 
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/testNamespace.xml b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/testNamespace.xml
index dd10e5fcab7..89c42365d4a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/testNamespace.xml
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/testNamespace.xml
@@ -3,12 +3,12 @@
 
 
 
-	
+	
 		Rod
 		31
 	
 
-	
+	
 		Kerry
 		34
 		
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
index 3423fd8e884..4dce1e9fac3 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/XmlWebApplicationContextTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,12 +21,13 @@ import java.util.Locale;
 import javax.servlet.ServletException;
 
 import org.springframework.beans.BeansException;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.context.AbstractApplicationContextTests;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.NoSuchMessageException;
 import org.springframework.context.TestListener;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java
index 9e0784f2519..07823327e66 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ import java.util.Set;
 
 import org.junit.Test;
 import org.springframework.beans.MutablePropertyValues;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.config.ConstructorArgumentValues;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java
index 1e44c2f8156..b5b4f0206fa 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -131,7 +131,7 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext {
 		registerSingleton("viewResolver2", InternalResourceViewResolver.class, pvs);
 
 		pvs = new MutablePropertyValues();
-		pvs.add("commandClass", "org.springframework.beans.TestBean");
+		pvs.add("commandClass", "org.springframework.tests.sample.beans.TestBean");
 		pvs.add("formView", "form");
 		registerSingleton("formHandler", SimpleFormController.class, pvs);
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
index 287ea086eb4..147875e4ca4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ import junit.framework.TestCase;
 
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.PropertyValue;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.DefaultMessageSourceResolvable;
 import org.springframework.core.env.ConfigurableEnvironment;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java
index dbbb25fe5a9..ce525f937da 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/SimpleWebApplicationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,7 +50,7 @@ public class SimpleWebApplicationContext extends StaticWebApplicationContext {
 	@Override
 	public void refresh() throws BeansException {
 		MutablePropertyValues pvs = new MutablePropertyValues();
-		pvs.add("commandClass", "org.springframework.beans.TestBean");
+		pvs.add("commandClass", "org.springframework.tests.sample.beans.TestBean");
 		pvs.add("formView", "form");
 		registerSingleton("/form.do", SimpleFormController.class, pvs);
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java
index 1c270ae5716..40f10ea7e60 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.DirectFieldAccessor;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.io.FileSystemResourceLoader;
 import org.springframework.format.FormatterRegistry;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java
index ea1b09ed217..ff3ebd962f4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CancellableFormControllerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import junit.framework.TestCase;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.validation.BindException;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java
index 4749c85df72..da2da2e174a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/CommandControllerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import junit.framework.TestCase;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.beans.propertyeditors.CustomNumberEditor;
 import org.springframework.mock.web.test.MockHttpServletRequest;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java
index d62174ab265..3c40caacd6b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/FormControllerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,8 +28,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import junit.framework.TestCase;
 
-import org.springframework.beans.IndexedTestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.IndexedTestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java
index 705ac4ea815..1d37caff853 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/WizardFormControllerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ import javax.servlet.http.HttpSession;
 
 import junit.framework.TestCase;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.util.ObjectUtils;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
index 05e0f3c2a51..bbfa7e29902 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,12 +59,12 @@ import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreato
 import org.springframework.aop.interceptor.SimpleTraceInterceptor;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.beans.BeansException;
-import org.springframework.beans.DerivedTestBean;
-import org.springframework.beans.GenericBean;
-import org.springframework.beans.ITestBean;
+import org.springframework.tests.sample.beans.DerivedTestBean;
+import org.springframework.tests.sample.beans.GenericBean;
+import org.springframework.tests.sample.beans.ITestBean;
 import org.springframework.beans.PropertyEditorRegistrar;
 import org.springframework.beans.PropertyEditorRegistry;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -329,7 +329,7 @@ public class ServletAnnotationControllerTests {
 		request.addParameter("testBeanSet", new String[] {"1", "2"});
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		servlet.service(request, response);
-		assertEquals("[1, 2]-org.springframework.beans.TestBean", response.getContentAsString());
+		assertEquals("[1, 2]-org.springframework.tests.sample.beans.TestBean", response.getContentAsString());
 	}
 
 	@Test
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinderTests.java
index 32ac81d6687..33307032e58 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.web.bind.ServletRequestDataBinder;
 import org.springframework.web.bind.WebDataBinder;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java
index 54d187f91a1..e0a515c3b05 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ import java.util.List;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.core.MethodParameter;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.ui.ExtendedModelMap;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java
index 450315e6de4..caa7fbcea66 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ import javax.validation.Valid;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.core.MethodParameter;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
index 3d77c292373..a15466aabc0 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,13 +36,13 @@ import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.FreePortScanner;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.ResourceHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
 import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
 import org.springframework.stereotype.Controller;
+import org.springframework.tests.web.FreePortScanner;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SerlvetModelAttributeMethodProcessorTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SerlvetModelAttributeMethodProcessorTests.java
index 21ef1b19592..26e95d0c33d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SerlvetModelAttributeMethodProcessorTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SerlvetModelAttributeMethodProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.mock.web.test.MockHttpServletRequest;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
index e42ccb29693..6c5c7327e08 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,10 +64,10 @@ import org.junit.Test;
 import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
 import org.springframework.aop.interceptor.SimpleTraceInterceptor;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
-import org.springframework.beans.DerivedTestBean;
-import org.springframework.beans.GenericBean;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.DerivedTestBean;
+import org.springframework.tests.sample.beans.GenericBean;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -283,7 +283,7 @@ public class ServletAnnotationControllerHandlerMethodTests extends AbstractServl
 		request.addParameter("testBeanSet", new String[] {"1", "2"});
 		MockHttpServletResponse response = new MockHttpServletResponse();
 		getServlet().service(request, response);
-		assertEquals("[1, 2]-org.springframework.beans.TestBean", response.getContentAsString());
+		assertEquals("[1, 2]-org.springframework.tests.sample.beans.TestBean", response.getContentAsString());
 	}
 
 	@Test
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/multiaction/MultiActionControllerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/multiaction/MultiActionControllerTests.java
index 18ae25f7e01..64de09b05af 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/multiaction/MultiActionControllerTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/multiaction/MultiActionControllerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ import javax.servlet.http.HttpSession;
 import junit.framework.TestCase;
 
 import org.springframework.beans.FatalBeanException;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.context.ApplicationContextException;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java
index 852c95fd8af..fe492bab941 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import java.util.Collections;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.ConversionNotSupportedException;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.TypeMismatchException;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java
index 8a0518c5607..cb7b41e9d69 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/RedirectAttributesModelMapTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.format.support.DefaultFormattingConversionService;
 import org.springframework.format.support.FormattingConversionService;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
index 98764500996..4af3a47cde6 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,9 +27,9 @@ import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.PageContext;
 import javax.servlet.jsp.tagext.Tag;
 
-import org.springframework.beans.IndexedTestBean;
-import org.springframework.beans.NestedTestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.IndexedTestBean;
+import org.springframework.tests.sample.beans.NestedTestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.validation.BindException;
 import org.springframework.validation.BindingResult;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java
index e380397ed48..f1b27c493ed 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/AbstractFormTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.springframework.web.servlet.tags.form;
 
 import javax.servlet.jsp.JspException;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockPageContext;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java
index 1d299c222ad..b471438f1e6 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ButtonTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import java.io.Writer;
 
 import javax.servlet.jsp.tagext.Tag;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * @author Rossen Stoyanchev
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
index 70aae8f0e49..657aab3c24a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,9 +32,9 @@ import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
 
-import org.springframework.beans.Colour;
-import org.springframework.beans.Pet;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.Colour;
+import org.springframework.tests.sample.beans.Pet;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.propertyeditors.StringTrimmerEditor;
 import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.BindingResult;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
index 055580d5a34..9ffeefbf2ca 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,9 +36,9 @@ import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
 
-import org.springframework.beans.Colour;
-import org.springframework.beans.Pet;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.Colour;
+import org.springframework.tests.sample.beans.Pet;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.propertyeditors.StringTrimmerEditor;
 import org.springframework.format.Formatter;
 import org.springframework.format.support.FormattingConversionService;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
index 6e11e063319..a36012bb60e 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ import javax.servlet.jsp.PageContext;
 import javax.servlet.jsp.tagext.BodyTag;
 import javax.servlet.jsp.tagext.Tag;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.mock.web.test.MockBodyContent;
 import org.springframework.mock.web.test.MockPageContext;
 import org.springframework.validation.BeanPropertyBindingResult;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java
index 60beaccb6d1..613196224c0 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/HiddenInputTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ package org.springframework.web.servlet.tags.form;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.Tag;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.validation.BeanPropertyBindingResult;
 
 /**
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
index 7ca869480b1..52ba57f9f27 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import java.io.Writer;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.Tag;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.web.servlet.support.BindStatus;
 import org.springframework.web.servlet.tags.BindTag;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java
index 5654062ff7d..23b9016c747 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ package org.springframework.web.servlet.tags.form;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.Tag;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.mock.web.test.MockPageContext;
 import org.springframework.web.servlet.tags.NestedPathTag;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
index 7144652045e..aa853b99bfa 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ package org.springframework.web.servlet.tags.form;
 import javax.servlet.jsp.tagext.BodyTag;
 import javax.servlet.jsp.tagext.Tag;
 
-import org.springframework.beans.CustomEnum;
-import org.springframework.beans.GenericBean;
+import org.springframework.tests.sample.beans.CustomEnum;
+import org.springframework.tests.sample.beans.GenericBean;
 import org.springframework.web.servlet.support.BindStatus;
 
 /**
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
index 3acacbb8b8d..1d554f5ef4f 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@ import java.util.List;
 import javax.servlet.jsp.tagext.BodyTag;
 import javax.servlet.jsp.tagext.Tag;
 
-import org.springframework.beans.Colour;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.Colour;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.propertyeditors.StringArrayPropertyEditor;
 import org.springframework.mock.web.test.MockBodyContent;
 import org.springframework.mock.web.test.MockHttpServletRequest;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
index 92290c23cc9..964e2d412f5 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.Node;
 import org.dom4j.io.SAXReader;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockPageContext;
 import org.springframework.validation.BeanPropertyBindingResult;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
index bcb5eeebaff..42190d39f82 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,8 +27,8 @@ import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
 
-import org.springframework.beans.Pet;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.Pet;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.BindingResult;
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
index 93f6a04080a..702e790c9a3 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,9 +34,9 @@ import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.Node;
 import org.dom4j.io.SAXReader;
-import org.springframework.beans.Colour;
-import org.springframework.beans.Pet;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.Colour;
+import org.springframework.tests.sample.beans.Pet;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.propertyeditors.StringTrimmerEditor;
 import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.BindingResult;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
index 8786a091fae..8dfc3e3e0cf 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ import org.dom4j.DocumentException;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.propertyeditors.CustomCollectionEditor;
 import org.springframework.format.Formatter;
 import org.springframework.format.support.FormattingConversionService;
@@ -337,7 +337,7 @@ public class SelectTagTests extends AbstractFormTagTests {
 		catch (JspException expected) {
 			String message = expected.getMessage();
 			assertTrue(message.indexOf("items") > -1);
-			assertTrue(message.indexOf("org.springframework.beans.TestBean") > -1);
+			assertTrue(message.indexOf("org.springframework.tests.sample.beans.TestBean") > -1);
 		}
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TestBeanWithRealCountry.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TestBeanWithRealCountry.java
index e1a6a313d0d..4ea337bbd75 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TestBeanWithRealCountry.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TestBeanWithRealCountry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.web.servlet.tags.form;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 
 /**
  * @author Juergen Hoeller
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
index 4684b5b659a..bfa9bd8dbe1 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.springframework.web.servlet.tags.form;
 
 import javax.servlet.jsp.tagext.Tag;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.validation.BeanPropertyBindingResult;
 
 /**
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java
index d252550f18a..d3c45fb2493 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/RedirectViewTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ import junit.framework.AssertionFailedError;
 
 import org.easymock.EasyMock;
 import org.junit.Test;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.http.HttpStatus;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java
index fadc6063737..3836559480d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/ViewResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ import org.junit.Test;
 
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.PropertyValue;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.context.ApplicationContextException;
 import org.springframework.core.io.ClassPathResource;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java
index d3af0683f4f..17a4c4f50c4 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.mock.web.test.MockHttpServletRequest;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java
index 3ed42765505..04c8497df3c 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityMacroTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ import org.apache.velocity.Template;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.context.Context;
 
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.mock.web.test.MockServletContext;
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java
index ff477a97f4b..b07a53716ea 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/velocity/VelocityRenderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.mock.web.test.MockHttpServletResponse;
 import org.springframework.mock.web.test.MockServletContext;
diff --git a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/sessionContext.xml b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/sessionContext.xml
index 7da590d1f21..eb7bf0f6eae 100644
--- a/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/sessionContext.xml
+++ b/spring-webmvc/src/test/resources/org/springframework/web/context/WEB-INF/sessionContext.xml
@@ -3,12 +3,12 @@
 
 
 
-	
+	
 		
 		
 	
 
-	
+	
 		
 		
 	
diff --git a/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml b/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml
index 4be55f0ea74..49e480a6644 100644
--- a/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml
+++ b/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml
@@ -11,19 +11,19 @@
 
 	
 
-	
+	
 
-	
+	
 		
 		
 	
 
-	
+	
 		
 		
 	
 
-	
+	
 		
 		
 	
diff --git a/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java b/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java
index 7472033a36b..8a3c1786275 100644
--- a/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java
+++ b/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,20 +17,22 @@
 package org.springframework.aop.config;
 
 import static java.lang.String.format;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
-import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
-import test.beans.ITestBean;
-import test.beans.TestBean;
-import test.util.SerializationTestUtils;
-
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.context.ApplicationContext;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpSession;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.SerializationTestUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.context.support.XmlWebApplicationContext;
diff --git a/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml
index 4f9a0361c04..c5b04a53df3 100644
--- a/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml
+++ b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml
@@ -22,20 +22,20 @@
 		9
 		false
 	
-	
+
 	
 		11
 		true
 	
-	
+
 	
 		
 		true
 	
 
 	
-	
-	
+	
+
 	
 		
 			
@@ -71,37 +71,37 @@
 			
 		
 	
-	
+
 	
-	
-	
-		
-	
-	
+
+	
+
+	
+
 	
 
 	
 		
-		test.beans.ITestBean.getName
+		org.springframework.tests.sample.beans.ITestBean.getName
 	
 
-	
+	
 
-	
+	
 		4
 	
-	
+
 	
 
 	
 
 	
 
-	
+	
 
 	
 		
 		
 	
 
-		
+
diff --git a/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
index 74ff0825e65..d2fbb3e1e06 100644
--- a/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
+++ b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,9 @@
 
 package org.springframework.aop.framework.autoproxy;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -30,16 +32,13 @@ import org.springframework.aop.support.StaticMethodMatcherPointcutAdvisor;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.tests.aop.advice.CountingBeforeAdvice;
+import org.springframework.tests.aop.advice.MethodCounter;
+import org.springframework.tests.aop.interceptor.NopInterceptor;
+import org.springframework.tests.sample.beans.ITestBean;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.NoTransactionException;
-import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.interceptor.TransactionInterceptor;
-import org.springframework.transaction.support.AbstractPlatformTransactionManager;
-import org.springframework.transaction.support.DefaultTransactionStatus;
-
-import test.advice.CountingBeforeAdvice;
-import test.advice.MethodCounter;
-import test.beans.ITestBean;
-import test.interceptor.NopInterceptor;
 
 /**
  * Integration tests for auto proxy creation by advisor recognition working in
@@ -316,43 +315,3 @@ class Rollback {
 	}
 
 }
-
-
-@SuppressWarnings("serial")
-class CallCountingTransactionManager extends AbstractPlatformTransactionManager {
-
-	public TransactionDefinition lastDefinition;
-	public int begun;
-	public int commits;
-	public int rollbacks;
-	public int inflight;
-
-	@Override
-	protected Object doGetTransaction() {
-		return new Object();
-	}
-
-	@Override
-	protected void doBegin(Object transaction, TransactionDefinition definition) {
-		this.lastDefinition = definition;
-		++begun;
-		++inflight;
-	}
-
-	@Override
-	protected void doCommit(DefaultTransactionStatus status) {
-		++commits;
-		--inflight;
-	}
-
-	@Override
-	protected void doRollback(DefaultTransactionStatus status) {
-		++rollbacks;
-		--inflight;
-	}
-
-	public void clear() {
-		begun = commits = rollbacks = inflight = 0;
-	}
-
-}
diff --git a/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java b/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java
index fae32ac8f52..aca10a3fb26 100644
--- a/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java
+++ b/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,18 @@
 
 package org.springframework.scheduling.annotation;
 
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.replay;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Before;
 import org.junit.Test;
-
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -31,16 +38,11 @@ import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.stereotype.Repository;
 import org.springframework.tests.Assume;
 import org.springframework.tests.TestGroup;
-import org.springframework.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.Transactional;
 
-import static org.easymock.EasyMock.*;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-
 /**
  * Integration tests cornering bug SPR-8651, which revealed that @Scheduled methods may
  * not work well with beans that have already been proxied for other reasons such
diff --git a/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
deleted file mode 100644
index ff94b0dd222..00000000000
--- a/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.transaction;
-
-
-
-import org.springframework.transaction.support.AbstractPlatformTransactionManager;
-import org.springframework.transaction.support.DefaultTransactionStatus;
-
-/**
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-@SuppressWarnings("serial")
-public class CallCountingTransactionManager extends AbstractPlatformTransactionManager {
-
-	public TransactionDefinition lastDefinition;
-	public int begun;
-	public int commits;
-	public int rollbacks;
-	public int inflight;
-
-	@Override
-	protected Object doGetTransaction() {
-		return new Object();
-	}
-
-	@Override
-	protected void doBegin(Object transaction, TransactionDefinition definition) {
-		this.lastDefinition = definition;
-		++begun;
-		++inflight;
-	}
-
-	@Override
-	protected void doCommit(DefaultTransactionStatus status) {
-		++commits;
-		--inflight;
-	}
-
-	@Override
-	protected void doRollback(DefaultTransactionStatus status) {
-		++rollbacks;
-		--inflight;
-	}
-
-	public void clear() {
-		begun = commits = rollbacks = inflight = 0;
-	}
-
-}
diff --git a/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java b/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
index d4f33e642e8..54511e7e7b4 100644
--- a/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
+++ b/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 import org.springframework.stereotype.Repository;
-import org.springframework.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.interceptor.BeanFactoryTransactionAttributeSourceAdvisor;
 
diff --git a/src/test/java/test/advice/CountingBeforeAdvice.java b/src/test/java/test/advice/CountingBeforeAdvice.java
deleted file mode 100644
index 5aa37b61e14..00000000000
--- a/src/test/java/test/advice/CountingBeforeAdvice.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.advice;
-
-import java.lang.reflect.Method;
-
-import org.springframework.aop.MethodBeforeAdvice;
-
-/**
- * Simple before advice example that we can use for counting checks.
- *
- * @author Rod Johnson
- */
-@SuppressWarnings("serial")
-public class CountingBeforeAdvice extends MethodCounter implements MethodBeforeAdvice {
-
-	@Override
-	public void before(Method m, Object[] args, Object target) throws Throwable {
-		count(m);
-	}
-
-}
diff --git a/src/test/java/test/beans/Colour.java b/src/test/java/test/beans/Colour.java
deleted file mode 100644
index 533d0df36e3..00000000000
--- a/src/test/java/test/beans/Colour.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-import org.springframework.core.enums.ShortCodedLabeledEnum;
-
-/**
- * @author Rob Harrop
- */
-@SuppressWarnings("serial")
-public class Colour extends ShortCodedLabeledEnum {
-
-	public static final Colour RED = new Colour(0, "RED");
-	public static final Colour BLUE = new Colour(1, "BLUE");
-	public static final Colour GREEN = new Colour(2, "GREEN");
-	public static final Colour PURPLE = new Colour(3, "PURPLE");
-
-	private Colour(int code, String label) {
-		super(code, label);
-	}
-
-}
diff --git a/src/test/java/test/beans/INestedTestBean.java b/src/test/java/test/beans/INestedTestBean.java
deleted file mode 100644
index 2b63908467c..00000000000
--- a/src/test/java/test/beans/INestedTestBean.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-public interface INestedTestBean {
-
-	public String getCompany();
-
-}
diff --git a/src/test/java/test/beans/IOther.java b/src/test/java/test/beans/IOther.java
deleted file mode 100644
index f0c6aa7bf46..00000000000
--- a/src/test/java/test/beans/IOther.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-public interface IOther {
-
-	void absquatulate();
-
-}
diff --git a/src/test/java/test/beans/ITestBean.java b/src/test/java/test/beans/ITestBean.java
deleted file mode 100644
index 0434b6ad114..00000000000
--- a/src/test/java/test/beans/ITestBean.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-import java.io.IOException;
-
-/**
- * Interface used for {@link TestBean}.
- *
- * 
Two methods are the same as on Person, but if this
- * extends person it breaks quite a few tests..
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public interface ITestBean {
-
-	int getAge();
-
-	void setAge(int age);
-
-	String getName();
-
-	void setName(String name);
-
-	ITestBean getSpouse();
-
-	void setSpouse(ITestBean spouse);
-
-	ITestBean[] getSpouses();
-
-	String[] getStringArray();
-
-	void setStringArray(String[] stringArray);
-
-	/**
-	 * Throws a given (non-null) exception.
-	 */
-	void exceptional(Throwable t) throws Throwable;
-
-	Object returnsThis();
-
-	INestedTestBean getDoctor();
-
-	INestedTestBean getLawyer();
-
-	IndexedTestBean getNestedIndexedBean();
-
-	/**
-	 * Increment the age by one.
-	 * @return the previous age
-	 */
-	int haveBirthday();
-
-	void unreliableFileOperation() throws IOException;
-
-}
diff --git a/src/test/java/test/beans/IndexedTestBean.java b/src/test/java/test/beans/IndexedTestBean.java
deleted file mode 100644
index 160681e5565..00000000000
--- a/src/test/java/test/beans/IndexedTestBean.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-/**
- * @author Juergen Hoeller
- * @since 11.11.2003
- */
-public class IndexedTestBean {
-
-	private TestBean[] array;
-
-	private Collection collection;
-
-	private List list;
-
-	private Set set;
-
-	private SortedSet sortedSet;
-
-	private Map map;
-
-	private SortedMap sortedMap;
-
-
-	public IndexedTestBean() {
-		this(true);
-	}
-
-	public IndexedTestBean(boolean populate) {
-		if (populate) {
-			populate();
-		}
-	}
-
-	public void populate() {
-		TestBean tb0 = new TestBean("name0", 0);
-		TestBean tb1 = new TestBean("name1", 0);
-		TestBean tb2 = new TestBean("name2", 0);
-		TestBean tb3 = new TestBean("name3", 0);
-		TestBean tb4 = new TestBean("name4", 0);
-		TestBean tb5 = new TestBean("name5", 0);
-		TestBean tb6 = new TestBean("name6", 0);
-		TestBean tb7 = new TestBean("name7", 0);
-		TestBean tbX = new TestBean("nameX", 0);
-		TestBean tbY = new TestBean("nameY", 0);
-		this.array = new TestBean[] {tb0, tb1};
-		this.list = new ArrayList();
-		this.list.add(tb2);
-		this.list.add(tb3);
-		this.set = new TreeSet();
-		this.set.add(tb6);
-		this.set.add(tb7);
-		this.map = new HashMap();
-		this.map.put("key1", tb4);
-		this.map.put("key2", tb5);
-		this.map.put("key.3", tb5);
-		List list = new ArrayList();
-		list.add(tbX);
-		list.add(tbY);
-		this.map.put("key4", list);
-	}
-
-
-	public TestBean[] getArray() {
-		return array;
-	}
-
-	public void setArray(TestBean[] array) {
-		this.array = array;
-	}
-
-	public Collection getCollection() {
-		return collection;
-	}
-
-	public void setCollection(Collection collection) {
-		this.collection = collection;
-	}
-
-	public List getList() {
-		return list;
-	}
-
-	public void setList(List list) {
-		this.list = list;
-	}
-
-	public Set getSet() {
-		return set;
-	}
-
-	public void setSet(Set set) {
-		this.set = set;
-	}
-
-	public SortedSet getSortedSet() {
-		return sortedSet;
-	}
-
-	public void setSortedSet(SortedSet sortedSet) {
-		this.sortedSet = sortedSet;
-	}
-
-	public Map getMap() {
-		return map;
-	}
-
-	public void setMap(Map map) {
-		this.map = map;
-	}
-
-	public SortedMap getSortedMap() {
-		return sortedMap;
-	}
-
-	public void setSortedMap(SortedMap sortedMap) {
-		this.sortedMap = sortedMap;
-	}
-
-}
diff --git a/src/test/java/test/beans/NestedTestBean.java b/src/test/java/test/beans/NestedTestBean.java
deleted file mode 100644
index c6d1acd27b5..00000000000
--- a/src/test/java/test/beans/NestedTestBean.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-/**
- * Simple nested test bean used for testing bean factories, AOP framework etc.
- *
- * @author Trevor D. Cook
- * @since 30.09.2003
- */
-public class NestedTestBean implements INestedTestBean {
-
-	private String company = "";
-
-	public NestedTestBean() {
-	}
-
-	public NestedTestBean(String company) {
-		setCompany(company);
-	}
-
-	public void setCompany(String company) {
-		this.company = (company != null ? company : "");
-	}
-
-	@Override
-	public String getCompany() {
-		return company;
-	}
-
-	public boolean equals(Object obj) {
-		if (!(obj instanceof NestedTestBean)) {
-			return false;
-		}
-		NestedTestBean ntb = (NestedTestBean) obj;
-		return this.company.equals(ntb.company);
-	}
-
-	public int hashCode() {
-		return this.company.hashCode();
-	}
-
-	public String toString() {
-		return "NestedTestBean: " + this.company;
-	}
-
-}
diff --git a/src/test/java/test/beans/Pet.java b/src/test/java/test/beans/Pet.java
deleted file mode 100644
index f81ac4f0921..00000000000
--- a/src/test/java/test/beans/Pet.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-/**
- * @author Rob Harrop
- * @since 2.0
- */
-public class Pet {
-
-	private String name;
-
-	public Pet(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public String toString() {
-		return getName();
-	}
-
-	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
-
-		final Pet pet = (Pet) o;
-
-		if (name != null ? !name.equals(pet.name) : pet.name != null) return false;
-
-		return true;
-	}
-
-	public int hashCode() {
-		return (name != null ? name.hashCode() : 0);
-	}
-
-}
diff --git a/src/test/java/test/beans/TestBean.java b/src/test/java/test/beans/TestBean.java
deleted file mode 100644
index b76f12a75e8..00000000000
--- a/src/test/java/test/beans/TestBean.java
+++ /dev/null
@@ -1,457 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.beans;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.util.ObjectUtils;
-
-/**
- * Simple test bean used for testing bean factories, the AOP framework etc.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @since 15 April 2001
- */
-public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOther, Comparable {
-
-	private String beanName;
-
-	private String country;
-
-	private BeanFactory beanFactory;
-
-	private boolean postProcessed;
-
-	private String name;
-
-	private String sex;
-
-	private int age;
-
-	private boolean jedi;
-
-	private ITestBean[] spouses;
-
-	private String touchy;
-
-	private String[] stringArray;
-
-	private Integer[] someIntegerArray;
-
-	private Date date = new Date();
-
-	private Float myFloat = new Float(0.0);
-
-	private Collection friends = new LinkedList();
-
-	private Set someSet = new HashSet();
-
-	private Map someMap = new HashMap();
-
-	private List someList = new ArrayList();
-
-	private Properties someProperties = new Properties();
-
-	private INestedTestBean doctor = new NestedTestBean();
-
-	private INestedTestBean lawyer = new NestedTestBean();
-
-	private IndexedTestBean nestedIndexedBean;
-
-	private boolean destroyed;
-
-	private Number someNumber;
-
-	private Colour favouriteColour;
-
-	private Boolean someBoolean;
-
-	private List otherColours;
-
-	private List pets;
-
-
-	public TestBean() {
-	}
-
-	public TestBean(String name) {
-		this.name = name;
-	}
-
-	public TestBean(ITestBean spouse) {
-		this.spouses = new ITestBean[] {spouse};
-	}
-
-	public TestBean(String name, int age) {
-		this.name = name;
-		this.age = age;
-	}
-
-	public TestBean(ITestBean spouse, Properties someProperties) {
-		this.spouses = new ITestBean[] {spouse};
-		this.someProperties = someProperties;
-	}
-
-	public TestBean(List someList) {
-		this.someList = someList;
-	}
-
-	public TestBean(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public TestBean(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public TestBean(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-
-	@Override
-	public void setBeanName(String beanName) {
-		this.beanName = beanName;
-	}
-
-	public String getBeanName() {
-		return beanName;
-	}
-
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) {
-		this.beanFactory = beanFactory;
-	}
-
-	public BeanFactory getBeanFactory() {
-		return beanFactory;
-	}
-
-	public void setPostProcessed(boolean postProcessed) {
-		this.postProcessed = postProcessed;
-	}
-
-	public boolean isPostProcessed() {
-		return postProcessed;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getSex() {
-		return sex;
-	}
-
-	public void setSex(String sex) {
-		this.sex = sex;
-		if (this.name == null) {
-			this.name = sex;
-		}
-	}
-
-	@Override
-	public int getAge() {
-		return age;
-	}
-
-	@Override
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-	public boolean isJedi() {
-		return jedi;
-	}
-
-	public void setJedi(boolean jedi) {
-		this.jedi = jedi;
-	}
-
-	@Override
-	public ITestBean getSpouse() {
-		return (spouses != null ? spouses[0] : null);
-	}
-
-	@Override
-	public void setSpouse(ITestBean spouse) {
-		this.spouses = new ITestBean[] {spouse};
-	}
-
-	@Override
-	public ITestBean[] getSpouses() {
-		return spouses;
-	}
-
-	public String getTouchy() {
-		return touchy;
-	}
-
-	public void setTouchy(String touchy) throws Exception {
-		if (touchy.indexOf('.') != -1) {
-			throw new Exception("Can't contain a .");
-		}
-		if (touchy.indexOf(',') != -1) {
-			throw new NumberFormatException("Number format exception: contains a ,");
-		}
-		this.touchy = touchy;
-	}
-
-	public String getCountry() {
-		return country;
-	}
-
-	public void setCountry(String country) {
-		this.country = country;
-	}
-
-	@Override
-	public String[] getStringArray() {
-		return stringArray;
-	}
-
-	@Override
-	public void setStringArray(String[] stringArray) {
-		this.stringArray = stringArray;
-	}
-
-	public Integer[] getSomeIntegerArray() {
-		return someIntegerArray;
-	}
-
-	public void setSomeIntegerArray(Integer[] someIntegerArray) {
-		this.someIntegerArray = someIntegerArray;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public Float getMyFloat() {
-		return myFloat;
-	}
-
-	public void setMyFloat(Float myFloat) {
-		this.myFloat = myFloat;
-	}
-
-	public Collection getFriends() {
-		return friends;
-	}
-
-	public void setFriends(Collection friends) {
-		this.friends = friends;
-	}
-
-	public Set getSomeSet() {
-		return someSet;
-	}
-
-	public void setSomeSet(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public Map getSomeMap() {
-		return someMap;
-	}
-
-	public void setSomeMap(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public List getSomeList() {
-		return someList;
-	}
-
-	public void setSomeList(List someList) {
-		this.someList = someList;
-	}
-
-	public Properties getSomeProperties() {
-		return someProperties;
-	}
-
-	public void setSomeProperties(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-	@Override
-	public INestedTestBean getDoctor() {
-		return doctor;
-	}
-
-	public void setDoctor(INestedTestBean doctor) {
-		this.doctor = doctor;
-	}
-
-	@Override
-	public INestedTestBean getLawyer() {
-		return lawyer;
-	}
-
-	public void setLawyer(INestedTestBean lawyer) {
-		this.lawyer = lawyer;
-	}
-
-	public Number getSomeNumber() {
-		return someNumber;
-	}
-
-	public void setSomeNumber(Number someNumber) {
-		this.someNumber = someNumber;
-	}
-
-	public Colour getFavouriteColour() {
-		return favouriteColour;
-	}
-
-	public void setFavouriteColour(Colour favouriteColour) {
-		this.favouriteColour = favouriteColour;
-	}
-
-	public Boolean getSomeBoolean() {
-		return someBoolean;
-	}
-
-	public void setSomeBoolean(Boolean someBoolean) {
-		this.someBoolean = someBoolean;
-	}
-
-	@Override
-	public IndexedTestBean getNestedIndexedBean() {
-		return nestedIndexedBean;
-	}
-
-	public void setNestedIndexedBean(IndexedTestBean nestedIndexedBean) {
-		this.nestedIndexedBean = nestedIndexedBean;
-	}
-
-	public List getOtherColours() {
-		return otherColours;
-	}
-
-	public void setOtherColours(List otherColours) {
-		this.otherColours = otherColours;
-	}
-
-	public List getPets() {
-		return pets;
-	}
-
-	public void setPets(List pets) {
-		this.pets = pets;
-	}
-
-
-	/**
-	 * @see ITestBean#exceptional(Throwable)
-	 */
-	@Override
-	public void exceptional(Throwable t) throws Throwable {
-		if (t != null) {
-			throw t;
-		}
-	}
-
-	@Override
-	public void unreliableFileOperation() throws IOException {
-		throw new IOException();
-	}
-	/**
-	 * @see ITestBean#returnsThis()
-	 */
-	@Override
-	public Object returnsThis() {
-		return this;
-	}
-
-	/**
-	 * @see IOther#absquatulate()
-	 */
-	@Override
-	public void absquatulate() {
-	}
-
-	@Override
-	public int haveBirthday() {
-		return age++;
-	}
-
-
-	public void destroy() {
-		this.destroyed = true;
-	}
-
-	public boolean wasDestroyed() {
-		return destroyed;
-	}
-
-
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (other == null || !(other instanceof TestBean)) {
-			return false;
-		}
-		TestBean tb2 = (TestBean) other;
-		return (ObjectUtils.nullSafeEquals(this.name, tb2.name) && this.age == tb2.age);
-	}
-
-	public int hashCode() {
-		return this.age;
-	}
-
-	@Override
-	public int compareTo(Object other) {
-		if (this.name != null && other instanceof TestBean) {
-			return this.name.compareTo(((TestBean) other).getName());
-		}
-		else {
-			return 1;
-		}
-	}
-
-	public String toString() {
-		return this.name;
-	}
-
-}
diff --git a/src/test/java/test/interceptor/NopInterceptor.java b/src/test/java/test/interceptor/NopInterceptor.java
deleted file mode 100644
index b1cdf832a4a..00000000000
--- a/src/test/java/test/interceptor/NopInterceptor.java
+++ /dev/null
@@ -1,59 +0,0 @@
-
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.interceptor;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-
-/**
- * Trivial interceptor that can be introduced in a chain to display it.
- *
- * @author Rod Johnson
- */
-public class NopInterceptor implements MethodInterceptor {
-
-	private int count;
-
-	/**
-	 * @see org.aopalliance.intercept.MethodInterceptor#invoke(MethodInvocation)
-	 */
-	@Override
-	public Object invoke(MethodInvocation invocation) throws Throwable {
-		increment();
-		return invocation.proceed();
-	}
-
-	public int getCount() {
-		return this.count;
-	}
-
-	protected void increment() {
-		++count;
-	}
-
-	public boolean equals(Object other) {
-		if (!(other instanceof NopInterceptor)) {
-			return false;
-		}
-		if (this == other) {
-			return true;
-		}
-		return this.count == ((NopInterceptor) other).count;
-	}
-
-}
diff --git a/src/test/java/test/interceptor/SerializableNopInterceptor.java b/src/test/java/test/interceptor/SerializableNopInterceptor.java
deleted file mode 100644
index d2fbdc584af..00000000000
--- a/src/test/java/test/interceptor/SerializableNopInterceptor.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.interceptor;
-
-import java.io.Serializable;
-
-
-/**
- * Subclass of NopInterceptor that is serializable and
- * can be used to test proxy serialization.
- *
- * @author Rod Johnson
- */
-@SuppressWarnings("serial")
-public class SerializableNopInterceptor extends NopInterceptor implements Serializable {
-
-	/**
-	 * We must override this field and the related methods as
-	 * otherwise count won't be serialized from the non-serializable
-	 * NopInterceptor superclass.
-	 */
-	private int count;
-
-	@Override
-	public int getCount() {
-		return this.count;
-	}
-
-	@Override
-	protected void increment() {
-		++count;
-	}
-
-}
\ No newline at end of file
diff --git a/src/test/java/test/util/SerializationTestUtils.java b/src/test/java/test/util/SerializationTestUtils.java
deleted file mode 100644
index e9bc9fee04a..00000000000
--- a/src/test/java/test/util/SerializationTestUtils.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.util;
-
-import java.awt.*;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.NotSerializableException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-
-import static org.junit.Assert.*;
-import org.junit.Test;
-import test.beans.TestBean;
-
-/**
- * Utilities for testing serializability of objects.
- * Exposes static methods for use in other test cases.
- * Contains {@link org.junit.Test} methods to test itself.
- *
- * @author Rod Johnson
- * @author Chris Beams
- */
-public final class SerializationTestUtils {
-
-	public static void testSerialization(Object o) throws IOException {
-		OutputStream baos = new ByteArrayOutputStream();
-		ObjectOutputStream oos = new ObjectOutputStream(baos);
-		oos.writeObject(o);
-	}
-
-	public static boolean isSerializable(Object o) throws IOException {
-		try {
-			testSerialization(o);
-			return true;
-		}
-		catch (NotSerializableException ex) {
-			return false;
-		}
-	}
-
-	public static Object serializeAndDeserialize(Object o) throws IOException, ClassNotFoundException {
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ObjectOutputStream oos = new ObjectOutputStream(baos);
-		oos.writeObject(o);
-		oos.flush();
-		baos.flush();
-		byte[] bytes = baos.toByteArray();
-
-		ByteArrayInputStream is = new ByteArrayInputStream(bytes);
-		ObjectInputStream ois = new ObjectInputStream(is);
-		Object o2 = ois.readObject();
-		return o2;
-	}
-
-
-	@Test(expected=NotSerializableException.class)
-	public void testWithNonSerializableObject() throws IOException {
-		TestBean o = new TestBean();
-		assertFalse(o instanceof Serializable);
-		assertFalse(isSerializable(o));
-
-		testSerialization(o);
-	}
-
-	@Test
-	public void testWithSerializableObject() throws Exception {
-		int x = 5;
-		int y = 10;
-		Point p = new Point(x, y);
-		assertTrue(p instanceof Serializable);
-
-		testSerialization(p);
-
-		assertTrue(isSerializable(p));
-
-		Point p2 = (Point) serializeAndDeserialize(p);
-		assertNotSame(p, p2);
-		assertEquals(x, (int) p2.getX());
-		assertEquals(y, (int) p2.getY());
-	}
-
-}

From d1e6dbe74aea3503181f87b1879d925b3c80490b Mon Sep 17 00:00:00 2001
From: Chris Beams 
Date: Fri, 4 Jan 2013 10:29:11 +0100
Subject: [PATCH 34/34] Update Apache license headers for affected sources

---
 .../springframework/cache/aspectj/AspectJAnnotationTests.java   | 2 +-
 .../springframework/scheduling/quartz/QuartzSupportTests.java   | 2 +-
 .../org/springframework/aop/aspectj/DeclareParentsTests.java    | 2 +-
 .../scripting/groovy/GroovyScriptFactoryTests.java              | 2 +-
 .../scripting/jruby/JRubyScriptFactoryTests.java                | 2 +-
 .../test/java/org/springframework/core/ConventionsTests.java    | 2 +-
 .../core/GenericCollectionTypeResolverTests.java                | 2 +-
 .../core/LocalVariableTableParameterNameDiscovererTests.java    | 2 +-
 .../core/PrioritizedParameterNameDiscovererTests.java           | 2 +-
 .../test/java/org/springframework/core/type/TestAutowired.java  | 2 +-
 .../test/java/org/springframework/core/type/TestQualifier.java  | 2 +-
 .../test/java/org/springframework/tests/TestResourceUtils.java  | 2 +-
 .../src/test/java/org/springframework/tests/TimeStamped.java    | 2 +-
 .../java/org/springframework/util/AutoPopulatingListTests.java  | 2 +-
 .../src/test/java/org/springframework/util/ClassUtilsTests.java | 2 +-
 .../java/org/springframework/util/ReflectionUtilsTests.java     | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTests.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTests.java
index 43af45e80df..c85d84d0833 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTests.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AspectJAnnotationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
index 5c0cc1c0e3c..a5160ac464e 100644
--- a/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
+++ b/spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
index 145617f07a4..18c49440c4e 100644
--- a/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/aspectj/DeclareParentsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
index e472a7064ee..2d92b357d98 100644
--- a/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/groovy/GroovyScriptFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java b/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
index 8071e6309e7..1a27e4a0997 100644
--- a/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/scripting/jruby/JRubyScriptFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-core/src/test/java/org/springframework/core/ConventionsTests.java b/spring-core/src/test/java/org/springframework/core/ConventionsTests.java
index b906164710c..cdc94380d02 100644
--- a/spring-core/src/test/java/org/springframework/core/ConventionsTests.java
+++ b/spring-core/src/test/java/org/springframework/core/ConventionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java
index c5982691377..08fbaa96a26 100644
--- a/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java
+++ b/spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
index a1515713792..bc659f61d4b 100644
--- a/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
+++ b/spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java b/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java
index cd16ed0446d..19c16d1512d 100644
--- a/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java
+++ b/spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-core/src/test/java/org/springframework/core/type/TestAutowired.java b/spring-core/src/test/java/org/springframework/core/type/TestAutowired.java
index 28000349fa0..c1a1b1d2184 100644
--- a/spring-core/src/test/java/org/springframework/core/type/TestAutowired.java
+++ b/spring-core/src/test/java/org/springframework/core/type/TestAutowired.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-core/src/test/java/org/springframework/core/type/TestQualifier.java b/spring-core/src/test/java/org/springframework/core/type/TestQualifier.java
index d33d044db86..9698ec71518 100644
--- a/spring-core/src/test/java/org/springframework/core/type/TestQualifier.java
+++ b/spring-core/src/test/java/org/springframework/core/type/TestQualifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-core/src/test/java/org/springframework/tests/TestResourceUtils.java b/spring-core/src/test/java/org/springframework/tests/TestResourceUtils.java
index 9958110f3c3..93aab194489 100644
--- a/spring-core/src/test/java/org/springframework/tests/TestResourceUtils.java
+++ b/spring-core/src/test/java/org/springframework/tests/TestResourceUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-core/src/test/java/org/springframework/tests/TimeStamped.java b/spring-core/src/test/java/org/springframework/tests/TimeStamped.java
index 60042247b74..ad653a50d9b 100644
--- a/spring-core/src/test/java/org/springframework/tests/TimeStamped.java
+++ b/spring-core/src/test/java/org/springframework/tests/TimeStamped.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
index 460e81b297b..550b826f9c7 100644
--- a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
+++ b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
index f99216bbbef..f4078360de6 100644
--- a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
index 44025a090f1..6b791a154be 100644
--- a/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.