diff --git a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationPostProcessor.java b/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationPostProcessor.java index a4dc8caf381677c8b8d6c6937ef27e7243255cee..c6a350c4c0849457d7de2c069cb19fd22380afa6 100644 --- a/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationPostProcessor.java +++ b/org.springframework.config.java/src/main/java/org/springframework/config/java/support/ConfigurationPostProcessor.java @@ -99,57 +99,6 @@ public class ConfigurationPostProcessor extends AbstractConfigurationClassProces return configBeanDefs; } -// /** -// * Searches beanFactory for any {@link Configuration} classes in order to -// * parse and enhance them. Also registers any {@link BeanPostProcessor} objects -// * necessary to fulfill JavaConfig requirements. -// */ -// public void postProcessBeanFactory2(ConfigurableListableBeanFactory clBeanFactory) throws BeansException { -// Assert.isInstanceOf(DefaultListableBeanFactory.class, clBeanFactory); -// DefaultListableBeanFactory beanFactory = (DefaultListableBeanFactory) clBeanFactory; -// -// ConfigurationModel model = parseAnyConfigurationClasses(beanFactory); -// -// enhanceAnyConfigurationClasses(beanFactory, model); -// } -// -// private ConfigurationModel parseAnyConfigurationClasses(DefaultListableBeanFactory beanFactory) { -// -// // linked map is important for maintaining predictable ordering of configuration -// // classes. -// // this is important in bean / value override situations. -// LinkedHashMap configClassResources = new LinkedHashMap(); -// -// for (String beanName : beanFactory.getBeanDefinitionNames()) { -// BeanDefinition beanDef = beanFactory.getBeanDefinition(beanName); -// if (beanDef.isAbstract()) -// continue; -// -// if (isConfigClass(beanDef)) { -// String path = ClassUtils.convertClassNameToResourcePath(beanDef.getBeanClassName()); -// configClassResources.put(beanName, new ClassPathResource(path)); -// } -// } -// -// ConfigurationModelBeanDefinitionReader modelBeanDefinitionReader = new ConfigurationModelBeanDefinitionReader( -// beanFactory); -// ConfigurationParser parser = new ConfigurationParser(ClassUtils.getDefaultClassLoader()); -// -// for (String id : configClassResources.keySet()) -// parser.parse(configClassResources.get(id).getPath(), id); -// -// ConfigurationModel model = parser.getConfigurationModel(); -// -// ArrayList errors = new ArrayList(); -// model.validate(errors); -// if (errors.size() > 0) -// throw new MalformedConfigurationException(errors.toArray(new UsageError[] {})); -// -// modelBeanDefinitionReader.loadBeanDefinitions(model); -// -// return model; -// } - @Override protected void validateModel(ConfigurationModel model) { ArrayList errors = new ArrayList();