diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java index ae889fc7056..41bbfce232a 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.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. @@ -120,12 +120,13 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean /** - * Set the 'autowired' annotation type, to be used on constructors, fields, + * Set the 'autowired' annotation types, to be used on constructors, fields, * setter methods and arbitrary config methods. *
The default autowired annotation type is the Spring-provided - * {@link Autowired} annotation. + * {@link Autowired} annotation, as well as {@link Value} and raw + * use of the {@link Qualifier} annotation. *
This setter property exists so that developers can provide their own
- * (non-Spring-specific) annotation type to indicate that a member is
+ * (non-Spring-specific) annotation types to indicate that a member is
* supposed to be autowired.
*/
public void setAutowiredAnnotationTypes(Class extends Annotation>[] autowiredAnnotationTypes) {
diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java
index 1d8aa16e17d..5652a74d150 100644
--- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.java
+++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/InitDestroyAnnotationBeanPostProcessor.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.
@@ -77,7 +77,7 @@ public class InitDestroyAnnotationBeanPostProcessor
private Class extends Annotation> destroyAnnotationType;
- private int order = Ordered.LOWEST_PRECEDENCE - 1;
+ private int order = Ordered.LOWEST_PRECEDENCE;
private transient final Map