SPR-5246

+ clarify order of annotation and XML injection

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2934 50f2f4bb-b051-0410-bef5-90022cba6387

org.springframework.context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java

@@ -124,6 +124,9 @@ import org.springframework.util.StringUtils;
  * by the "context:annotation-config" and "context:component-scan" XML tags.
  * Remove or turn off the default annotation configuration there if you intend
  * to specify a custom CommonAnnotationBeanPostProcessor bean definition!
+ * <p><b>NOTE:</b> Annotation injection will be performed <i>before</i> XML injection; thus
+ * the latter configuration will override the former for properties wired through
+ * both approaches. 
  *
  * @author Juergen Hoeller
  * @since 2.5