You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by lg...@apache.org on 2008/06/30 20:34:43 UTC
svn commit: r672860 -
/cocoon/trunk/subprojects/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/configurator/impl/AbstractElementParser.java
Author: lgawron
Date: Mon Jun 30 11:34:42 2008
New Revision: 672860
URL: http://svn.apache.org/viewvc?rev=672860&view=rev
Log:
deprecated beanDef.setSingleton(true) -> beanDef.setScope(BeanDefinition.SCOPE_SINGLETON)
Modified:
cocoon/trunk/subprojects/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/configurator/impl/AbstractElementParser.java
Modified: cocoon/trunk/subprojects/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/configurator/impl/AbstractElementParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/subprojects/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/configurator/impl/AbstractElementParser.java?rev=672860&r1=672859&r2=672860&view=diff
==============================================================================
--- cocoon/trunk/subprojects/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/configurator/impl/AbstractElementParser.java (original)
+++ cocoon/trunk/subprojects/cocoon-configuration/cocoon-spring-configurator/src/main/java/org/apache/cocoon/spring/configurator/impl/AbstractElementParser.java Mon Jun 30 11:34:42 2008
@@ -60,7 +60,7 @@
if (value == null || value.trim().length() == 0) {
value = defaultValue;
}
-
+
return value;
}
@@ -76,7 +76,7 @@
elements.add(node);
}
}
-
+
return (Element[]) elements.toArray(new Element[elements.size()]);
}
@@ -180,7 +180,7 @@
}
private void fillBeanDefinition(RootBeanDefinition beanDef, String initMethod, boolean requiresSettings) {
- beanDef.setSingleton(true);
+ beanDef.setScope(BeanDefinition.SCOPE_SINGLETON);
beanDef.setLazyInit(false);
if (initMethod != null) {
beanDef.setInitMethodName(initMethod);