root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

support @ManagedBean for name retrieval in AnnotationBeanNameGenerator as well; support @ManagedBean and @Named for direct use only 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2647 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Juergen Hoeller 2009-12-14 00:53:56 +00:00
parent 0d0d68a6ae
commit f7b6f34ddc
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.springframework.context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
View File

@ -111,6 +111,7 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator {
boolean isStereotype = annotationType.equals(COMPONENT_ANNOTATION_CLASSNAME) || boolean isStereotype = annotationType.equals(COMPONENT_ANNOTATION_CLASSNAME) ||
(metaAnnotationTypes != null && metaAnnotationTypes.contains(COMPONENT_ANNOTATION_CLASSNAME)) || (metaAnnotationTypes != null && metaAnnotationTypes.contains(COMPONENT_ANNOTATION_CLASSNAME)) ||
annotationType.equals("javax.annotation.ManagedBean") ||
annotationType.equals("javax.inject.Named"); annotationType.equals("javax.inject.Named");
return (isStereotype && attributes != null && attributes.containsKey("value")); return (isStereotype && attributes != null && attributes.containsKey("value"));
} }

4
org.springframework.context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
View File

@ -171,7 +171,7 @@ public class ClassPathScanningCandidateComponentProvider implements ResourceLoad
ClassLoader cl = ClassPathScanningCandidateComponentProvider.class.getClassLoader(); ClassLoader cl = ClassPathScanningCandidateComponentProvider.class.getClassLoader();
try { try {
this.includeFilters.add(new AnnotationTypeFilter( this.includeFilters.add(new AnnotationTypeFilter(
((Class<? extends Annotation>) cl.loadClass("javax.annotation.ManagedBean")))); ((Class<? extends Annotation>) cl.loadClass("javax.annotation.ManagedBean")), false));
logger.info("JSR-250 'javax.annotation.ManagedBean' found and supported for component scanning"); logger.info("JSR-250 'javax.annotation.ManagedBean' found and supported for component scanning");
} }
catch (ClassNotFoundException ex) { catch (ClassNotFoundException ex) {
@ -179,7 +179,7 @@ public class ClassPathScanningCandidateComponentProvider implements ResourceLoad
} }
try { try {
this.includeFilters.add(new AnnotationTypeFilter( this.includeFilters.add(new AnnotationTypeFilter(
((Class<? extends Annotation>) cl.loadClass("javax.inject.Named")))); ((Class<? extends Annotation>) cl.loadClass("javax.inject.Named")), false));
logger.info("JSR-330 'javax.inject.Named' annotation found and supported for component scanning"); logger.info("JSR-330 'javax.inject.Named' annotation found and supported for component scanning");
} }
catch (ClassNotFoundException ex) { catch (ClassNotFoundException ex) {