Rename test versions of @qualified and @Autowired

Avoid Eclipse classpath conflicts between test versions of @qualified
and @Autowired living in spring-core and actual versions living in
spring-beans.

Author: cbeams

spring-core/src/test/java/org/springframework/beans/factory/annotation/Autowired.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2002-2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.beans.factory.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.METHOD})
+public @interface TestAutowired {
+
+	/**
+	 * Declares whether the annotated dependency is required.
+	 * <p>Defaults to <code>true</code>.
+	 */
+	boolean required() default true;
+
+}

spring-core/src/test/java/org/springframework/beans/factory/annotation/TestAutowired.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,20 +23,11 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * This annotation may be used on a field or parameter as a qualifier for
- * candidate beans when autowiring. It may also be used to annotate other
- * custom annotations that can then in turn be used as qualifiers.
- *
- * @author Mark Fisher
- * @author Juergen Hoeller
- * @since 2.5
- */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.TYPE, ElementType.ANNOTATION_TYPE})
 @Inherited
 @Documented
-public @interface Qualifier {
+public @interface TestQualifier {
 
 	String value() default "";
 

spring-core/src/test/java/org/springframework/beans/factory/annotation/Qualifier.java renamed to spring-core/src/test/java/org/springframework/beans/factory/annotation/TestQualifier.java

@@ -33,8 +33,8 @@
 
 import org.junit.Test;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.TestAutowired;
+import org.springframework.beans.factory.annotation.TestQualifier;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.type.classreading.MetadataReader;
 import org.springframework.core.type.classreading.MetadataReaderFactory;
@@ -167,10 +167,10 @@ private void doTestAnnotationInfo(AnnotationMetadata metadata) {
 	}
 
 	private void doTestMethodAnnotationInfo(AnnotationMetadata classMetadata) {
-		Set<MethodMetadata> methods = classMetadata.getAnnotatedMethods(Autowired.class.getName());
+		Set<MethodMetadata> methods = classMetadata.getAnnotatedMethods(TestAutowired.class.getName());
 		assertThat(methods.size(), is(1));
 		for (MethodMetadata methodMetadata : methods) {
-			assertThat(methodMetadata.isAnnotated(Autowired.class.getName()), is(true));
+			assertThat(methodMetadata.isAnnotated(TestAutowired.class.getName()), is(true));
 		}
 	}
 
@@ -215,8 +215,8 @@ public static enum SomeEnum {
 	@SuppressWarnings({"serial", "unused"})
 	private static class AnnotatedComponent implements Serializable {
 
-		@Autowired
-		public void doWork(@Qualifier("myColor") java.awt.Color color) {
+		@TestAutowired
+		public void doWork(@TestQualifier("myColor") java.awt.Color color) {
 		}
 
 		public void doSleep()  {