Rename modules {org.springframework.*=>spring-*}

This renaming more intuitively expresses the relationship between subprojects and the JAR artifacts they produce. Tracking history across these renames is possible, but it requires use of the --follow flag to `git log`, for example $ git log spring-aop/src/main/java/org/springframework/aop/Advisor.java will show history up until the renaming event, where $ git log --follow spring-aop/src/main/java/org/springframework/aop/Advisor.java will show history for all changes to the file, before and after the renaming. See http://chrisbeams.com/git-diff-across-renamed-directories
rgielen · Jan 31, 2012 · 02a4473 · 02a4473
1 parent b6cb514
commit 02a4473
Show file tree

Hide file tree

Showing 5,671 changed files with 20 additions and 32 deletions.
diff --git a/settings.gradle b/settings.gradle
@@ -1,34 +1,22 @@
 rootProject.name = 'spring'
 
-include 'org.springframework.core'
-include 'org.springframework.asm'
-include 'org.springframework.beans'
-include 'org.springframework.aop'
-include 'org.springframework.expression'
-include 'org.springframework.instrument'
-include 'org.springframework.instrument.tomcat'
-include 'org.springframework.context'
-include 'org.springframework.transaction'
-include 'org.springframework.oxm'
-include 'org.springframework.jms'
-include 'org.springframework.jdbc'
-include 'org.springframework.context.support'
-include 'org.springframework.web'
-include 'org.springframework.orm'
-include 'org.springframework.web.servlet'
-include 'org.springframework.test'
-include 'org.springframework.web.portlet'
-include 'org.springframework.web.struts'
-include 'org.springframework.aspects'
-
-// transform project names to maven-central artifact naming
-// e.g.: org.springframework.context.support => spring-context-support
-rootProject.children.each { project ->
-    project.name = project.name.replace('org.springframework', 'spring').replace('.', '-')
-}
-
-// special cases
-project(":spring-transaction").name = 'spring-tx'
-project(":spring-web-servlet").name = 'spring-webmvc'
-project(":spring-web-portlet").name = 'spring-webmvc-portlet'
-project(":spring-web-struts").name = 'spring-struts'
+include 'spring-aop'
+include 'spring-asm'
+include 'spring-aspects'
+include 'spring-beans'
+include 'spring-context'
+include 'spring-context-support'
+include 'spring-core'
+include 'spring-expression'
+include 'spring-instrument'
+include 'spring-instrument-tomcat'
+include 'spring-jdbc'
+include 'spring-jms'
+include 'spring-orm'
+include 'spring-oxm'
+include 'spring-struts'
+include 'spring-test'
+include 'spring-tx'
+include 'spring-web'
+include 'spring-webmvc'
+include 'spring-webmvc-portlet'
diff --git a/...java/org/springframework/aop/Advisor.java → ...java/org/springframework/aop/Advisor.java b/...java/org/springframework/aop/Advisor.java → ...java/org/springframework/aop/Advisor.java
diff --git a/.../org/springframework/aop/AfterAdvice.java → .../org/springframework/aop/AfterAdvice.java b/.../org/springframework/aop/AfterAdvice.java → .../org/springframework/aop/AfterAdvice.java
diff --git a/...ngframework/aop/AfterReturningAdvice.java → ...ngframework/aop/AfterReturningAdvice.java b/...ngframework/aop/AfterReturningAdvice.java → ...ngframework/aop/AfterReturningAdvice.java
diff --git a/...framework/aop/AopInvocationException.java → ...framework/aop/AopInvocationException.java b/...framework/aop/AopInvocationException.java → ...framework/aop/AopInvocationException.java
diff --git a/...org/springframework/aop/BeforeAdvice.java → ...org/springframework/aop/BeforeAdvice.java b/...org/springframework/aop/BeforeAdvice.java → ...org/springframework/aop/BeforeAdvice.java
diff --git a/.../org/springframework/aop/ClassFilter.java → .../org/springframework/aop/ClassFilter.java b/.../org/springframework/aop/ClassFilter.java → .../org/springframework/aop/ClassFilter.java
diff --git a/...mework/aop/DynamicIntroductionAdvice.java → ...mework/aop/DynamicIntroductionAdvice.java b/...mework/aop/DynamicIntroductionAdvice.java → ...mework/aop/DynamicIntroductionAdvice.java
diff --git a/...ingframework/aop/IntroductionAdvisor.java → ...ingframework/aop/IntroductionAdvisor.java b/...ingframework/aop/IntroductionAdvisor.java → ...ingframework/aop/IntroductionAdvisor.java
diff --git a/...k/aop/IntroductionAwareMethodMatcher.java → ...k/aop/IntroductionAwareMethodMatcher.java b/...k/aop/IntroductionAwareMethodMatcher.java → ...k/aop/IntroductionAwareMethodMatcher.java
diff --git a/...springframework/aop/IntroductionInfo.java → ...springframework/aop/IntroductionInfo.java b/...springframework/aop/IntroductionInfo.java → ...springframework/aop/IntroductionInfo.java
diff --git a/...ramework/aop/IntroductionInterceptor.java → ...ramework/aop/IntroductionInterceptor.java b/...ramework/aop/IntroductionInterceptor.java → ...ramework/aop/IntroductionInterceptor.java
diff --git a/...ringframework/aop/MethodBeforeAdvice.java → ...ringframework/aop/MethodBeforeAdvice.java b/...ringframework/aop/MethodBeforeAdvice.java → ...ringframework/aop/MethodBeforeAdvice.java
diff --git a/...rg/springframework/aop/MethodMatcher.java → ...rg/springframework/aop/MethodMatcher.java b/...rg/springframework/aop/MethodMatcher.java → ...rg/springframework/aop/MethodMatcher.java
diff --git a/...ava/org/springframework/aop/Pointcut.java → ...ava/org/springframework/aop/Pointcut.java b/...ava/org/springframework/aop/Pointcut.java → ...ava/org/springframework/aop/Pointcut.java
diff --git a/.../springframework/aop/PointcutAdvisor.java → .../springframework/aop/PointcutAdvisor.java b/.../springframework/aop/PointcutAdvisor.java → .../springframework/aop/PointcutAdvisor.java
diff --git a/...gframework/aop/ProxyMethodInvocation.java → ...gframework/aop/ProxyMethodInvocation.java b/...gframework/aop/ProxyMethodInvocation.java → ...gframework/aop/ProxyMethodInvocation.java
diff --git a/.../springframework/aop/RawTargetAccess.java → .../springframework/aop/RawTargetAccess.java b/.../springframework/aop/RawTargetAccess.java → .../springframework/aop/RawTargetAccess.java
diff --git a/.../org/springframework/aop/SpringProxy.java → .../org/springframework/aop/SpringProxy.java b/.../org/springframework/aop/SpringProxy.java → .../org/springframework/aop/SpringProxy.java
diff --git a/...springframework/aop/TargetClassAware.java → ...springframework/aop/TargetClassAware.java b/...springframework/aop/TargetClassAware.java → ...springframework/aop/TargetClassAware.java
diff --git a/...org/springframework/aop/TargetSource.java → ...org/springframework/aop/TargetSource.java b/...org/springframework/aop/TargetSource.java → ...org/springframework/aop/TargetSource.java
diff --git a/...org/springframework/aop/ThrowsAdvice.java → ...org/springframework/aop/ThrowsAdvice.java b/...org/springframework/aop/ThrowsAdvice.java → ...org/springframework/aop/ThrowsAdvice.java
diff --git a/.../springframework/aop/TrueClassFilter.java → .../springframework/aop/TrueClassFilter.java b/.../springframework/aop/TrueClassFilter.java → .../springframework/aop/TrueClassFilter.java
diff --git a/...pringframework/aop/TrueMethodMatcher.java → ...pringframework/aop/TrueMethodMatcher.java b/...pringframework/aop/TrueMethodMatcher.java → ...pringframework/aop/TrueMethodMatcher.java
diff --git a/...org/springframework/aop/TruePointcut.java → ...org/springframework/aop/TruePointcut.java b/...org/springframework/aop/TruePointcut.java → ...org/springframework/aop/TruePointcut.java
diff --git a/...rk/aop/aspectj/AbstractAspectJAdvice.java → ...rk/aop/aspectj/AbstractAspectJAdvice.java b/...rk/aop/aspectj/AbstractAspectJAdvice.java → ...rk/aop/aspectj/AbstractAspectJAdvice.java
diff --git a/...rk/aop/aspectj/AspectInstanceFactory.java → ...rk/aop/aspectj/AspectInstanceFactory.java b/...rk/aop/aspectj/AspectInstanceFactory.java → ...rk/aop/aspectj/AspectInstanceFactory.java
diff --git a/...AspectJAdviceParameterNameDiscoverer.java → ...AspectJAdviceParameterNameDiscoverer.java b/...AspectJAdviceParameterNameDiscoverer.java → ...AspectJAdviceParameterNameDiscoverer.java
diff --git a/...ework/aop/aspectj/AspectJAfterAdvice.java → ...ework/aop/aspectj/AspectJAfterAdvice.java b/...ework/aop/aspectj/AspectJAfterAdvice.java → ...ework/aop/aspectj/AspectJAfterAdvice.java
diff --git a/.../aspectj/AspectJAfterReturningAdvice.java → .../aspectj/AspectJAfterReturningAdvice.java b/.../aspectj/AspectJAfterReturningAdvice.java → .../aspectj/AspectJAfterReturningAdvice.java
diff --git a/...p/aspectj/AspectJAfterThrowingAdvice.java → ...p/aspectj/AspectJAfterThrowingAdvice.java b/...p/aspectj/AspectJAfterThrowingAdvice.java → ...p/aspectj/AspectJAfterThrowingAdvice.java
diff --git a/...ramework/aop/aspectj/AspectJAopUtils.java → ...ramework/aop/aspectj/AspectJAopUtils.java b/...ramework/aop/aspectj/AspectJAopUtils.java → ...ramework/aop/aspectj/AspectJAopUtils.java
diff --git a/...work/aop/aspectj/AspectJAroundAdvice.java → ...work/aop/aspectj/AspectJAroundAdvice.java b/...work/aop/aspectj/AspectJAroundAdvice.java → ...work/aop/aspectj/AspectJAroundAdvice.java
diff --git a/...op/aspectj/AspectJExpressionPointcut.java → ...op/aspectj/AspectJExpressionPointcut.java b/...op/aspectj/AspectJExpressionPointcut.java → ...op/aspectj/AspectJExpressionPointcut.java
diff --git a/...ctj/AspectJExpressionPointcutAdvisor.java → ...ctj/AspectJExpressionPointcutAdvisor.java b/...ctj/AspectJExpressionPointcutAdvisor.java → ...ctj/AspectJExpressionPointcutAdvisor.java
diff --git a/...op/aspectj/AspectJMethodBeforeAdvice.java → ...op/aspectj/AspectJMethodBeforeAdvice.java b/...op/aspectj/AspectJMethodBeforeAdvice.java → ...op/aspectj/AspectJMethodBeforeAdvice.java
diff --git a/...k/aop/aspectj/AspectJPointcutAdvisor.java → ...k/aop/aspectj/AspectJPointcutAdvisor.java b/...k/aop/aspectj/AspectJPointcutAdvisor.java → ...k/aop/aspectj/AspectJPointcutAdvisor.java
diff --git a/...aspectj/AspectJPrecedenceInformation.java → ...aspectj/AspectJPrecedenceInformation.java b/...aspectj/AspectJPrecedenceInformation.java → ...aspectj/AspectJPrecedenceInformation.java
diff --git a/...mework/aop/aspectj/AspectJProxyUtils.java → ...mework/aop/aspectj/AspectJProxyUtils.java b/...mework/aop/aspectj/AspectJProxyUtils.java → ...mework/aop/aspectj/AspectJProxyUtils.java
diff --git a/.../aspectj/AspectJWeaverMessageHandler.java → .../aspectj/AspectJWeaverMessageHandler.java b/.../aspectj/AspectJWeaverMessageHandler.java → .../aspectj/AspectJWeaverMessageHandler.java
diff --git a/...rk/aop/aspectj/DeclareParentsAdvisor.java → ...rk/aop/aspectj/DeclareParentsAdvisor.java b/...rk/aop/aspectj/DeclareParentsAdvisor.java → ...rk/aop/aspectj/DeclareParentsAdvisor.java
diff --git a/...stantiationModelAwarePointcutAdvisor.java → ...stantiationModelAwarePointcutAdvisor.java b/...stantiationModelAwarePointcutAdvisor.java → ...stantiationModelAwarePointcutAdvisor.java
diff --git a/.../MethodInvocationProceedingJoinPoint.java → .../MethodInvocationProceedingJoinPoint.java b/.../MethodInvocationProceedingJoinPoint.java → .../MethodInvocationProceedingJoinPoint.java
diff --git a/...mework/aop/aspectj/RuntimeTestWalker.java → ...mework/aop/aspectj/RuntimeTestWalker.java b/...mework/aop/aspectj/RuntimeTestWalker.java → ...mework/aop/aspectj/RuntimeTestWalker.java
diff --git a/.../aspectj/SimpleAspectInstanceFactory.java → .../aspectj/SimpleAspectInstanceFactory.java b/.../aspectj/SimpleAspectInstanceFactory.java → .../aspectj/SimpleAspectInstanceFactory.java
diff --git a/...pectj/SingletonAspectInstanceFactory.java → ...pectj/SingletonAspectInstanceFactory.java b/...pectj/SingletonAspectInstanceFactory.java → ...pectj/SingletonAspectInstanceFactory.java
diff --git a/...k/aop/aspectj/TypePatternClassFilter.java → ...k/aop/aspectj/TypePatternClassFilter.java b/...k/aop/aspectj/TypePatternClassFilter.java → ...k/aop/aspectj/TypePatternClassFilter.java
diff --git a/...tation/AbstractAspectJAdvisorFactory.java → ...tation/AbstractAspectJAdvisorFactory.java b/...tation/AbstractAspectJAdvisorFactory.java → ...tation/AbstractAspectJAdvisorFactory.java
diff --git a/...notationAwareAspectJAutoProxyCreator.java → ...notationAwareAspectJAutoProxyCreator.java b/...notationAwareAspectJAutoProxyCreator.java → ...notationAwareAspectJAutoProxyCreator.java
diff --git a/...ctj/annotation/AspectJAdvisorFactory.java → ...ctj/annotation/AspectJAdvisorFactory.java b/...ctj/annotation/AspectJAdvisorFactory.java → ...ctj/annotation/AspectJAdvisorFactory.java
diff --git a/...pectj/annotation/AspectJProxyFactory.java → ...pectj/annotation/AspectJProxyFactory.java b/...pectj/annotation/AspectJProxyFactory.java → ...pectj/annotation/AspectJProxyFactory.java
diff --git a/...op/aspectj/annotation/AspectMetadata.java → ...op/aspectj/annotation/AspectMetadata.java b/...op/aspectj/annotation/AspectMetadata.java → ...op/aspectj/annotation/AspectMetadata.java
diff --git a/...ion/BeanFactoryAspectInstanceFactory.java → ...ion/BeanFactoryAspectInstanceFactory.java b/...ion/BeanFactoryAspectInstanceFactory.java → ...ion/BeanFactoryAspectInstanceFactory.java
diff --git a/...on/BeanFactoryAspectJAdvisorsBuilder.java → ...on/BeanFactoryAspectJAdvisorsBuilder.java b/...on/BeanFactoryAspectJAdvisorsBuilder.java → ...on/BeanFactoryAspectJAdvisorsBuilder.java
diff --git a/...tiationModelAwarePointcutAdvisorImpl.java → ...tiationModelAwarePointcutAdvisorImpl.java b/...tiationModelAwarePointcutAdvisorImpl.java → ...tiationModelAwarePointcutAdvisorImpl.java
diff --git a/...gletonAspectInstanceFactoryDecorator.java → ...gletonAspectInstanceFactoryDecorator.java b/...gletonAspectInstanceFactoryDecorator.java → ...gletonAspectInstanceFactoryDecorator.java
diff --git a/...n/MetadataAwareAspectInstanceFactory.java → ...n/MetadataAwareAspectInstanceFactory.java b/...n/MetadataAwareAspectInstanceFactory.java → ...n/MetadataAwareAspectInstanceFactory.java
diff --git a/...tj/annotation/NotAnAtAspectException.java → ...tj/annotation/NotAnAtAspectException.java b/...tj/annotation/NotAnAtAspectException.java → ...tj/annotation/NotAnAtAspectException.java
diff --git a/...ation/PrototypeAspectInstanceFactory.java → ...ation/PrototypeAspectInstanceFactory.java b/...ation/PrototypeAspectInstanceFactory.java → ...ation/PrototypeAspectInstanceFactory.java
diff --git a/...tion/ReflectiveAspectJAdvisorFactory.java → ...tion/ReflectiveAspectJAdvisorFactory.java b/...tion/ReflectiveAspectJAdvisorFactory.java → ...tion/ReflectiveAspectJAdvisorFactory.java
diff --git a/...leMetadataAwareAspectInstanceFactory.java → ...leMetadataAwareAspectInstanceFactory.java b/...leMetadataAwareAspectInstanceFactory.java → ...leMetadataAwareAspectInstanceFactory.java
diff --git a/...onMetadataAwareAspectInstanceFactory.java → ...onMetadataAwareAspectInstanceFactory.java b/...onMetadataAwareAspectInstanceFactory.java → ...onMetadataAwareAspectInstanceFactory.java
diff --git a/.../aop/aspectj/annotation/package-info.java → .../aop/aspectj/annotation/package-info.java b/.../aop/aspectj/annotation/package-info.java → .../aop/aspectj/annotation/package-info.java
diff --git a/.../AspectJAwareAdvisorAutoProxyCreator.java → .../AspectJAwareAdvisorAutoProxyCreator.java b/.../AspectJAwareAdvisorAutoProxyCreator.java → .../AspectJAwareAdvisorAutoProxyCreator.java
diff --git a/...utoproxy/AspectJPrecedenceComparator.java → ...utoproxy/AspectJPrecedenceComparator.java b/...utoproxy/AspectJPrecedenceComparator.java → ...utoproxy/AspectJPrecedenceComparator.java
diff --git a/...k/aop/aspectj/autoproxy/package-info.java → ...k/aop/aspectj/autoproxy/package-info.java b/...k/aop/aspectj/autoproxy/package-info.java → ...k/aop/aspectj/autoproxy/package-info.java
diff --git a/...ngframework/aop/aspectj/package-info.java → ...ngframework/aop/aspectj/package-info.java b/...ngframework/aop/aspectj/package-info.java → ...ngframework/aop/aspectj/package-info.java
diff --git a/...rceptorDrivenBeanDefinitionDecorator.java → ...rceptorDrivenBeanDefinitionDecorator.java b/...rceptorDrivenBeanDefinitionDecorator.java → ...rceptorDrivenBeanDefinitionDecorator.java
diff --git a/...ringframework/aop/config/AdviceEntry.java → ...ringframework/aop/config/AdviceEntry.java b/...ringframework/aop/config/AdviceEntry.java → ...ringframework/aop/config/AdviceEntry.java
diff --git a/...op/config/AdvisorComponentDefinition.java → ...op/config/AdvisorComponentDefinition.java b/...op/config/AdvisorComponentDefinition.java → ...op/config/AdvisorComponentDefinition.java
diff --git a/...ingframework/aop/config/AdvisorEntry.java → ...ingframework/aop/config/AdvisorEntry.java b/...ingframework/aop/config/AdvisorEntry.java → ...ingframework/aop/config/AdvisorEntry.java
diff --git a/...gframework/aop/config/AopConfigUtils.java → ...gframework/aop/config/AopConfigUtils.java b/...gframework/aop/config/AopConfigUtils.java → ...gframework/aop/config/AopConfigUtils.java
diff --git a/...ework/aop/config/AopNamespaceHandler.java → ...ework/aop/config/AopNamespaceHandler.java b/...ework/aop/config/AopNamespaceHandler.java → ...ework/aop/config/AopNamespaceHandler.java
diff --git a/...amework/aop/config/AopNamespaceUtils.java → ...amework/aop/config/AopNamespaceUtils.java b/...amework/aop/config/AopNamespaceUtils.java → ...amework/aop/config/AopNamespaceUtils.java
diff --git a/...aop/config/AspectComponentDefinition.java → ...aop/config/AspectComponentDefinition.java b/...aop/config/AspectComponentDefinition.java → ...aop/config/AspectComponentDefinition.java
diff --git a/...ringframework/aop/config/AspectEntry.java → ...ringframework/aop/config/AspectEntry.java b/...ringframework/aop/config/AspectEntry.java → ...ringframework/aop/config/AspectEntry.java
diff --git a/...AspectJAutoProxyBeanDefinitionParser.java → ...AspectJAutoProxyBeanDefinitionParser.java b/...AspectJAutoProxyBeanDefinitionParser.java → ...AspectJAutoProxyBeanDefinitionParser.java
diff --git a/...op/config/ConfigBeanDefinitionParser.java → ...op/config/ConfigBeanDefinitionParser.java b/...op/config/ConfigBeanDefinitionParser.java → ...op/config/ConfigBeanDefinitionParser.java
diff --git a/...aop/config/MethodLocatingFactoryBean.java → ...aop/config/MethodLocatingFactoryBean.java b/...aop/config/MethodLocatingFactoryBean.java → ...aop/config/MethodLocatingFactoryBean.java
diff --git a/...p/config/PointcutComponentDefinition.java → ...p/config/PointcutComponentDefinition.java b/...p/config/PointcutComponentDefinition.java → ...p/config/PointcutComponentDefinition.java
diff --git a/...ngframework/aop/config/PointcutEntry.java → ...ngframework/aop/config/PointcutEntry.java b/...ngframework/aop/config/PointcutEntry.java → ...ngframework/aop/config/PointcutEntry.java
diff --git a/...g/ScopedProxyBeanDefinitionDecorator.java → ...g/ScopedProxyBeanDefinitionDecorator.java b/...g/ScopedProxyBeanDefinitionDecorator.java → ...g/ScopedProxyBeanDefinitionDecorator.java
diff --git a/...eanFactoryAwareAspectInstanceFactory.java → ...eanFactoryAwareAspectInstanceFactory.java b/...eanFactoryAwareAspectInstanceFactory.java → ...eanFactoryAwareAspectInstanceFactory.java
diff --git a/...SpringConfiguredBeanDefinitionParser.java → ...SpringConfiguredBeanDefinitionParser.java b/...SpringConfiguredBeanDefinitionParser.java → ...SpringConfiguredBeanDefinitionParser.java
diff --git a/...ingframework/aop/config/package-info.java → ...ingframework/aop/config/package-info.java b/...ingframework/aop/config/package-info.java → ...ingframework/aop/config/package-info.java
diff --git a/...rk/AbstractSingletonProxyFactoryBean.java → ...rk/AbstractSingletonProxyFactoryBean.java b/...rk/AbstractSingletonProxyFactoryBean.java → ...rk/AbstractSingletonProxyFactoryBean.java
diff --git a/...pringframework/aop/framework/Advised.java → ...pringframework/aop/framework/Advised.java b/...pringframework/aop/framework/Advised.java → ...pringframework/aop/framework/Advised.java
diff --git a/...amework/aop/framework/AdvisedSupport.java → ...amework/aop/framework/AdvisedSupport.java b/...amework/aop/framework/AdvisedSupport.java → ...amework/aop/framework/AdvisedSupport.java
diff --git a/...aop/framework/AdvisedSupportListener.java → ...aop/framework/AdvisedSupportListener.java b/...aop/framework/AdvisedSupportListener.java → ...aop/framework/AdvisedSupportListener.java
diff --git a/...rk/aop/framework/AdvisorChainFactory.java → ...rk/aop/framework/AdvisorChainFactory.java b/...rk/aop/framework/AdvisorChainFactory.java → ...rk/aop/framework/AdvisorChainFactory.java
diff --git a/...ork/aop/framework/AopConfigException.java → ...ork/aop/framework/AopConfigException.java b/...ork/aop/framework/AopConfigException.java → ...ork/aop/framework/AopConfigException.java
diff --git a/...ngframework/aop/framework/AopContext.java → ...ngframework/aop/framework/AopContext.java b/...ngframework/aop/framework/AopContext.java → ...ngframework/aop/framework/AopContext.java
diff --git a/.../aop/framework/AopInfrastructureBean.java → .../aop/framework/AopInfrastructureBean.java b/.../aop/framework/AopInfrastructureBean.java → .../aop/framework/AopInfrastructureBean.java
diff --git a/...ringframework/aop/framework/AopProxy.java → ...ringframework/aop/framework/AopProxy.java b/...ringframework/aop/framework/AopProxy.java → ...ringframework/aop/framework/AopProxy.java
diff --git a/...mework/aop/framework/AopProxyFactory.java → ...mework/aop/framework/AopProxyFactory.java b/...mework/aop/framework/AopProxyFactory.java → ...mework/aop/framework/AopProxyFactory.java
diff --git a/...ramework/aop/framework/AopProxyUtils.java → ...ramework/aop/framework/AopProxyUtils.java b/...ramework/aop/framework/AopProxyUtils.java → ...ramework/aop/framework/AopProxyUtils.java
diff --git a/...amework/aop/framework/Cglib2AopProxy.java → ...amework/aop/framework/Cglib2AopProxy.java b/...amework/aop/framework/Cglib2AopProxy.java → ...amework/aop/framework/Cglib2AopProxy.java
diff --git a/...framework/DefaultAdvisorChainFactory.java → ...framework/DefaultAdvisorChainFactory.java b/...framework/DefaultAdvisorChainFactory.java → ...framework/DefaultAdvisorChainFactory.java
diff --git a/...aop/framework/DefaultAopProxyFactory.java → ...aop/framework/DefaultAopProxyFactory.java b/...aop/framework/DefaultAopProxyFactory.java → ...aop/framework/DefaultAopProxyFactory.java
diff --git a/...k/InterceptorAndDynamicMethodMatcher.java → ...k/InterceptorAndDynamicMethodMatcher.java b/...k/InterceptorAndDynamicMethodMatcher.java → ...k/InterceptorAndDynamicMethodMatcher.java
diff --git a/...ork/aop/framework/JdkDynamicAopProxy.java → ...ork/aop/framework/JdkDynamicAopProxy.java b/...ork/aop/framework/JdkDynamicAopProxy.java → ...ork/aop/framework/JdkDynamicAopProxy.java
diff --git a/...gframework/aop/framework/ProxyConfig.java → ...gframework/aop/framework/ProxyConfig.java b/...gframework/aop/framework/ProxyConfig.java → ...gframework/aop/framework/ProxyConfig.java
diff --git a/...rk/aop/framework/ProxyCreatorSupport.java → ...rk/aop/framework/ProxyCreatorSupport.java b/...rk/aop/framework/ProxyCreatorSupport.java → ...rk/aop/framework/ProxyCreatorSupport.java
diff --git a/...framework/aop/framework/ProxyFactory.java → ...framework/aop/framework/ProxyFactory.java b/...framework/aop/framework/ProxyFactory.java → ...framework/aop/framework/ProxyFactory.java
diff --git a/...ework/aop/framework/ProxyFactoryBean.java → ...ework/aop/framework/ProxyFactoryBean.java b/...ework/aop/framework/ProxyFactoryBean.java → ...ework/aop/framework/ProxyFactoryBean.java
diff --git a/...framework/ReflectiveMethodInvocation.java → ...framework/ReflectiveMethodInvocation.java b/...framework/ReflectiveMethodInvocation.java → ...framework/ReflectiveMethodInvocation.java
diff --git a/...aop/framework/adapter/AdvisorAdapter.java → ...aop/framework/adapter/AdvisorAdapter.java b/...aop/framework/adapter/AdvisorAdapter.java → ...aop/framework/adapter/AdvisorAdapter.java
diff --git a/...er/AdvisorAdapterRegistrationManager.java → ...er/AdvisorAdapterRegistrationManager.java b/...er/AdvisorAdapterRegistrationManager.java → ...er/AdvisorAdapterRegistrationManager.java
diff --git a/...ework/adapter/AdvisorAdapterRegistry.java → ...ework/adapter/AdvisorAdapterRegistry.java b/...ework/adapter/AdvisorAdapterRegistry.java → ...ework/adapter/AdvisorAdapterRegistry.java
diff --git a/.../adapter/AfterReturningAdviceAdapter.java → .../adapter/AfterReturningAdviceAdapter.java b/.../adapter/AfterReturningAdviceAdapter.java → .../adapter/AfterReturningAdviceAdapter.java
diff --git a/...pter/AfterReturningAdviceInterceptor.java → ...pter/AfterReturningAdviceInterceptor.java b/...pter/AfterReturningAdviceInterceptor.java → ...pter/AfterReturningAdviceInterceptor.java
diff --git a/...dapter/DefaultAdvisorAdapterRegistry.java → ...dapter/DefaultAdvisorAdapterRegistry.java b/...dapter/DefaultAdvisorAdapterRegistry.java → ...dapter/DefaultAdvisorAdapterRegistry.java
diff --git a/...adapter/GlobalAdvisorAdapterRegistry.java → ...adapter/GlobalAdvisorAdapterRegistry.java b/...adapter/GlobalAdvisorAdapterRegistry.java → ...adapter/GlobalAdvisorAdapterRegistry.java
diff --git a/...rk/adapter/MethodBeforeAdviceAdapter.java → ...rk/adapter/MethodBeforeAdviceAdapter.java b/...rk/adapter/MethodBeforeAdviceAdapter.java → ...rk/adapter/MethodBeforeAdviceAdapter.java
diff --git a/...dapter/MethodBeforeAdviceInterceptor.java → ...dapter/MethodBeforeAdviceInterceptor.java b/...dapter/MethodBeforeAdviceInterceptor.java → ...dapter/MethodBeforeAdviceInterceptor.java
diff --git a/...ramework/adapter/ThrowsAdviceAdapter.java → ...ramework/adapter/ThrowsAdviceAdapter.java b/...ramework/adapter/ThrowsAdviceAdapter.java → ...ramework/adapter/ThrowsAdviceAdapter.java
diff --git a/...work/adapter/ThrowsAdviceInterceptor.java → ...work/adapter/ThrowsAdviceInterceptor.java b/...work/adapter/ThrowsAdviceInterceptor.java → ...work/adapter/ThrowsAdviceInterceptor.java
diff --git a/...k/adapter/UnknownAdviceTypeException.java → ...k/adapter/UnknownAdviceTypeException.java b/...k/adapter/UnknownAdviceTypeException.java → ...k/adapter/UnknownAdviceTypeException.java
diff --git a/...k/aop/framework/adapter/package-info.java → ...k/aop/framework/adapter/package-info.java b/...k/aop/framework/adapter/package-info.java → ...k/aop/framework/adapter/package-info.java
diff --git a/...roxy/AbstractAdvisorAutoProxyCreator.java → ...roxy/AbstractAdvisorAutoProxyCreator.java b/...roxy/AbstractAdvisorAutoProxyCreator.java → ...roxy/AbstractAdvisorAutoProxyCreator.java
diff --git a/...k/autoproxy/AbstractAutoProxyCreator.java → ...k/autoproxy/AbstractAutoProxyCreator.java b/...k/autoproxy/AbstractAutoProxyCreator.java → ...k/autoproxy/AbstractAutoProxyCreator.java
diff --git a/...p/framework/autoproxy/AutoProxyUtils.java → ...p/framework/autoproxy/AutoProxyUtils.java b/...p/framework/autoproxy/AutoProxyUtils.java → ...p/framework/autoproxy/AutoProxyUtils.java
diff --git a/...xy/BeanFactoryAdvisorRetrievalHelper.java → ...xy/BeanFactoryAdvisorRetrievalHelper.java b/...xy/BeanFactoryAdvisorRetrievalHelper.java → ...xy/BeanFactoryAdvisorRetrievalHelper.java
diff --git a/...k/autoproxy/BeanNameAutoProxyCreator.java → ...k/autoproxy/BeanNameAutoProxyCreator.java b/...k/autoproxy/BeanNameAutoProxyCreator.java → ...k/autoproxy/BeanNameAutoProxyCreator.java
diff --git a/...proxy/DefaultAdvisorAutoProxyCreator.java → ...proxy/DefaultAdvisorAutoProxyCreator.java b/...proxy/DefaultAdvisorAutoProxyCreator.java → ...proxy/DefaultAdvisorAutoProxyCreator.java
diff --git a/...nfrastructureAdvisorAutoProxyCreator.java → ...nfrastructureAdvisorAutoProxyCreator.java b/...nfrastructureAdvisorAutoProxyCreator.java → ...nfrastructureAdvisorAutoProxyCreator.java
diff --git a/...ework/autoproxy/ProxyCreationContext.java → ...ework/autoproxy/ProxyCreationContext.java b/...ework/autoproxy/ProxyCreationContext.java → ...ework/autoproxy/ProxyCreationContext.java
diff --git a/...mework/autoproxy/TargetSourceCreator.java → ...mework/autoproxy/TargetSourceCreator.java b/...mework/autoproxy/TargetSourceCreator.java → ...mework/autoproxy/TargetSourceCreator.java
diff --git a/...aop/framework/autoproxy/package-info.java → ...aop/framework/autoproxy/package-info.java b/...aop/framework/autoproxy/package-info.java → ...aop/framework/autoproxy/package-info.java
diff --git a/...tBeanFactoryBasedTargetSourceCreator.java → ...tBeanFactoryBasedTargetSourceCreator.java b/...tBeanFactoryBasedTargetSourceCreator.java → ...tBeanFactoryBasedTargetSourceCreator.java
diff --git a/...y/target/LazyInitTargetSourceCreator.java → ...y/target/LazyInitTargetSourceCreator.java b/...y/target/LazyInitTargetSourceCreator.java → ...y/target/LazyInitTargetSourceCreator.java
diff --git a/...roxy/target/QuickTargetSourceCreator.java → ...roxy/target/QuickTargetSourceCreator.java b/...roxy/target/QuickTargetSourceCreator.java → ...roxy/target/QuickTargetSourceCreator.java
diff --git a/...p/framework/autoproxy/target/package.html → ...p/framework/autoproxy/target/package.html b/...p/framework/autoproxy/target/package.html → ...p/framework/autoproxy/target/package.html
diff --git a/...framework/aop/framework/package-info.java → ...framework/aop/framework/package-info.java b/...framework/aop/framework/package-info.java → ...framework/aop/framework/package-info.java
diff --git a/...ceptor/AbstractMonitoringInterceptor.java → ...ceptor/AbstractMonitoringInterceptor.java b/...ceptor/AbstractMonitoringInterceptor.java → ...ceptor/AbstractMonitoringInterceptor.java
diff --git a/...interceptor/AbstractTraceInterceptor.java → ...interceptor/AbstractTraceInterceptor.java b/...interceptor/AbstractTraceInterceptor.java → ...interceptor/AbstractTraceInterceptor.java
diff --git a/...nterceptor/AsyncExecutionInterceptor.java → ...nterceptor/AsyncExecutionInterceptor.java b/...nterceptor/AsyncExecutionInterceptor.java → ...nterceptor/AsyncExecutionInterceptor.java
diff --git a/...eptor/ConcurrencyThrottleInterceptor.java → ...eptor/ConcurrencyThrottleInterceptor.java b/...eptor/ConcurrencyThrottleInterceptor.java → ...eptor/ConcurrencyThrottleInterceptor.java
diff --git a/...rceptor/CustomizableTraceInterceptor.java → ...rceptor/CustomizableTraceInterceptor.java b/...rceptor/CustomizableTraceInterceptor.java → ...rceptor/CustomizableTraceInterceptor.java
diff --git a/...ork/aop/interceptor/DebugInterceptor.java → ...ork/aop/interceptor/DebugInterceptor.java b/...ork/aop/interceptor/DebugInterceptor.java → ...ork/aop/interceptor/DebugInterceptor.java
diff --git a/...p/interceptor/ExposeBeanNameAdvisors.java → ...p/interceptor/ExposeBeanNameAdvisors.java b/...p/interceptor/ExposeBeanNameAdvisors.java → ...p/interceptor/ExposeBeanNameAdvisors.java
diff --git a/...erceptor/ExposeInvocationInterceptor.java → ...erceptor/ExposeInvocationInterceptor.java b/...erceptor/ExposeInvocationInterceptor.java → ...erceptor/ExposeInvocationInterceptor.java
diff --git a/...r/JamonPerformanceMonitorInterceptor.java → ...r/JamonPerformanceMonitorInterceptor.java b/...r/JamonPerformanceMonitorInterceptor.java → ...r/JamonPerformanceMonitorInterceptor.java
diff --git a/...ceptor/PerformanceMonitorInterceptor.java → ...ceptor/PerformanceMonitorInterceptor.java b/...ceptor/PerformanceMonitorInterceptor.java → ...ceptor/PerformanceMonitorInterceptor.java
diff --git a/...p/interceptor/SimpleTraceInterceptor.java → ...p/interceptor/SimpleTraceInterceptor.java b/...p/interceptor/SimpleTraceInterceptor.java → ...p/interceptor/SimpleTraceInterceptor.java
diff --git a/...amework/aop/interceptor/package-info.java → ...amework/aop/interceptor/package-info.java b/...amework/aop/interceptor/package-info.java → ...amework/aop/interceptor/package-info.java
diff --git a/...org/springframework/aop/package-info.java → ...org/springframework/aop/package-info.java b/...org/springframework/aop/package-info.java → ...org/springframework/aop/package-info.java
diff --git a/...mework/aop/scope/DefaultScopedObject.java → ...mework/aop/scope/DefaultScopedObject.java b/...mework/aop/scope/DefaultScopedObject.java → ...mework/aop/scope/DefaultScopedObject.java
diff --git a/...ringframework/aop/scope/ScopedObject.java → ...ringframework/aop/scope/ScopedObject.java b/...ringframework/aop/scope/ScopedObject.java → ...ringframework/aop/scope/ScopedObject.java
diff --git a/...ork/aop/scope/ScopedProxyFactoryBean.java → ...ork/aop/scope/ScopedProxyFactoryBean.java b/...ork/aop/scope/ScopedProxyFactoryBean.java → ...ork/aop/scope/ScopedProxyFactoryBean.java
diff --git a/...framework/aop/scope/ScopedProxyUtils.java → ...framework/aop/scope/ScopedProxyUtils.java b/...framework/aop/scope/ScopedProxyUtils.java → ...framework/aop/scope/ScopedProxyUtils.java
diff --git a/...ringframework/aop/scope/package-info.java → ...ringframework/aop/scope/package-info.java b/...ringframework/aop/scope/package-info.java → ...ringframework/aop/scope/package-info.java
diff --git a/...t/AbstractBeanFactoryPointcutAdvisor.java → ...t/AbstractBeanFactoryPointcutAdvisor.java b/...t/AbstractBeanFactoryPointcutAdvisor.java → ...t/AbstractBeanFactoryPointcutAdvisor.java
diff --git a/...p/support/AbstractExpressionPointcut.java → ...p/support/AbstractExpressionPointcut.java b/...p/support/AbstractExpressionPointcut.java → ...p/support/AbstractExpressionPointcut.java
diff --git a/...pport/AbstractGenericPointcutAdvisor.java → ...pport/AbstractGenericPointcutAdvisor.java b/...pport/AbstractGenericPointcutAdvisor.java → ...pport/AbstractGenericPointcutAdvisor.java
diff --git a/.../aop/support/AbstractPointcutAdvisor.java → .../aop/support/AbstractPointcutAdvisor.java b/.../aop/support/AbstractPointcutAdvisor.java → .../aop/support/AbstractPointcutAdvisor.java
diff --git a/...support/AbstractRegexpMethodPointcut.java → ...support/AbstractRegexpMethodPointcut.java b/...support/AbstractRegexpMethodPointcut.java → ...support/AbstractRegexpMethodPointcut.java
diff --git a/...springframework/aop/support/AopUtils.java → ...springframework/aop/support/AopUtils.java b/...springframework/aop/support/AopUtils.java → ...springframework/aop/support/AopUtils.java
diff --git a/...ngframework/aop/support/ClassFilters.java → ...ngframework/aop/support/ClassFilters.java b/...ngframework/aop/support/ClassFilters.java → ...ngframework/aop/support/ClassFilters.java
diff --git a/...ework/aop/support/ComposablePointcut.java → ...ework/aop/support/ComposablePointcut.java b/...ework/aop/support/ComposablePointcut.java → ...ework/aop/support/ComposablePointcut.java
diff --git a/...work/aop/support/ControlFlowPointcut.java → ...work/aop/support/ControlFlowPointcut.java b/...work/aop/support/ControlFlowPointcut.java → ...work/aop/support/ControlFlowPointcut.java
diff --git a/...rt/DefaultBeanFactoryPointcutAdvisor.java → ...rt/DefaultBeanFactoryPointcutAdvisor.java b/...rt/DefaultBeanFactoryPointcutAdvisor.java → ...rt/DefaultBeanFactoryPointcutAdvisor.java
diff --git a/...p/support/DefaultIntroductionAdvisor.java → ...p/support/DefaultIntroductionAdvisor.java b/...p/support/DefaultIntroductionAdvisor.java → ...p/support/DefaultIntroductionAdvisor.java
diff --git a/...k/aop/support/DefaultPointcutAdvisor.java → ...k/aop/support/DefaultPointcutAdvisor.java b/...k/aop/support/DefaultPointcutAdvisor.java → ...k/aop/support/DefaultPointcutAdvisor.java
diff --git a/...rTargetObjectIntroductionInterceptor.java → ...rTargetObjectIntroductionInterceptor.java b/...rTargetObjectIntroductionInterceptor.java → ...rTargetObjectIntroductionInterceptor.java
diff --git a/...rt/DelegatingIntroductionInterceptor.java → ...rt/DelegatingIntroductionInterceptor.java b/...rt/DelegatingIntroductionInterceptor.java → ...rt/DelegatingIntroductionInterceptor.java
diff --git a/...ork/aop/support/DynamicMethodMatcher.java → ...ork/aop/support/DynamicMethodMatcher.java b/...ork/aop/support/DynamicMethodMatcher.java → ...ork/aop/support/DynamicMethodMatcher.java
diff --git a/...support/DynamicMethodMatcherPointcut.java → ...support/DynamicMethodMatcherPointcut.java b/...support/DynamicMethodMatcherPointcut.java → ...support/DynamicMethodMatcherPointcut.java
diff --git a/...ework/aop/support/ExpressionPointcut.java → ...ework/aop/support/ExpressionPointcut.java b/...ework/aop/support/ExpressionPointcut.java → ...ework/aop/support/ExpressionPointcut.java
diff --git a/.../aop/support/IntroductionInfoSupport.java → .../aop/support/IntroductionInfoSupport.java b/.../aop/support/IntroductionInfoSupport.java → .../aop/support/IntroductionInfoSupport.java
diff --git a/.../aop/support/JdkRegexpMethodPointcut.java → .../aop/support/JdkRegexpMethodPointcut.java b/.../aop/support/JdkRegexpMethodPointcut.java → .../aop/support/JdkRegexpMethodPointcut.java
diff --git a/...framework/aop/support/MethodMatchers.java → ...framework/aop/support/MethodMatchers.java b/...framework/aop/support/MethodMatchers.java → ...framework/aop/support/MethodMatchers.java
diff --git a/.../aop/support/NameMatchMethodPointcut.java → .../aop/support/NameMatchMethodPointcut.java b/.../aop/support/NameMatchMethodPointcut.java → .../aop/support/NameMatchMethodPointcut.java
diff --git a/...pport/NameMatchMethodPointcutAdvisor.java → ...pport/NameMatchMethodPointcutAdvisor.java b/...pport/NameMatchMethodPointcutAdvisor.java → ...pport/NameMatchMethodPointcutAdvisor.java
diff --git a/...pringframework/aop/support/Pointcuts.java → ...pringframework/aop/support/Pointcuts.java b/...pringframework/aop/support/Pointcuts.java → ...pringframework/aop/support/Pointcuts.java
diff --git a/.../support/RegexpMethodPointcutAdvisor.java → .../support/RegexpMethodPointcutAdvisor.java b/.../support/RegexpMethodPointcutAdvisor.java → .../support/RegexpMethodPointcutAdvisor.java
diff --git a/...ramework/aop/support/RootClassFilter.java → ...ramework/aop/support/RootClassFilter.java b/...ramework/aop/support/RootClassFilter.java → ...ramework/aop/support/RootClassFilter.java
diff --git a/...work/aop/support/StaticMethodMatcher.java → ...work/aop/support/StaticMethodMatcher.java b/...work/aop/support/StaticMethodMatcher.java → ...work/aop/support/StaticMethodMatcher.java
diff --git a/.../support/StaticMethodMatcherPointcut.java → .../support/StaticMethodMatcherPointcut.java b/.../support/StaticMethodMatcherPointcut.java → .../support/StaticMethodMatcherPointcut.java
diff --git a/...t/StaticMethodMatcherPointcutAdvisor.java → ...t/StaticMethodMatcherPointcutAdvisor.java b/...t/StaticMethodMatcherPointcutAdvisor.java → ...t/StaticMethodMatcherPointcutAdvisor.java
diff --git a/...ort/annotation/AnnotationClassFilter.java → ...ort/annotation/AnnotationClassFilter.java b/...ort/annotation/AnnotationClassFilter.java → ...ort/annotation/AnnotationClassFilter.java
diff --git a/...nnotation/AnnotationMatchingPointcut.java → ...nnotation/AnnotationMatchingPointcut.java b/...nnotation/AnnotationMatchingPointcut.java → ...nnotation/AnnotationMatchingPointcut.java
diff --git a/...t/annotation/AnnotationMethodMatcher.java → ...t/annotation/AnnotationMethodMatcher.java b/...t/annotation/AnnotationMethodMatcher.java → ...t/annotation/AnnotationMethodMatcher.java
diff --git a/.../aop/support/annotation/package-info.java → .../aop/support/annotation/package-info.java b/.../aop/support/annotation/package-info.java → .../aop/support/annotation/package-info.java
diff --git a/...ngframework/aop/support/package-info.java → ...ngframework/aop/support/package-info.java b/...ngframework/aop/support/package-info.java → ...ngframework/aop/support/package-info.java
diff --git a/...AbstractBeanFactoryBasedTargetSource.java → ...AbstractBeanFactoryBasedTargetSource.java b/...AbstractBeanFactoryBasedTargetSource.java → ...AbstractBeanFactoryBasedTargetSource.java
diff --git a/...get/AbstractLazyCreationTargetSource.java → ...get/AbstractLazyCreationTargetSource.java b/...get/AbstractLazyCreationTargetSource.java → ...get/AbstractLazyCreationTargetSource.java
diff --git a/...p/target/AbstractPoolingTargetSource.java → ...p/target/AbstractPoolingTargetSource.java b/...p/target/AbstractPoolingTargetSource.java → ...p/target/AbstractPoolingTargetSource.java
diff --git a/...t/AbstractPrototypeBasedTargetSource.java → ...t/AbstractPrototypeBasedTargetSource.java b/...t/AbstractPrototypeBasedTargetSource.java → ...t/AbstractPrototypeBasedTargetSource.java
diff --git a/...k/aop/target/CommonsPoolTargetSource.java → ...k/aop/target/CommonsPoolTargetSource.java b/...k/aop/target/CommonsPoolTargetSource.java → ...k/aop/target/CommonsPoolTargetSource.java
diff --git a/...amework/aop/target/EmptyTargetSource.java → ...amework/aop/target/EmptyTargetSource.java b/...amework/aop/target/EmptyTargetSource.java → ...amework/aop/target/EmptyTargetSource.java
diff --git a/.../aop/target/HotSwappableTargetSource.java → .../aop/target/HotSwappableTargetSource.java b/.../aop/target/HotSwappableTargetSource.java → .../aop/target/HotSwappableTargetSource.java
diff --git a/...work/aop/target/LazyInitTargetSource.java → ...work/aop/target/LazyInitTargetSource.java b/...work/aop/target/LazyInitTargetSource.java → ...work/aop/target/LazyInitTargetSource.java
diff --git a/...ngframework/aop/target/PoolingConfig.java → ...ngframework/aop/target/PoolingConfig.java b/...ngframework/aop/target/PoolingConfig.java → ...ngframework/aop/target/PoolingConfig.java
diff --git a/...ork/aop/target/PrototypeTargetSource.java → ...ork/aop/target/PrototypeTargetSource.java b/...ork/aop/target/PrototypeTargetSource.java → ...ork/aop/target/PrototypeTargetSource.java
diff --git a/...rk/aop/target/SimpleBeanTargetSource.java → ...rk/aop/target/SimpleBeanTargetSource.java b/...rk/aop/target/SimpleBeanTargetSource.java → ...rk/aop/target/SimpleBeanTargetSource.java
diff --git a/...ork/aop/target/SingletonTargetSource.java → ...ork/aop/target/SingletonTargetSource.java b/...ork/aop/target/SingletonTargetSource.java → ...ork/aop/target/SingletonTargetSource.java
diff --git a/...k/aop/target/ThreadLocalTargetSource.java → ...k/aop/target/ThreadLocalTargetSource.java b/...k/aop/target/ThreadLocalTargetSource.java → ...k/aop/target/ThreadLocalTargetSource.java
diff --git a/.../target/ThreadLocalTargetSourceStats.java → .../target/ThreadLocalTargetSourceStats.java b/.../target/ThreadLocalTargetSourceStats.java → .../target/ThreadLocalTargetSourceStats.java
diff --git a/...amic/AbstractRefreshableTargetSource.java → ...amic/AbstractRefreshableTargetSource.java b/...amic/AbstractRefreshableTargetSource.java → ...amic/AbstractRefreshableTargetSource.java
diff --git a/...c/BeanFactoryRefreshableTargetSource.java → ...c/BeanFactoryRefreshableTargetSource.java b/...c/BeanFactoryRefreshableTargetSource.java → ...c/BeanFactoryRefreshableTargetSource.java
diff --git a/...ework/aop/target/dynamic/Refreshable.java → ...ework/aop/target/dynamic/Refreshable.java b/...ework/aop/target/dynamic/Refreshable.java → ...ework/aop/target/dynamic/Refreshable.java
diff --git a/...framework/aop/target/dynamic/package.html → ...framework/aop/target/dynamic/package.html b/...framework/aop/target/dynamic/package.html → ...framework/aop/target/dynamic/package.html
diff --git a/...g/springframework/aop/target/package.html → ...g/springframework/aop/target/package.html b/...g/springframework/aop/target/package.html → ...g/springframework/aop/target/package.html
diff --git a/...framework.aop/src/main/java/overview.html → spring-aop/src/main/java/overview.html b/...framework.aop/src/main/java/overview.html → spring-aop/src/main/java/overview.html
diff --git a/...c/main/resources/META-INF/spring.handlers → ...c/main/resources/META-INF/spring.handlers b/...c/main/resources/META-INF/spring.handlers → ...c/main/resources/META-INF/spring.handlers
diff --git a/...rc/main/resources/META-INF/spring.schemas → ...rc/main/resources/META-INF/spring.schemas b/...rc/main/resources/META-INF/spring.schemas → ...rc/main/resources/META-INF/spring.schemas
diff --git a/...rc/main/resources/META-INF/spring.tooling → ...rc/main/resources/META-INF/spring.tooling b/...rc/main/resources/META-INF/spring.tooling → ...rc/main/resources/META-INF/spring.tooling
diff --git a/...ngframework/aop/config/spring-aop-2.0.xsd → ...ngframework/aop/config/spring-aop-2.0.xsd b/...ngframework/aop/config/spring-aop-2.0.xsd → ...ngframework/aop/config/spring-aop-2.0.xsd
diff --git a/...ngframework/aop/config/spring-aop-2.5.xsd → ...ngframework/aop/config/spring-aop-2.5.xsd b/...ngframework/aop/config/spring-aop-2.5.xsd → ...ngframework/aop/config/spring-aop-2.5.xsd
diff --git a/...ngframework/aop/config/spring-aop-3.0.xsd → ...ngframework/aop/config/spring-aop-3.0.xsd b/...ngframework/aop/config/spring-aop-3.0.xsd → ...ngframework/aop/config/spring-aop-3.0.xsd
diff --git a/...ngframework/aop/config/spring-aop-3.1.xsd → ...ngframework/aop/config/spring-aop-3.1.xsd b/...ngframework/aop/config/spring-aop-3.1.xsd → ...ngframework/aop/config/spring-aop-3.1.xsd
diff --git a/...springframework/aop/config/spring-aop.gif → ...springframework/aop/config/spring-aop.gif b/...springframework/aop/config/spring-aop.gif → ...springframework/aop/config/spring-aop.gif
diff --git a/...ParameterNameDiscoverAnnotationTests.java → ...ParameterNameDiscoverAnnotationTests.java b/...ParameterNameDiscoverAnnotationTests.java → ...ParameterNameDiscoverAnnotationTests.java
diff --git a/...tJAdviceParameterNameDiscovererTests.java → ...tJAdviceParameterNameDiscovererTests.java b/...tJAdviceParameterNameDiscovererTests.java → ...tJAdviceParameterNameDiscovererTests.java
diff --git a/...pectj/AspectJExpressionPointcutTests.java → ...pectj/AspectJExpressionPointcutTests.java b/...pectj/AspectJExpressionPointcutTests.java → ...pectj/AspectJExpressionPointcutTests.java
diff --git a/...spectj/BeanNamePointcutMatchingTests.java → ...spectj/BeanNamePointcutMatchingTests.java b/...spectj/BeanNamePointcutMatchingTests.java → ...spectj/BeanNamePointcutMatchingTests.java
diff --git a/...odInvocationProceedingJoinPointTests.java → ...odInvocationProceedingJoinPointTests.java b/...odInvocationProceedingJoinPointTests.java → ...odInvocationProceedingJoinPointTests.java
diff --git a/...tJAdviceParameterNameDiscovererTests.java → ...tJAdviceParameterNameDiscovererTests.java b/...tJAdviceParameterNameDiscovererTests.java → ...tJAdviceParameterNameDiscovererTests.java
diff --git a/.../TigerAspectJExpressionPointcutTests.java → .../TigerAspectJExpressionPointcutTests.java b/.../TigerAspectJExpressionPointcutTests.java → .../TigerAspectJExpressionPointcutTests.java
diff --git a/...TrickyAspectJPointcutExpressionTests.java → ...TrickyAspectJPointcutExpressionTests.java b/...TrickyAspectJPointcutExpressionTests.java → ...TrickyAspectJPointcutExpressionTests.java
diff --git a/.../aspectj/TypePatternClassFilterTests.java → .../aspectj/TypePatternClassFilterTests.java b/.../aspectj/TypePatternClassFilterTests.java → .../aspectj/TypePatternClassFilterTests.java
diff --git a/...n/AbstractAspectJAdvisorFactoryTests.java → ...n/AbstractAspectJAdvisorFactoryTests.java b/...n/AbstractAspectJAdvisorFactoryTests.java → ...n/AbstractAspectJAdvisorFactoryTests.java
diff --git a/...ectj/annotation/ArgumentBindingTests.java → ...ectj/annotation/ArgumentBindingTests.java b/...ectj/annotation/ArgumentBindingTests.java → ...ectj/annotation/ArgumentBindingTests.java
diff --git a/...notation/AspectJPointcutAdvisorTests.java → ...notation/AspectJPointcutAdvisorTests.java b/...notation/AspectJPointcutAdvisorTests.java → ...notation/AspectJPointcutAdvisorTests.java
diff --git a/...pectj/annotation/AspectMetadataTests.java → ...pectj/annotation/AspectMetadataTests.java b/...pectj/annotation/AspectMetadataTests.java → ...pectj/annotation/AspectMetadataTests.java
diff --git a/...j/annotation/AspectProxyFactoryTests.java → ...j/annotation/AspectProxyFactoryTests.java b/...j/annotation/AspectProxyFactoryTests.java → ...j/annotation/AspectProxyFactoryTests.java
diff --git a/...ReflectiveAspectJAdvisorFactoryTests.java → ...ReflectiveAspectJAdvisorFactoryTests.java b/...ReflectiveAspectJAdvisorFactoryTests.java → ...ReflectiveAspectJAdvisorFactoryTests.java
diff --git a/...toproxy/AspectJNamespaceHandlerTests.java → ...toproxy/AspectJNamespaceHandlerTests.java b/...toproxy/AspectJNamespaceHandlerTests.java → ...toproxy/AspectJNamespaceHandlerTests.java
diff --git a/...oxy/AspectJPrecedenceComparatorTests.java → ...oxy/AspectJPrecedenceComparatorTests.java b/...oxy/AspectJPrecedenceComparatorTests.java → ...oxy/AspectJPrecedenceComparatorTests.java
diff --git a/...AopNamespaceHandlerEventTests-context.xml → ...AopNamespaceHandlerEventTests-context.xml b/...AopNamespaceHandlerEventTests-context.xml → ...AopNamespaceHandlerEventTests-context.xml
diff --git a/...andlerEventTests-directPointcutEvents.xml → ...andlerEventTests-directPointcutEvents.xml b/...andlerEventTests-directPointcutEvents.xml → ...andlerEventTests-directPointcutEvents.xml
diff --git a/...spaceHandlerEventTests-pointcutEvents.xml → ...spaceHandlerEventTests-pointcutEvents.xml b/...spaceHandlerEventTests-pointcutEvents.xml → ...spaceHandlerEventTests-pointcutEvents.xml
diff --git a/...ceHandlerEventTests-pointcutRefEvents.xml → ...ceHandlerEventTests-pointcutRefEvents.xml b/...ceHandlerEventTests-pointcutRefEvents.xml → ...ceHandlerEventTests-pointcutRefEvents.xml
diff --git a/...config/AopNamespaceHandlerEventTests.java → ...config/AopNamespaceHandlerEventTests.java b/...config/AopNamespaceHandlerEventTests.java → ...config/AopNamespaceHandlerEventTests.java
diff --git a/...ointcutErrorTests-pointcutDuplication.xml → ...ointcutErrorTests-pointcutDuplication.xml b/...ointcutErrorTests-pointcutDuplication.xml → ...ointcutErrorTests-pointcutDuplication.xml
diff --git a/...lerPointcutErrorTests-pointcutMissing.xml → ...lerPointcutErrorTests-pointcutMissing.xml b/...lerPointcutErrorTests-pointcutMissing.xml → ...lerPointcutErrorTests-pointcutMissing.xml
diff --git a/...opNamespaceHandlerPointcutErrorTests.java → ...opNamespaceHandlerPointcutErrorTests.java b/...opNamespaceHandlerPointcutErrorTests.java → ...opNamespaceHandlerPointcutErrorTests.java
diff --git a/...op/config/TopLevelAopTagTests-context.xml → ...op/config/TopLevelAopTagTests-context.xml b/...op/config/TopLevelAopTagTests-context.xml → ...op/config/TopLevelAopTagTests-context.xml
diff --git a/...ework/aop/config/TopLevelAopTagTests.java → ...ework/aop/config/TopLevelAopTagTests.java b/...ework/aop/config/TopLevelAopTagTests.java → ...ework/aop/config/TopLevelAopTagTests.java
diff --git a/...ork/aop/framework/AopProxyUtilsTests.java → ...ork/aop/framework/AopProxyUtilsTests.java b/...ork/aop/framework/AopProxyUtilsTests.java → ...ork/aop/framework/AopProxyUtilsTests.java
diff --git a/...framework/IntroductionBenchmarkTests.java → ...framework/IntroductionBenchmarkTests.java b/...framework/IntroductionBenchmarkTests.java → ...framework/IntroductionBenchmarkTests.java
diff --git a/.../aop/framework/MethodInvocationTests.java → .../aop/framework/MethodInvocationTests.java b/.../aop/framework/MethodInvocationTests.java → .../aop/framework/MethodInvocationTests.java
diff --git a/...ramework/PrototypeTargetTests-context.xml → ...ramework/PrototypeTargetTests-context.xml b/...ramework/PrototypeTargetTests-context.xml → ...ramework/PrototypeTargetTests-context.xml
diff --git a/...k/aop/framework/PrototypeTargetTests.java → ...k/aop/framework/PrototypeTargetTests.java b/...k/aop/framework/PrototypeTargetTests.java → ...k/aop/framework/PrototypeTargetTests.java
diff --git a/...work/aop/framework/ProxyFactoryTests.java → ...work/aop/framework/ProxyFactoryTests.java b/...work/aop/framework/ProxyFactoryTests.java → ...work/aop/framework/ProxyFactoryTests.java
diff --git a/...adapter/ThrowsAdviceInterceptorTests.java → ...adapter/ThrowsAdviceInterceptorTests.java b/...adapter/ThrowsAdviceInterceptorTests.java → ...adapter/ThrowsAdviceInterceptorTests.java
diff --git a/.../ConcurrencyThrottleInterceptorTests.java → .../ConcurrencyThrottleInterceptorTests.java b/.../ConcurrencyThrottleInterceptorTests.java → .../ConcurrencyThrottleInterceptorTests.java
diff --git a/...or/CustomizableTraceInterceptorTests.java → ...or/CustomizableTraceInterceptorTests.java b/...or/CustomizableTraceInterceptorTests.java → ...or/CustomizableTraceInterceptorTests.java
diff --git a/...op/interceptor/DebugInterceptorTests.java → ...op/interceptor/DebugInterceptorTests.java b/...op/interceptor/DebugInterceptorTests.java → ...op/interceptor/DebugInterceptorTests.java
diff --git a/...erceptor/ExposeBeanNameAdvisorsTests.java → ...erceptor/ExposeBeanNameAdvisorsTests.java b/...erceptor/ExposeBeanNameAdvisorsTests.java → ...erceptor/ExposeBeanNameAdvisorsTests.java
diff --git a/...oseInvocationInterceptorTests-context.xml → ...oseInvocationInterceptorTests-context.xml b/...oseInvocationInterceptorTests-context.xml → ...oseInvocationInterceptorTests-context.xml
diff --git a/...tor/ExposeInvocationInterceptorTests.java → ...tor/ExposeInvocationInterceptorTests.java b/...tor/ExposeInvocationInterceptorTests.java → ...tor/ExposeInvocationInterceptorTests.java
diff --git a/...r/PerformanceMonitorInterceptorTests.java → ...r/PerformanceMonitorInterceptorTests.java b/...r/PerformanceMonitorInterceptorTests.java → ...r/PerformanceMonitorInterceptorTests.java
diff --git a/...erceptor/SimpleTraceInterceptorTests.java → ...erceptor/SimpleTraceInterceptorTests.java b/...erceptor/SimpleTraceInterceptorTests.java → ...erceptor/SimpleTraceInterceptorTests.java
diff --git a/...k/aop/scope/DefaultScopedObjectTests.java → ...k/aop/scope/DefaultScopedObjectTests.java b/...k/aop/scope/DefaultScopedObjectTests.java → ...k/aop/scope/DefaultScopedObjectTests.java
diff --git a/...roxyAutowireTests-scopedAutowireFalse.xml → ...roxyAutowireTests-scopedAutowireFalse.xml b/...roxyAutowireTests-scopedAutowireFalse.xml → ...roxyAutowireTests-scopedAutowireFalse.xml
diff --git a/...ProxyAutowireTests-scopedAutowireTrue.xml → ...ProxyAutowireTests-scopedAutowireTrue.xml b/...ProxyAutowireTests-scopedAutowireTrue.xml → ...ProxyAutowireTests-scopedAutowireTrue.xml
diff --git a/...k/aop/scope/ScopedProxyAutowireTests.java → ...k/aop/scope/ScopedProxyAutowireTests.java b/...k/aop/scope/ScopedProxyAutowireTests.java → ...k/aop/scope/ScopedProxyAutowireTests.java
diff --git a/...rt/AbstractRegexpMethodPointcutTests.java → ...rt/AbstractRegexpMethodPointcutTests.java b/...rt/AbstractRegexpMethodPointcutTests.java → ...rt/AbstractRegexpMethodPointcutTests.java
diff --git a/...gframework/aop/support/AopUtilsTests.java → ...gframework/aop/support/AopUtilsTests.java b/...gframework/aop/support/AopUtilsTests.java → ...gframework/aop/support/AopUtilsTests.java
diff --git a/...mework/aop/support/ClassFiltersTests.java → ...mework/aop/support/ClassFiltersTests.java b/...mework/aop/support/ClassFiltersTests.java → ...mework/aop/support/ClassFiltersTests.java
diff --git a/...ramework/aop/support/ClassUtilsTests.java → ...ramework/aop/support/ClassUtilsTests.java b/...ramework/aop/support/ClassUtilsTests.java → ...ramework/aop/support/ClassUtilsTests.java
diff --git a/.../aop/support/ComposablePointcutTests.java → .../aop/support/ComposablePointcutTests.java b/.../aop/support/ComposablePointcutTests.java → .../aop/support/ComposablePointcutTests.java
diff --git a/...aop/support/ControlFlowPointcutTests.java → ...aop/support/ControlFlowPointcutTests.java b/...aop/support/ControlFlowPointcutTests.java → ...aop/support/ControlFlowPointcutTests.java
diff --git a/...legatingIntroductionInterceptorTests.java → ...legatingIntroductionInterceptorTests.java b/...legatingIntroductionInterceptorTests.java → ...legatingIntroductionInterceptorTests.java
diff --git a/...support/JdkRegexpMethodPointcutTests.java → ...support/JdkRegexpMethodPointcutTests.java b/...support/JdkRegexpMethodPointcutTests.java → ...support/JdkRegexpMethodPointcutTests.java
diff --git a/...work/aop/support/MethodMatchersTests.java → ...work/aop/support/MethodMatchersTests.java b/...work/aop/support/MethodMatchersTests.java → ...work/aop/support/MethodMatchersTests.java
diff --git a/...support/NameMatchMethodPointcutTests.java → ...support/NameMatchMethodPointcutTests.java b/...support/NameMatchMethodPointcutTests.java → ...support/NameMatchMethodPointcutTests.java
diff --git a/...framework/aop/support/PointcutsTests.java → ...framework/aop/support/PointcutsTests.java b/...framework/aop/support/PointcutsTests.java → ...framework/aop/support/PointcutsTests.java
diff --git a/...intcutAdvisorIntegrationTests-context.xml → ...intcutAdvisorIntegrationTests-context.xml b/...intcutAdvisorIntegrationTests-context.xml → ...intcutAdvisorIntegrationTests-context.xml
diff --git a/...ethodPointcutAdvisorIntegrationTests.java → ...ethodPointcutAdvisorIntegrationTests.java b/...ethodPointcutAdvisorIntegrationTests.java → ...ethodPointcutAdvisorIntegrationTests.java
diff --git a/...onsPoolTargetSourceProxyTests-context.xml → ...onsPoolTargetSourceProxyTests-context.xml b/...onsPoolTargetSourceProxyTests-context.xml → ...onsPoolTargetSourceProxyTests-context.xml
diff --git a/...et/CommonsPoolTargetSourceProxyTests.java → ...et/CommonsPoolTargetSourceProxyTests.java b/...et/CommonsPoolTargetSourceProxyTests.java → ...et/CommonsPoolTargetSourceProxyTests.java
diff --git a/...HotSwappableTargetSourceTests-context.xml → ...HotSwappableTargetSourceTests-context.xml b/...HotSwappableTargetSourceTests-context.xml → ...HotSwappableTargetSourceTests-context.xml
diff --git a/...target/HotSwappableTargetSourceTests.java → ...target/HotSwappableTargetSourceTests.java b/...target/HotSwappableTargetSourceTests.java → ...target/HotSwappableTargetSourceTests.java
diff --git a/...target/LazyCreationTargetSourceTests.java → ...target/LazyCreationTargetSourceTests.java b/...target/LazyCreationTargetSourceTests.java → ...target/LazyCreationTargetSourceTests.java
diff --git a/...azyInitTargetSourceTests-customTarget.xml → ...azyInitTargetSourceTests-customTarget.xml b/...azyInitTargetSourceTests-customTarget.xml → ...azyInitTargetSourceTests-customTarget.xml
diff --git a/...LazyInitTargetSourceTests-factoryBean.xml → ...LazyInitTargetSourceTests-factoryBean.xml b/...LazyInitTargetSourceTests-factoryBean.xml → ...LazyInitTargetSourceTests-factoryBean.xml
diff --git a/...t/LazyInitTargetSourceTests-singleton.xml → ...t/LazyInitTargetSourceTests-singleton.xml b/...t/LazyInitTargetSourceTests-singleton.xml → ...t/LazyInitTargetSourceTests-singleton.xml
diff --git a/...aop/target/LazyInitTargetSourceTests.java → ...aop/target/LazyInitTargetSourceTests.java b/...aop/target/LazyInitTargetSourceTests.java → ...aop/target/LazyInitTargetSourceTests.java
diff --git a/...rget/PrototypeBasedTargetSourceTests.java → ...rget/PrototypeBasedTargetSourceTests.java b/...rget/PrototypeBasedTargetSourceTests.java → ...rget/PrototypeBasedTargetSourceTests.java
diff --git a/...et/PrototypeTargetSourceTests-context.xml → ...et/PrototypeTargetSourceTests-context.xml b/...et/PrototypeTargetSourceTests-context.xml → ...et/PrototypeTargetSourceTests-context.xml
diff --git a/...op/target/PrototypeTargetSourceTests.java → ...op/target/PrototypeTargetSourceTests.java b/...op/target/PrototypeTargetSourceTests.java → ...op/target/PrototypeTargetSourceTests.java
diff --git a/.../ThreadLocalTargetSourceTests-context.xml → .../ThreadLocalTargetSourceTests-context.xml b/.../ThreadLocalTargetSourceTests-context.xml → .../ThreadLocalTargetSourceTests-context.xml
diff --git a/.../target/ThreadLocalTargetSourceTests.java → .../target/ThreadLocalTargetSourceTests.java b/.../target/ThreadLocalTargetSourceTests.java → .../target/ThreadLocalTargetSourceTests.java
diff --git a/...dynamic/RefreshableTargetSourceTests.java → ...dynamic/RefreshableTargetSourceTests.java b/...dynamic/RefreshableTargetSourceTests.java → ...dynamic/RefreshableTargetSourceTests.java
diff --git a/...est/annotation/EmptySpringAnnotation.java → ...est/annotation/EmptySpringAnnotation.java b/...est/annotation/EmptySpringAnnotation.java → ...est/annotation/EmptySpringAnnotation.java
diff --git a/.../java/test/annotation/transaction/Tx.java → .../java/test/annotation/transaction/Tx.java b/.../java/test/annotation/transaction/Tx.java → .../java/test/annotation/transaction/Tx.java
diff --git a/...t/java/test/aop/CountingBeforeAdvice.java → ...t/java/test/aop/CountingBeforeAdvice.java b/...t/java/test/aop/CountingBeforeAdvice.java → ...t/java/test/aop/CountingBeforeAdvice.java
diff --git a/...c/test/java/test/aop/DefaultLockable.java → ...c/test/java/test/aop/DefaultLockable.java b/...c/test/java/test/aop/DefaultLockable.java → ...c/test/java/test/aop/DefaultLockable.java
diff --git a/....aop/src/test/java/test/aop/Lockable.java → ...-aop/src/test/java/test/aop/Lockable.java b/....aop/src/test/java/test/aop/Lockable.java → ...-aop/src/test/java/test/aop/Lockable.java
diff --git a/...src/test/java/test/aop/MethodCounter.java → ...src/test/java/test/aop/MethodCounter.java b/...src/test/java/test/aop/MethodCounter.java → ...src/test/java/test/aop/MethodCounter.java
diff --git a/...rc/test/java/test/aop/NopInterceptor.java → ...rc/test/java/test/aop/NopInterceptor.java b/...rc/test/java/test/aop/NopInterceptor.java → ...rc/test/java/test/aop/NopInterceptor.java
diff --git a/...c/test/java/test/aop/PerTargetAspect.java → ...c/test/java/test/aop/PerTargetAspect.java b/...c/test/java/test/aop/PerTargetAspect.java → ...c/test/java/test/aop/PerTargetAspect.java
diff --git a/...src/test/java/test/aop/PerThisAspect.java → ...src/test/java/test/aop/PerThisAspect.java b/...src/test/java/test/aop/PerThisAspect.java → ...src/test/java/test/aop/PerThisAspect.java
diff --git a/.../test/aop/SerializableNopInterceptor.java → .../test/aop/SerializableNopInterceptor.java b/.../test/aop/SerializableNopInterceptor.java → .../test/aop/SerializableNopInterceptor.java
diff --git a/...c/test/java/test/aop/TwoAdviceAspect.java → ...c/test/java/test/aop/TwoAdviceAspect.java b/...c/test/java/test/aop/TwoAdviceAspect.java → ...c/test/java/test/aop/TwoAdviceAspect.java
diff --git a/....aop/src/test/java/test/beans/Colour.java → ...-aop/src/test/java/test/beans/Colour.java b/....aop/src/test/java/test/beans/Colour.java → ...-aop/src/test/java/test/beans/Colour.java
diff --git a/...est/java/test/beans/CountingTestBean.java → ...est/java/test/beans/CountingTestBean.java b/...est/java/test/beans/CountingTestBean.java → ...est/java/test/beans/CountingTestBean.java