+ Repackaged src and test from .config.java.* -> .context.annotation.*

org.springframework.config.java/src/main/java/org/springframework/context/annotation/Bean.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java;
+package org.springframework.context.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

org.springframework.config.java/src/main/java/org/springframework/context/annotation/Configuration.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java;
+package org.springframework.context.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
 
 import org.springframework.beans.factory.annotation.Autowire;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.config.java.support.ConfigurationClassPostProcessor;
+import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
 import org.springframework.stereotype.Component;
 
 

org.springframework.config.java/src/main/java/org/springframework/context/annotation/Import.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java;
+package org.springframework.context.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

org.springframework.config.java/src/main/java/org/springframework/context/annotation/StandardScopes.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java;
+package org.springframework.context.annotation;
 
 
 /**

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AbstractConfigurationClassProcessor.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.FailFastProblemReporter;
 import org.springframework.beans.factory.parsing.ProblemReporter;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
 
 /**

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AddAnnotationAdapter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import net.sf.cglib.asm.Constants;
 

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AnnotationAdapter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import org.springframework.asm.AnnotationVisitor;
 

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/AsmUtils.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import java.io.IOException;
 import java.io.InputStream;

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/BeanMethod.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
-import static org.springframework.config.java.StandardScopes.*;
+import static org.springframework.context.annotation.StandardScopes.*;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Modifier;
@@ -26,8 +26,8 @@ import org.springframework.beans.BeanMetadataElement;
 import org.springframework.beans.factory.parsing.Location;
 import org.springframework.beans.factory.parsing.Problem;
 import org.springframework.beans.factory.parsing.ProblemReporter;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.util.Assert;

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/BeanMethodInterceptor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
 
@@ -26,7 +26,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.config.java.Bean;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Scope;
 import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.core.annotation.AnnotationUtils;

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClass.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
 
@@ -23,8 +23,8 @@ import java.util.Set;
 
 import org.springframework.beans.factory.parsing.Problem;
 import org.springframework.beans.factory.parsing.ProblemReporter;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.util.Assert;
 
 

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClassMethodVisitor.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
-import static org.springframework.config.java.support.AsmUtils.*;
-import static org.springframework.config.java.support.MutableAnnotationUtils.*;
-import static org.springframework.config.java.support.Util.*;
+import static org.springframework.context.annotation.support.AsmUtils.*;
+import static org.springframework.context.annotation.support.MutableAnnotationUtils.*;
+import static org.springframework.context.annotation.support.Util.*;
 import static org.springframework.util.ClassUtils.*;
 
 import java.lang.annotation.Annotation;
@@ -29,8 +29,8 @@ import org.springframework.asm.Label;
 import org.springframework.asm.MethodAdapter;
 import org.springframework.asm.MethodVisitor;
 import org.springframework.asm.Opcodes;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
 
 /**

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClassPostProcessor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
 
@@ -27,8 +27,8 @@ import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.core.type.ClassMetadata;

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationClassVisitor.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
-import static org.springframework.config.java.support.MutableAnnotationUtils.*;
+import static org.springframework.context.annotation.support.MutableAnnotationUtils.*;
 import static org.springframework.util.ClassUtils.*;
 
 import java.util.HashMap;
@@ -31,8 +31,8 @@ import org.springframework.asm.Opcodes;
 import org.springframework.beans.factory.parsing.Location;
 import org.springframework.beans.factory.parsing.Problem;
 import org.springframework.beans.factory.parsing.ProblemReporter;
-import org.springframework.config.java.Configuration;
-import org.springframework.config.java.Import;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.core.io.ClassPathResource;
 
 

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationEnhancer.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
-import static org.springframework.config.java.support.Util.*;
+import static org.springframework.context.annotation.support.Util.*;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -34,8 +34,8 @@ import org.springframework.asm.ClassAdapter;
 import org.springframework.asm.ClassReader;
 import org.springframework.asm.ClassWriter;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.util.Assert;
 

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationModel.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
 
@@ -21,7 +21,7 @@ import java.util.LinkedHashSet;
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.ProblemReporter;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Configuration;
 
 
 /**

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationModelBeanDefinitionReader.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
 import static org.springframework.util.StringUtils.*;
@@ -35,8 +35,8 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.support.SimpleBeanDefinitionRegistry;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.core.io.Resource;

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ConfigurationParser.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import org.springframework.asm.ClassReader;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.ProblemReporter;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.util.ClassUtils;
 
 

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ImportAnnotationVisitor.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
-import static org.springframework.config.java.support.AsmUtils.*;
+import static org.springframework.context.annotation.support.AsmUtils.*;
 import static org.springframework.util.ClassUtils.*;
 
 import java.util.ArrayList;
@@ -25,7 +25,7 @@ import org.springframework.asm.AnnotationVisitor;
 import org.springframework.asm.ClassReader;
 import org.springframework.asm.Type;
 import org.springframework.beans.factory.parsing.ProblemReporter;
-import org.springframework.config.java.Import;
+import org.springframework.context.annotation.Import;
 import org.springframework.util.Assert;
 
 

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ImportStack.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.Stack;
 
-import org.springframework.config.java.Import;
+import org.springframework.context.annotation.Import;
 import org.springframework.util.Assert;
 
 

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ImportStackHolder.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
-import org.springframework.config.java.Import;
+import org.springframework.context.annotation.Import;
 
 
 /**

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/ModelClass.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static org.springframework.util.ClassUtils.*;
 

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotation.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 /**
  * Note: the visibility of this interface would be reduced to package-private save for an

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationArrayVisitor.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
-import static org.springframework.config.java.support.MutableAnnotationUtils.*;
-import static org.springframework.config.java.support.Util.*;
+import static org.springframework.context.annotation.support.MutableAnnotationUtils.*;
+import static org.springframework.context.annotation.support.Util.*;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Array;

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationInvocationHandler.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
 import static org.springframework.core.annotation.AnnotationUtils.*;

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationUtils.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Proxy;

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/MutableAnnotationVisitor.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
-import static org.springframework.config.java.support.MutableAnnotationUtils.*;
-import static org.springframework.config.java.support.Util.*;
+import static org.springframework.context.annotation.support.MutableAnnotationUtils.*;
+import static org.springframework.context.annotation.support.Util.*;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;

org.springframework.config.java/src/main/java/org/springframework/context/annotation/support/Util.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
 import static org.springframework.util.ClassUtils.*;

org.springframework.config.java/src/test/java/org/springframework/config/java/support/package-info.java

@@ -1,7 +0,0 @@
-/**
- * Unit tests for support classes related to 
- * {@link org.springframework.config.java.Configuration} class processing.
- * 
- * @author Chris Beams
- */
-package org.springframework.config.java.support;

org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AbstractBeanDefinitionConfigurationClassTests.java

@@ -22,9 +22,9 @@ import org.junit.Test;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
-import org.springframework.config.java.support.ConfigurationClassPostProcessor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
 
 
 /**

org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AspectTests.java

@@ -8,9 +8,9 @@ import org.aspectj.lang.annotation.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.XmlBeanFactory;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
-import org.springframework.config.java.support.ConfigurationClassPostProcessor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 

org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java

@@ -6,8 +6,8 @@ import static org.junit.Assert.*;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 import test.beans.Colour;

org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.xml

@@ -7,9 +7,9 @@
 
 	<context:annotation-config/>
 	
-	<bean class="org.springframework.config.java.support.ConfigurationClassPostProcessor"/>
+	<bean class="org.springframework.context.annotation.support.ConfigurationClassPostProcessor"/>
 	
-	<bean class="test.basic.AutowiredConfigurationTests$AutowiredConfig"/>
-	<bean class="test.basic.AutowiredConfigurationTests$ColorConfig"/>
+	<bean class="org.springframework.context.annotation.configuration.AutowiredConfigurationTests$AutowiredConfig"/>
+	<bean class="org.springframework.context.annotation.configuration.AutowiredConfigurationTests$ColorConfig"/>
 	
 </beans>

org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/BasicTests.java

@@ -11,11 +11,11 @@ import org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostP
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
-import org.springframework.config.java.StandardScopes;
-import org.springframework.config.java.support.ConfigurationClassPostProcessor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
+import org.springframework.context.annotation.StandardScopes;
+import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
 
 import test.beans.ITestBean;
 import test.beans.TestBean;

org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ImportTests.java

@@ -22,10 +22,10 @@ import org.junit.Test;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
-import org.springframework.config.java.Import;
-import org.springframework.config.java.support.ConfigurationClassPostProcessor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
 
 import test.beans.ITestBean;
 import test.beans.TestBean;

org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/PolymorphicConfigurationTests.java

@@ -20,9 +20,9 @@ import java.lang.annotation.Inherited;
 import org.junit.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
-import org.springframework.config.java.support.ConfigurationClassPostProcessor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
 
 import test.beans.TestBean;
 

org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ScopingTests.java

@@ -25,12 +25,12 @@ import org.junit.Test;
 import org.springframework.aop.scope.ScopedObject;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
-import org.springframework.config.java.StandardScopes;
-import org.springframework.config.java.support.ConfigurationClassPostProcessor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Scope;
 import org.springframework.context.annotation.ScopedProxyMode;
+import org.springframework.context.annotation.StandardScopes;
+import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
 import org.springframework.context.support.GenericApplicationContext;
 
 import test.beans.CustomScope;

org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/ValueInjectionTests.xml

@@ -7,9 +7,9 @@
 
 	<context:annotation-config/>
 	
-	<bean class="org.springframework.config.java.support.ConfigurationClassPostProcessor"/>
+	<bean class="org.springframework.context.annotation.support.ConfigurationClassPostProcessor"/>
 	
-	<bean class="test.basic.AutowiredConfigurationTests$ValueConfig"/>
+	<bean class="org.springframework.context.annotation.configuration.AutowiredConfigurationTests$ValueConfig"/>
 	
 <!--
 	<context:component-scan  base-package="test.basic.value"/>

org.springframework.config.java/src/test/java/org/springframework/context/annotation/configuration/package-info.java

@@ -1,10 +1,10 @@
 /**
- * Integration tests for {@link org.springframework.config.java.Configuration}
+ * Integration tests for {@link org.springframework.context.annotation.Configuration}
  * class processing.
  * 
  * @author Chris Beams
- * @see org.springframework.config.java.Configuration
- * @see org.springframework.config.java.Bean
- * @see org.springframework.config.java.support.ConfigurationClassPostProcessor
+ * @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;

org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/AbstractCircularImportDetectionTests.java

@@ -13,14 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static org.junit.Assert.*;
 
 import org.junit.Test;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Import;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.support.ConfigurationParser;
 
 import test.beans.TestBean;
 

org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/AsmCircularImportDetectionTests.java

@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import org.springframework.beans.factory.parsing.FailFastProblemReporter;
-import org.springframework.config.java.Import;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.support.ConfigurationParser;
 import org.springframework.util.ClassUtils;
 
 

org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/BeanMethodTests.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
-import static org.springframework.config.java.StandardScopes.*;
-import static org.springframework.config.java.support.MutableAnnotationUtils.*;
 import static org.springframework.context.annotation.ScopedProxyMode.*;
+import static org.springframework.context.annotation.StandardScopes.*;
+import static org.springframework.context.annotation.support.MutableAnnotationUtils.*;
 
 import java.lang.reflect.Modifier;
 
@@ -28,8 +28,11 @@ import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.beans.factory.parsing.FailFastProblemReporter;
 import org.springframework.beans.factory.parsing.Location;
 import org.springframework.beans.factory.parsing.ProblemReporter;
-import org.springframework.config.java.Bean;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Scope;
+import org.springframework.context.annotation.support.BeanMethod;
+import org.springframework.context.annotation.support.ConfigurationClass;
+import org.springframework.context.annotation.support.ModelClass;
 import org.springframework.core.io.ClassPathResource;
 
 

org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/ConfigurationModelTests.java

@@ -13,13 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static java.lang.String.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
 import org.junit.Test;
+import org.springframework.context.annotation.support.ConfigurationClass;
+import org.springframework.context.annotation.support.ConfigurationModel;
 
 
 /**

org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/ConfigurationPostProcessorTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
@@ -24,8 +24,9 @@ import java.util.Vector;
 
 import org.junit.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.config.java.Bean;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
 import org.springframework.util.ClassUtils;
 
 

org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/InvalidConfigurationClassDefinitionTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.config.java.support;
+package org.springframework.context.annotation.support;
 
 import static org.junit.Assert.*;
 import static org.springframework.beans.factory.support.BeanDefinitionBuilder.*;
@@ -22,7 +22,8 @@ import org.junit.Test;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.config.java.Configuration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.support.ConfigurationClassPostProcessor;
 
 
 /**

org.springframework.config.java/src/test/java/org/springframework/context/annotation/support/package-info.java

@@ -0,0 +1,7 @@
+/**
+ * Unit tests for support classes related to 
+ * {@link org.springframework.context.annotation.Configuration} class processing.
+ * 
+ * @author Chris Beams
+ */
+package org.springframework.context.annotation.support;