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

SPR-4783: missing commit for bean def parser (duh)

This commit is contained in:
David Syer 2009-10-27 18:03:38 +00:00
parent dee410c0c4
commit 092a25d0d8
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
org.springframework.beans/src/main/java/org/springframework/beans/factory/xml/AbstractBeanDefinitionParser.java
View File

@ -44,6 +44,7 @@ import org.springframework.util.StringUtils;
* @author Rob Harrop * @author Rob Harrop
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Rick Evans * @author Rick Evans
* @author Dave Syer
* @since 2.0 * @since 2.0
*/ */
public abstract class AbstractBeanDefinitionParser implements BeanDefinitionParser { public abstract class AbstractBeanDefinitionParser implements BeanDefinitionParser {
@ -51,6 +52,8 @@ public abstract class AbstractBeanDefinitionParser implements BeanDefinitionPars
/** Constant for the id attribute */ /** Constant for the id attribute */
public static final String ID_ATTRIBUTE = "id"; public static final String ID_ATTRIBUTE = "id";
/** Constant for the name attribute */
public static final String NAME_ATTRIBUTE = "name";
public final BeanDefinition parse(Element element, ParserContext parserContext) { public final BeanDefinition parse(Element element, ParserContext parserContext) {
AbstractBeanDefinition definition = parseInternal(element, parserContext); AbstractBeanDefinition definition = parseInternal(element, parserContext);
@ -62,7 +65,12 @@ public abstract class AbstractBeanDefinitionParser implements BeanDefinitionPars
"Id is required for element '" + parserContext.getDelegate().getLocalName(element) "Id is required for element '" + parserContext.getDelegate().getLocalName(element)
+ "' when used as a top-level tag", element); + "' when used as a top-level tag", element);
} }
BeanDefinitionHolder holder = new BeanDefinitionHolder(definition, id); String[] aliases = new String[0];
String name = element.getAttribute(NAME_ATTRIBUTE);
if (StringUtils.hasLength(name)) {
aliases = StringUtils.trimArrayElements(StringUtils.commaDelimitedListToStringArray(name));
}
BeanDefinitionHolder holder = new BeanDefinitionHolder(definition, id, aliases);
registerBeanDefinition(holder, parserContext.getRegistry()); registerBeanDefinition(holder, parserContext.getRegistry());
if (shouldFireEvents()) { if (shouldFireEvents()) {
BeanComponentDefinition componentDefinition = new BeanComponentDefinition(holder); BeanComponentDefinition componentDefinition = new BeanComponentDefinition(holder);