From 868ca2bb4a771fdc9599e07589f0c3cdc8c093ea Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Mon, 23 Mar 2009 04:48:04 +0000 Subject: [PATCH] + Moving .config.java module -> .context git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@786 50f2f4bb-b051-0410-bef5-90022cba6387 --- org.springframework.config.java/.classpath | 1 + org.springframework.config.java/.project | 11 +++ .../configuration/package-info.java | 10 --- .../annotation/support/package-info.java | 7 -- org.springframework.context/ivy.xml | 2 +- .../context/annotation/Bean.java | 0 .../context/annotation/Configuration.java | 3 +- .../context/annotation/Import.java | 0 .../context/annotation/StandardScopes.java | 0 .../AbstractConfigurationClassProcessor.java | 0 .../support/AddAnnotationAdapter.java | 0 .../annotation/support/AnnotationAdapter.java | 0 .../context/annotation/support/AsmUtils.java | 0 .../annotation/support/BeanMethod.java | 0 .../support/BeanMethodInterceptor.java | 0 .../support/ConfigurationClass.java | 0 .../ConfigurationClassMethodVisitor.java | 0 .../ConfigurationClassPostProcessor.java | 0 .../support/ConfigurationClassVisitor.java | 0 .../support/ConfigurationEnhancer.java | 0 .../support/ConfigurationModel.java | 0 ...onfigurationModelBeanDefinitionReader.java | 0 .../support/ConfigurationParser.java | 0 .../support/ImportAnnotationVisitor.java | 0 .../annotation/support/ImportStack.java | 0 .../annotation/support/ImportStackHolder.java | 0 .../annotation/support/ModelClass.java | 0 .../annotation/support/MutableAnnotation.java | 0 .../MutableAnnotationArrayVisitor.java | 0 .../MutableAnnotationInvocationHandler.java | 0 .../support/MutableAnnotationUtils.java | 0 .../support/MutableAnnotationVisitor.java | 0 .../context/annotation/support/Util.java | 0 ...BeanDefinitionConfigurationClassTests.java | 0 .../AbstractJavaConfigTests.java | 0 .../annotation/configuration/AspectTests.java | 0 .../AutowiredConfigurationTests.java | 0 .../AutowiredConfigurationTests.xml | 0 .../annotation/configuration/BasicTests.java | 0 .../annotation/configuration/ImportTests.java | 0 .../PolymorphicConfigurationTests.java | 0 .../configuration/ScopingTests.java | 75 ++++++++++++++++++- .../configuration/ValueInjectionTests.xml | 0 .../aspectj-autoproxy-config.xml | 0 .../configuration/package-info.java | 26 +++++++ .../AbstractCircularImportDetectionTests.java | 0 .../AsmCircularImportDetectionTests.java | 0 .../annotation/support/BeanMethodTests.java | 0 .../support/ConfigurationModelTests.java | 0 .../ConfigurationPostProcessorTests.java | 0 ...alidConfigurationClassDefinitionTests.java | 0 .../annotation/support/package-info.java | 23 ++++++ .../ClassPathXmlApplicationContextTests.java | 4 +- .../src/test/java/test/beans/Colour.java | 0 .../src/test/java/test/beans/CustomScope.java | 0 .../java/test/beans/DependsOnTestBean.java | 0 .../test/java/test/beans/INestedTestBean.java | 0 .../src/test/java/test/beans/IOther.java | 0 .../src/test/java/test/beans/ITestBean.java | 0 .../test/java/test/beans/IndexedTestBean.java | 0 .../test/java/test/beans/NestedTestBean.java | 0 .../src/test/java/test/beans/TestBean.java | 0 62 files changed, 137 insertions(+), 25 deletions(-) delete mode 100644 org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/package-info.java delete mode 100644 org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/package-info.java rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/Bean.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/Configuration.java (94%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/Import.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/StandardScopes.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/AbstractConfigurationClassProcessor.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/AddAnnotationAdapter.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/AnnotationAdapter.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/AsmUtils.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/BeanMethod.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/BeanMethodInterceptor.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/ConfigurationClass.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/ConfigurationClassMethodVisitor.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/ConfigurationClassPostProcessor.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/ConfigurationClassVisitor.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/ConfigurationEnhancer.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/ConfigurationModel.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/ConfigurationModelBeanDefinitionReader.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/ConfigurationParser.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/ImportAnnotationVisitor.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/ImportStack.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/ImportStackHolder.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/ModelClass.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/MutableAnnotation.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/MutableAnnotationArrayVisitor.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/MutableAnnotationInvocationHandler.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/MutableAnnotationUtils.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/MutableAnnotationVisitor.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/main/java/org/springframework/context/annotation/support/Util.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/org/springframework/context/annotation/configuration/AbstractBeanDefinitionConfigurationClassTests.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/org/springframework/context/annotation/configuration/AbstractJavaConfigTests.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/org/springframework/context/annotation/configuration/AspectTests.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/org/springframework/context/annotation/configuration/BasicTests.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/org/springframework/context/annotation/configuration/PolymorphicConfigurationTests.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java (85%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/org/springframework/context/annotation/configuration/aspectj-autoproxy-config.xml (100%) create mode 100644 org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/package-info.java rename {org.springframework.config.java => org.springframework.context}/src/test/java/org/springframework/context/annotation/support/AbstractCircularImportDetectionTests.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/org/springframework/context/annotation/support/AsmCircularImportDetectionTests.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/org/springframework/context/annotation/support/BeanMethodTests.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/org/springframework/context/annotation/support/ConfigurationModelTests.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/org/springframework/context/annotation/support/ConfigurationPostProcessorTests.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/org/springframework/context/annotation/support/InvalidConfigurationClassDefinitionTests.java (100%) create mode 100644 org.springframework.context/src/test/java/org/springframework/context/annotation/support/package-info.java rename {org.springframework.config.java => org.springframework.context}/src/test/java/test/beans/Colour.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/test/beans/CustomScope.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/test/beans/DependsOnTestBean.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/test/beans/INestedTestBean.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/test/beans/IOther.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/test/beans/ITestBean.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/test/beans/IndexedTestBean.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/test/beans/NestedTestBean.java (100%) rename {org.springframework.config.java => org.springframework.context}/src/test/java/test/beans/TestBean.java (100%) diff --git a/org.springframework.config.java/.classpath b/org.springframework.config.java/.classpath index 97db2030c1c..0ce4ca9d9f3 100644 --- a/org.springframework.config.java/.classpath +++ b/org.springframework.config.java/.classpath @@ -1,5 +1,6 @@ + diff --git a/org.springframework.config.java/.project b/org.springframework.config.java/.project index d73d5ca3e59..4607e560c88 100644 --- a/org.springframework.config.java/.project +++ b/org.springframework.config.java/.project @@ -10,11 +10,21 @@ + + com.cenqua.clover.core.prejavabuilder + + + org.eclipse.jdt.core.javabuilder + + com.cenqua.clover.core.postjavabuilder + + + org.eclipse.wst.validation.validationbuilder @@ -32,5 +42,6 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.wst.common.modulecore.ModuleCoreNature org.eclipse.jem.workbench.JavaEMFNature + com.cenqua.clover.core.clovernature diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/package-info.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/package-info.java deleted file mode 100644 index 1746f9e9cb1..00000000000 --- a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * Integration tests for {@link org.springframework.context.annotation.Configuration} - * class processing. - * - * @author Chris Beams - * @see org.springframework.context.annotation.Configuration - * @see org.springframework.context.annotation.Bean - * @see org.springframework.context.annotation.support.ConfigurationClassPostProcessor - */ -package org.springframework.context.annotation.configuration; \ No newline at end of file diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/package-info.java b/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/package-info.java deleted file mode 100644 index d01bd1bc227..00000000000 --- a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -/** - * Unit tests for support classes related to - * {@link org.springframework.context.annotation.Configuration} class processing. - * - * @author Chris Beams - */ -package org.springframework.context.annotation.support; \ No newline at end of file diff --git a/org.springframework.context/ivy.xml b/org.springframework.context/ivy.xml index cd9e82c3d26..89c125b9070 100644 --- a/org.springframework.context/ivy.xml +++ b/org.springframework.context/ivy.xml @@ -46,6 +46,7 @@ + @@ -59,7 +60,6 @@ - diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/Bean.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/Bean.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/Bean.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/Bean.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/Configuration.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/Configuration.java similarity index 94% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/Configuration.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/Configuration.java index cdfbd52a391..4cdcd961e96 100644 --- a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/Configuration.java +++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/Configuration.java @@ -24,7 +24,6 @@ import java.lang.annotation.Target; import org.springframework.beans.factory.annotation.Autowire; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.support.ConfigurationClassPostProcessor; import org.springframework.stereotype.Component; @@ -52,7 +51,7 @@ import org.springframework.stereotype.Component; * @author Rod Johnson * @author Chris Beams * @since 3.0 - * @see ConfigurationClassPostProcessor + * @see org.springframework.context.annotation.support.ConfigurationClassPostProcessor; * @see Bean * @see Lazy */ diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/Import.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/Import.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/Import.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/Import.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/StandardScopes.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/StandardScopes.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/StandardScopes.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/StandardScopes.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AbstractConfigurationClassProcessor.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/AbstractConfigurationClassProcessor.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AbstractConfigurationClassProcessor.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/AbstractConfigurationClassProcessor.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AddAnnotationAdapter.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/AddAnnotationAdapter.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AddAnnotationAdapter.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/AddAnnotationAdapter.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AnnotationAdapter.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/AnnotationAdapter.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AnnotationAdapter.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/AnnotationAdapter.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AsmUtils.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/AsmUtils.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AsmUtils.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/AsmUtils.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/BeanMethod.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/BeanMethod.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/BeanMethod.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/BeanMethod.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/BeanMethodInterceptor.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/BeanMethodInterceptor.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/BeanMethodInterceptor.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/BeanMethodInterceptor.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClass.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationClass.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClass.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationClass.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClassMethodVisitor.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationClassMethodVisitor.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClassMethodVisitor.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationClassMethodVisitor.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClassPostProcessor.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationClassPostProcessor.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClassPostProcessor.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationClassPostProcessor.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClassVisitor.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationClassVisitor.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClassVisitor.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationClassVisitor.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationEnhancer.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationEnhancer.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationEnhancer.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationEnhancer.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationModel.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationModel.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationModel.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationModel.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationModelBeanDefinitionReader.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationModelBeanDefinitionReader.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationModelBeanDefinitionReader.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationModelBeanDefinitionReader.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationParser.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationParser.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationParser.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/ConfigurationParser.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ImportAnnotationVisitor.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/ImportAnnotationVisitor.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ImportAnnotationVisitor.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/ImportAnnotationVisitor.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ImportStack.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/ImportStack.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ImportStack.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/ImportStack.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ImportStackHolder.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/ImportStackHolder.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ImportStackHolder.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/ImportStackHolder.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ModelClass.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/ModelClass.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ModelClass.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/ModelClass.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotation.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/MutableAnnotation.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotation.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/MutableAnnotation.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationArrayVisitor.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/MutableAnnotationArrayVisitor.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationArrayVisitor.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/MutableAnnotationArrayVisitor.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationInvocationHandler.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/MutableAnnotationInvocationHandler.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationInvocationHandler.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/MutableAnnotationInvocationHandler.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationUtils.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/MutableAnnotationUtils.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationUtils.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/MutableAnnotationUtils.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationVisitor.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/MutableAnnotationVisitor.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationVisitor.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/MutableAnnotationVisitor.java diff --git a/org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/Util.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/support/Util.java similarity index 100% rename from org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/Util.java rename to org.springframework.context/src/main/java/org/springframework/context/annotation/support/Util.java diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AbstractBeanDefinitionConfigurationClassTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AbstractBeanDefinitionConfigurationClassTests.java similarity index 100% rename from org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AbstractBeanDefinitionConfigurationClassTests.java rename to org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AbstractBeanDefinitionConfigurationClassTests.java diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AbstractJavaConfigTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AbstractJavaConfigTests.java similarity index 100% rename from org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AbstractJavaConfigTests.java rename to org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AbstractJavaConfigTests.java diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AspectTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AspectTests.java similarity index 100% rename from org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AspectTests.java rename to org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AspectTests.java diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java similarity index 100% rename from org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java rename to org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml b/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml similarity index 100% rename from org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml rename to org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/BasicTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/BasicTests.java similarity index 100% rename from org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/BasicTests.java rename to org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/BasicTests.java diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java similarity index 100% rename from org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java rename to org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/PolymorphicConfigurationTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/PolymorphicConfigurationTests.java similarity index 100% rename from org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/PolymorphicConfigurationTests.java rename to org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/PolymorphicConfigurationTests.java diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java similarity index 85% rename from org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java rename to org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java index 0a13c2cc13b..5ce1f75d31d 100644 --- a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java +++ b/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * 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. @@ -19,10 +19,14 @@ import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; import static org.springframework.beans.factory.support.BeanDefinitionBuilder.*; +import java.util.HashMap; +import java.util.Map; + import org.junit.After; import org.junit.Before; import org.junit.Test; import org.springframework.aop.scope.ScopedObject; +import org.springframework.beans.factory.ObjectFactory; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.context.annotation.Bean; @@ -33,7 +37,6 @@ import org.springframework.context.annotation.StandardScopes; import org.springframework.context.annotation.support.ConfigurationClassPostProcessor; import org.springframework.context.support.GenericApplicationContext; -import test.beans.CustomScope; import test.beans.ITestBean; import test.beans.TestBean; @@ -43,7 +46,6 @@ import test.beans.TestBean; * Tests that scopes are properly supported by using a custom Scope implementations * and scoped proxy {@link Bean} declarations. * - * @see ScopeIntegrationTests * @author Costin Leau * @author Chris Beams */ @@ -367,3 +369,70 @@ public class ScopingTests { } } + + +/** + * Simple scope implementation which creates object based on a flag. + * + * @author Costin Leau + * @author Chris Beams + */ +class CustomScope implements org.springframework.beans.factory.config.Scope { + + public boolean createNewScope = true; + + private Map beans = new HashMap(); + + /* + * (non-Javadoc) + * @see org.springframework.beans.factory.config.Scope#get(java.lang.String, + * org.springframework.beans.factory.ObjectFactory) + */ + 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); + } + + /* + * (non-Javadoc) + * @see org.springframework.beans.factory.config.Scope#getConversationId() + */ + public String getConversationId() { + return null; + } + + /* + * (non-Javadoc) + * @see org.springframework.beans.factory.config.Scope#registerDestructionCallback(java.lang.String, + * java.lang.Runnable) + */ + public void registerDestructionCallback(String name, Runnable callback) { + // do nothing + } + + /* + * (non-Javadoc) + * @see org.springframework.beans.factory.config.Scope#remove(java.lang.String) + */ + public Object remove(String name) { + return beans.remove(name); + } + + public Object resolveContextualObject(String key) { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml b/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml similarity index 100% rename from org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml rename to org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/aspectj-autoproxy-config.xml b/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/aspectj-autoproxy-config.xml similarity index 100% rename from org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/aspectj-autoproxy-config.xml rename to org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/aspectj-autoproxy-config.xml diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/package-info.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/package-info.java new file mode 100644 index 00000000000..f3af9e9540a --- /dev/null +++ b/org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/package-info.java @@ -0,0 +1,26 @@ +/* + * 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. + */ + +/** + * Integration tests for {@link org.springframework.context.annotation.Configuration} + * class processing. + * + * @author Chris Beams + * @see org.springframework.context.annotation.Configuration + * @see org.springframework.context.annotation.Bean + * @see org.springframework.context.annotation.support.ConfigurationClassPostProcessor + */ +package org.springframework.context.annotation.configuration; \ No newline at end of file diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/AbstractCircularImportDetectionTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/support/AbstractCircularImportDetectionTests.java similarity index 100% rename from org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/AbstractCircularImportDetectionTests.java rename to org.springframework.context/src/test/java/org/springframework/context/annotation/support/AbstractCircularImportDetectionTests.java diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/AsmCircularImportDetectionTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/support/AsmCircularImportDetectionTests.java similarity index 100% rename from org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/AsmCircularImportDetectionTests.java rename to org.springframework.context/src/test/java/org/springframework/context/annotation/support/AsmCircularImportDetectionTests.java diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/BeanMethodTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/support/BeanMethodTests.java similarity index 100% rename from org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/BeanMethodTests.java rename to org.springframework.context/src/test/java/org/springframework/context/annotation/support/BeanMethodTests.java diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/ConfigurationModelTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/support/ConfigurationModelTests.java similarity index 100% rename from org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/ConfigurationModelTests.java rename to org.springframework.context/src/test/java/org/springframework/context/annotation/support/ConfigurationModelTests.java diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/ConfigurationPostProcessorTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/support/ConfigurationPostProcessorTests.java similarity index 100% rename from org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/ConfigurationPostProcessorTests.java rename to org.springframework.context/src/test/java/org/springframework/context/annotation/support/ConfigurationPostProcessorTests.java diff --git a/org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/InvalidConfigurationClassDefinitionTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/support/InvalidConfigurationClassDefinitionTests.java similarity index 100% rename from org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/InvalidConfigurationClassDefinitionTests.java rename to org.springframework.context/src/test/java/org/springframework/context/annotation/support/InvalidConfigurationClassDefinitionTests.java diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/support/package-info.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/support/package-info.java new file mode 100644 index 00000000000..0b07d2dbbfd --- /dev/null +++ b/org.springframework.context/src/test/java/org/springframework/context/annotation/support/package-info.java @@ -0,0 +1,23 @@ +/* + * 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. + */ + +/** + * Unit tests for support classes related to + * {@link org.springframework.context.annotation.Configuration} class processing. + * + * @author Chris Beams + */ +package org.springframework.context.annotation.support; \ No newline at end of file diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java b/org.springframework.context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java index bff30a11adb..ce1b62e8e30 100644 --- a/org.springframework.context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java +++ b/org.springframework.context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * 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. @@ -49,7 +49,7 @@ import org.springframework.util.ObjectUtils; * @author Chris Beams */ public final class ClassPathXmlApplicationContextTests { - + private static final String PATH = "/org/springframework/context/support/"; private static final String RESOURCE_CONTEXT = PATH + "ClassPathXmlApplicationContextTests-resource.xml"; private static final String CONTEXT_WILDCARD = PATH + "test/context*.xml"; diff --git a/org.springframework.config.java/src/test/java/test/beans/Colour.java b/org.springframework.context/src/test/java/test/beans/Colour.java similarity index 100% rename from org.springframework.config.java/src/test/java/test/beans/Colour.java rename to org.springframework.context/src/test/java/test/beans/Colour.java diff --git a/org.springframework.config.java/src/test/java/test/beans/CustomScope.java b/org.springframework.context/src/test/java/test/beans/CustomScope.java similarity index 100% rename from org.springframework.config.java/src/test/java/test/beans/CustomScope.java rename to org.springframework.context/src/test/java/test/beans/CustomScope.java diff --git a/org.springframework.config.java/src/test/java/test/beans/DependsOnTestBean.java b/org.springframework.context/src/test/java/test/beans/DependsOnTestBean.java similarity index 100% rename from org.springframework.config.java/src/test/java/test/beans/DependsOnTestBean.java rename to org.springframework.context/src/test/java/test/beans/DependsOnTestBean.java diff --git a/org.springframework.config.java/src/test/java/test/beans/INestedTestBean.java b/org.springframework.context/src/test/java/test/beans/INestedTestBean.java similarity index 100% rename from org.springframework.config.java/src/test/java/test/beans/INestedTestBean.java rename to org.springframework.context/src/test/java/test/beans/INestedTestBean.java diff --git a/org.springframework.config.java/src/test/java/test/beans/IOther.java b/org.springframework.context/src/test/java/test/beans/IOther.java similarity index 100% rename from org.springframework.config.java/src/test/java/test/beans/IOther.java rename to org.springframework.context/src/test/java/test/beans/IOther.java diff --git a/org.springframework.config.java/src/test/java/test/beans/ITestBean.java b/org.springframework.context/src/test/java/test/beans/ITestBean.java similarity index 100% rename from org.springframework.config.java/src/test/java/test/beans/ITestBean.java rename to org.springframework.context/src/test/java/test/beans/ITestBean.java diff --git a/org.springframework.config.java/src/test/java/test/beans/IndexedTestBean.java b/org.springframework.context/src/test/java/test/beans/IndexedTestBean.java similarity index 100% rename from org.springframework.config.java/src/test/java/test/beans/IndexedTestBean.java rename to org.springframework.context/src/test/java/test/beans/IndexedTestBean.java diff --git a/org.springframework.config.java/src/test/java/test/beans/NestedTestBean.java b/org.springframework.context/src/test/java/test/beans/NestedTestBean.java similarity index 100% rename from org.springframework.config.java/src/test/java/test/beans/NestedTestBean.java rename to org.springframework.context/src/test/java/test/beans/NestedTestBean.java diff --git a/org.springframework.config.java/src/test/java/test/beans/TestBean.java b/org.springframework.context/src/test/java/test/beans/TestBean.java similarity index 100% rename from org.springframework.config.java/src/test/java/test/beans/TestBean.java rename to org.springframework.context/src/test/java/test/beans/TestBean.java