You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by il...@apache.org on 2012/05/29 16:19:02 UTC
svn commit: r1343741 -
/cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl/AbstractSettingsBeanFactoryPostProcessor.java
Author: ilgrosso
Date: Tue May 29 14:19:02 2012
New Revision: 1343741
URL: http://svn.apache.org/viewvc?rev=1343741&view=rev
Log:
Delegating processProperties() to parent class (PropertyPlaceholderConfigurer)
Modified:
cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl/AbstractSettingsBeanFactoryPostProcessor.java
Modified: cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl/AbstractSettingsBeanFactoryPostProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl/AbstractSettingsBeanFactoryPostProcessor.java?rev=1343741&r1=1343740&r2=1343741&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl/AbstractSettingsBeanFactoryPostProcessor.java (original)
+++ cocoon/subprojects/cocoon-spring-configurator/trunk/src/main/java/org/apache/cocoon/spring/configurator/impl/AbstractSettingsBeanFactoryPostProcessor.java Tue May 29 14:19:02 2012
@@ -289,18 +289,9 @@ public abstract class AbstractSettingsBe
* @see org.springframework.beans.factory.config.PropertyPlaceholderConfigurer#processProperties(org.springframework.beans.factory.config.ConfigurableListableBeanFactory, java.util.Properties)
*/
protected void processProperties(ConfigurableListableBeanFactory beanFactoryToProcess,
- Properties props)
- throws BeansException {
- final BeanDefinitionVisitor visitor = new CocoonSettingsResolvingBeanDefinitionVisitor(this.settings);
- String[] beanNames = beanFactoryToProcess.getBeanDefinitionNames();
- for (int i = 0; i < beanNames.length; i++) {
- BeanDefinition bd = beanFactoryToProcess.getBeanDefinition(beanNames[i]);
- try {
- visitor.visitBeanDefinition(bd);
- } catch (BeanDefinitionStoreException e) {
- throw new BeanDefinitionStoreException(bd.getResourceDescription(), beanNames[i], e);
- }
- }
+ Properties props) throws BeansException {
+
+ super.processProperties(beanFactoryToProcess, new SettingsProperties(this.settings));
}
/**