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

Polish .aop copy of SpringConfiguredBDP 

Add 'infrastructure' bean role to follow suit with original .context SCPDP

Encountered while working on SPR-7888 (@EnableSpringConfigured)
This commit is contained in:
Chris Beams 2011-11-28 06:57:04 +00:00
parent e90c7eadc2
commit 22e37aac44
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
org.springframework.aop/src/main/java/org/springframework/aop/config/SpringConfiguredBeanDefinitionParser.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2007 the original author or authors. * Copyright 2002-2011 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -26,13 +26,13 @@ import org.springframework.beans.factory.xml.ParserContext;
/** /**
* {@link BeanDefinitionParser} responsible for parsing the * {@link BeanDefinitionParser} responsible for parsing the
* <code>&lt;aop:spring-configured/&gt;</code> tag. * {@code <aop:spring-configured/>} tag.
* *
* <p><b>NOTE:</b> This is essentially a duplicate of Spring 2.5's * <p><b>NOTE:</b> This is essentially a duplicate of Spring 2.5's
* {@link org.springframework.context.config.SpringConfiguredBeanDefinitionParser} * {@link org.springframework.context.config.SpringConfiguredBeanDefinitionParser}
* for the <code>&lt;context:spring-configured/&gt;</code> tag, mirrored here * for the {@code <context:spring-configured/>} tag, mirrored here for compatibility with
* for compatibility with Spring 2.0's <code>&lt;aop:spring-configured/&gt;</code> * Spring 2.0's {@code <aop:spring-configured/>} tag (avoiding a direct dependency on the
* tag (avoiding a direct dependency on the context package). * context package).
* *
* @author Rob Harrop * @author Rob Harrop
* @author Juergen Hoeller * @author Juergen Hoeller
@ -55,6 +55,7 @@ class SpringConfiguredBeanDefinitionParser implements BeanDefinitionParser {
RootBeanDefinition def = new RootBeanDefinition(); RootBeanDefinition def = new RootBeanDefinition();
def.setBeanClassName(BEAN_CONFIGURER_ASPECT_CLASS_NAME); def.setBeanClassName(BEAN_CONFIGURER_ASPECT_CLASS_NAME);
def.setFactoryMethodName("aspectOf"); def.setFactoryMethodName("aspectOf");
def.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
def.setSource(parserContext.extractSource(element)); def.setSource(parserContext.extractSource(element));
parserContext.registerBeanComponent(new BeanComponentDefinition(def, BEAN_CONFIGURER_ASPECT_BEAN_NAME)); parserContext.registerBeanComponent(new BeanComponentDefinition(def, BEAN_CONFIGURER_ASPECT_BEAN_NAME));
} }

6
org.springframework.context/src/main/java/org/springframework/context/config/SpringConfiguredBeanDefinitionParser.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2008 the original author or authors. * Copyright 2002-2011 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -26,7 +26,7 @@ import org.springframework.beans.factory.xml.ParserContext;
/** /**
* {@link BeanDefinitionParser} responsible for parsing the * {@link BeanDefinitionParser} responsible for parsing the
* <code>&lt;context:spring-configured/&gt;</code> tag. * {@code <context:spring-configured/>} tag.
* *
* @author Juergen Hoeller * @author Juergen Hoeller
* @since 2.5 * @since 2.5
@ -48,8 +48,6 @@ class SpringConfiguredBeanDefinitionParser implements BeanDefinitionParser {
RootBeanDefinition def = new RootBeanDefinition(); RootBeanDefinition def = new RootBeanDefinition();
def.setBeanClassName(BEAN_CONFIGURER_ASPECT_CLASS_NAME); def.setBeanClassName(BEAN_CONFIGURER_ASPECT_CLASS_NAME);
def.setFactoryMethodName("aspectOf"); def.setFactoryMethodName("aspectOf");
// Mark as infrastructure bean and attach source location.
def.setRole(BeanDefinition.ROLE_INFRASTRUCTURE); def.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
def.setSource(parserContext.extractSource(element)); def.setSource(parserContext.extractSource(element));
parserContext.registerBeanComponent(new BeanComponentDefinition(def, BEAN_CONFIGURER_ASPECT_BEAN_NAME)); parserContext.registerBeanComponent(new BeanComponentDefinition(def, BEAN_CONFIGURER_ASPECT_BEAN_NAME));