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

polishing

This commit is contained in:
Sam Brannen 2011-04-04 22:05:49 +00:00
parent 74f1e0e9d0
commit 070b7b6afe
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
View File

@ -322,7 +322,7 @@ public class ConfigurationClassBeanDefinitionReader {
} }
} }
BeanDefinitionReader reader = readerInstanceCache.get(readerClass); BeanDefinitionReader reader = readerInstanceCache.get(readerClass);
// TODO SPR-6310: qualify relatively pathed locations as done in AbstractContextLoader.modifyLocations // TODO SPR-6310: qualify relative path locations as done in AbstractContextLoader.modifyLocations
reader.loadBeanDefinitions(resource); reader.loadBeanDefinitions(resource);
} }
} }
@ -383,7 +383,7 @@ public class ConfigurationClassBeanDefinitionReader {
/** /**
* {@link RootBeanDefinition} marker subclass used to signify that a bean definition * {@link RootBeanDefinition} marker subclass used to signify that a bean definition
* created from a configuration class as opposed to any other configuration source. * was created from a configuration class as opposed to any other configuration source.
* Used in bean overriding cases where it's necessary to determine whether the bean * Used in bean overriding cases where it's necessary to determine whether the bean
* definition was created externally. * definition was created externally.
*/ */
@ -423,7 +423,7 @@ public class ConfigurationClassBeanDefinitionReader {
*/ */
private static class InvalidConfigurationImportProblem extends Problem { private static class InvalidConfigurationImportProblem extends Problem {
public InvalidConfigurationImportProblem(String className, Resource resource, AnnotationMetadata metadata) { public InvalidConfigurationImportProblem(String className, Resource resource, AnnotationMetadata metadata) {
super(String.format("%s was @Import'ed as a but is not annotated with @FeatureConfiguration or " + super(String.format("%s was @Import'ed but is not annotated with @FeatureConfiguration or " +
"@Configuration nor does it declare any @Bean methods. Update the class to " + "@Configuration nor does it declare any @Bean methods. Update the class to " +
"meet one of these requirements or do not attempt to @Import it.", className), "meet one of these requirements or do not attempt to @Import it.", className),
new Location(resource, metadata)); new Location(resource, metadata));