Remove "Feature" support introduced in 3.1 M1

Feature-related support such as @feature, @FeatureConfiguration,
and FeatureSpecification types will be replaced by framework-provided
@configuration classes and convenience annotations such as
@componentscan (already exists), @EnableAsync, @EnableScheduling,
@EnableTransactionManagement and others.

Issue: SPR-8012,SPR-8034,SPR-8039,SPR-8188,SPR-8206,SPR-8223,
SPR-8225,SPR-8226,SPR-8227

Author: cbeams

build-spring-framework/resources/changelog.txt

@@ -7,6 +7,8 @@ Changes in version 3.1 M2 (2011-??-??)
 --------------------------------------
 
 * deprecated AbstractJUnit38SpringContextTests and AbstractTransactionalJUnit38SpringContextTests
+* eliminated @Feature support in favor of @Enable* and framework-provided @Configuration classes
+* introduced @EnableTransactionManagement, @EnableScheduling, and other @Enable* annotations
 
 
 Changes in version 3.1 M1 (2011-02-11)

org.springframework.aop/src/main/java/org/springframework/aop/config/AopNamespaceUtils.java

@@ -16,13 +16,12 @@
 
 package org.springframework.aop.config;
 
+import org.w3c.dom.Element;
+
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
-import org.springframework.beans.factory.parsing.ComponentRegistrar;
-import org.springframework.beans.factory.parsing.ComponentRegistrarAdapter;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
 
 /**
  * Utility class for handling registration of auto-proxy creators used internally
@@ -53,41 +52,22 @@ public abstract class AopNamespaceUtils {
 	private static final String EXPOSE_PROXY_ATTRIBUTE = "expose-proxy";
 
 
-	/**
-	 * @deprecated since Spring 3.1 in favor of
-	 * {@link #registerAutoProxyCreatorIfNecessary(BeanDefinitionRegistry, ComponentRegistrar, Object, Boolean, Boolean)}
-	 */
-	@Deprecated
 	public static void registerAutoProxyCreatorIfNecessary(
 			ParserContext parserContext, Element sourceElement) {
 
 		BeanDefinition beanDefinition = AopConfigUtils.registerAutoProxyCreatorIfNecessary(
 				parserContext.getRegistry(), parserContext.extractSource(sourceElement));
 		useClassProxyingIfNecessary(parserContext.getRegistry(), sourceElement);
-		registerComponentIfNecessary(beanDefinition, new ComponentRegistrarAdapter(parserContext));
-	}
-
-	public static void registerAutoProxyCreatorIfNecessary(
-			BeanDefinitionRegistry registry, ComponentRegistrar parserContext, Object source, Boolean proxyTargetClass, Boolean exposeProxy) {
-
-		BeanDefinition beanDefinition =
-			AopConfigUtils.registerAutoProxyCreatorIfNecessary(registry, source);
-		useClassProxyingIfNecessary(registry, proxyTargetClass, exposeProxy);
 		registerComponentIfNecessary(beanDefinition, parserContext);
 	}
 
-	public static void registerAutoProxyCreatorIfNecessary(
-			BeanDefinitionRegistry registry, ComponentRegistrar parserContext, Object source, Boolean proxyTargetClass) {
-		registerAutoProxyCreatorIfNecessary(registry, parserContext, source, proxyTargetClass, false);
-	}
-
 	public static void registerAspectJAutoProxyCreatorIfNecessary(
 			ParserContext parserContext, Element sourceElement) {
 
 		BeanDefinition beanDefinition = AopConfigUtils.registerAspectJAutoProxyCreatorIfNecessary(
 				parserContext.getRegistry(), parserContext.extractSource(sourceElement));
 		useClassProxyingIfNecessary(parserContext.getRegistry(), sourceElement);
-		registerComponentIfNecessary(beanDefinition, new ComponentRegistrarAdapter(parserContext));
+		registerComponentIfNecessary(beanDefinition, parserContext);
 	}
 
 	public static void registerAspectJAnnotationAutoProxyCreatorIfNecessary(
@@ -96,7 +76,7 @@ public static void registerAspectJAnnotationAutoProxyCreatorIfNecessary(
 		BeanDefinition beanDefinition = AopConfigUtils.registerAspectJAnnotationAutoProxyCreatorIfNecessary(
 				parserContext.getRegistry(), parserContext.extractSource(sourceElement));
 		useClassProxyingIfNecessary(parserContext.getRegistry(), sourceElement);
-		registerComponentIfNecessary(beanDefinition, new ComponentRegistrarAdapter(parserContext));
+		registerComponentIfNecessary(beanDefinition, parserContext);
 	}
 
 	/**
@@ -108,7 +88,7 @@ public static void registerAspectJAnnotationAutoProxyCreatorIfNecessary(
 	public static void registerAutoProxyCreatorIfNecessary(ParserContext parserContext, Object source) {
 		BeanDefinition beanDefinition = AopConfigUtils.registerAutoProxyCreatorIfNecessary(
 				parserContext.getRegistry(), source);
-	registerComponentIfNecessary(beanDefinition, new ComponentRegistrarAdapter(parserContext));
+		registerComponentIfNecessary(beanDefinition, parserContext);
 	}
 
 	/**
@@ -121,12 +101,6 @@ public static void forceAutoProxyCreatorToUseClassProxying(BeanDefinitionRegistr
 	}
 
 
-	/**
-	 * @deprecated since Spring 3.1 in favor of
-	 * {@link #useClassProxyingIfNecessary(BeanDefinitionRegistry, Boolean, Boolean)}
-	 * which does not require a parameter of type org.w3c.dom.Element
-	 */
-	@Deprecated
 	private static void useClassProxyingIfNecessary(BeanDefinitionRegistry registry, Element sourceElement) {
 		if (sourceElement != null) {
 			boolean proxyTargetClass = Boolean.valueOf(sourceElement.getAttribute(PROXY_TARGET_CLASS_ATTRIBUTE));
@@ -140,20 +114,11 @@ private static void useClassProxyingIfNecessary(BeanDefinitionRegistry registry,
 		}
 	}
 
-	private static void useClassProxyingIfNecessary(BeanDefinitionRegistry registry, Boolean proxyTargetClass, Boolean exposeProxy) {
-		if (proxyTargetClass) {
-			AopConfigUtils.forceAutoProxyCreatorToUseClassProxying(registry);
-		}
-		if (exposeProxy) {
-			AopConfigUtils.forceAutoProxyCreatorToExposeProxy(registry);
-		}
-	}
-
-	private static void registerComponentIfNecessary(BeanDefinition beanDefinition, ComponentRegistrar componentRegistrar) {
+	private static void registerComponentIfNecessary(BeanDefinition beanDefinition, ParserContext parserContext) {
 		if (beanDefinition != null) {
 			BeanComponentDefinition componentDefinition =
 					new BeanComponentDefinition(beanDefinition, AopConfigUtils.AUTO_PROXY_CREATOR_BEAN_NAME);
-			componentRegistrar.registerComponent(componentDefinition);
+			parserContext.registerComponent(componentDefinition);
 		}
 	}
 

org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ComponentRegistrar.java

@@ -22,27 +22,18 @@
 
 /**
  * Interface used by the {@link DefaultBeanDefinitionDocumentReader} to handle custom,
- * top-level (directly under {@code <beans>}) tags.
+ * top-level (directly under {@code <beans/>}) tags.
  *
  * <p>Implementations are free to turn the metadata in the custom tag into as many
  * {@link BeanDefinition BeanDefinitions} as required.
  *
  * <p>The parser locates a {@link BeanDefinitionParser} from the associated
  * {@link NamespaceHandler} for the namespace in which the custom tag resides.
  *
- * <p>Implementations are encouraged to decouple XML parsing from bean registration by
- * parsing element(s) into a {@link org.springframework.context.FeatureSpecification
- * FeatureSpecification} object and subsequently executing that specification.
- * Doing so allows for maximum reuse between XML-based and annotation-based
- * configuration options.
- *
  * @author Rob Harrop
  * @since 2.0
  * @see NamespaceHandler
  * @see AbstractBeanDefinitionParser
- * @see org.springframework.beans.factory.xml.BeanDefinitionDecorator
- * @see org.springframework.context.FeatureSpecification
- * @see org.springframework.context.AbstractSpecificationExecutor
  */
 public interface BeanDefinitionParser {
 
@@ -53,12 +44,11 @@ public interface BeanDefinitionParser {
 	 * embedded in the supplied {@link ParserContext}.
 	 * <p>Implementations must return the primary {@link BeanDefinition} that results
 	 * from the parse if they will ever be used in a nested fashion (for example as
-	 * an inner tag in a <code>&lt;property/&gt;</code> tag). Implementations may return
-	 * <code>null</code> if they will <strong>not</strong> be used in a nested fashion.
+	 * an inner tag in a {@code <property/>} tag). Implementations may return
+	 * {@code null} if they will <strong>not</strong> be used in a nested fashion.
 	 * @param element the element that is to be parsed into one or more {@link BeanDefinition BeanDefinitions}
 	 * @param parserContext the object encapsulating the current state of the parsing process;
-	 * provides access to a {@link org.springframework.beans.factory.support.BeanDefinitionRegistry
-	 * BeanDefinitionRegistry}.
+	 * provides access to a {@link org.springframework.beans.factory.support.BeanDefinitionRegistry}
 	 * @return the primary {@link BeanDefinition}
 	 */
 	BeanDefinition parse(Element element, ParserContext parserContext);

org.springframework.beans/src/main/java/org/springframework/beans/factory/parsing/ComponentRegistrarAdapter.java

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[2.5.0.201008272200-CI-R3822-B852]]></pluginVersion>
+	<pluginVersion><![CDATA[2.6.0.201103160035-RELEASE]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
@@ -11,7 +11,6 @@
 		<config>src/test/java/org/springframework/context/annotation/configuration/SecondLevelSubConfig-context.xml</config>
 		<config>src/test/java/org/springframework/context/annotation/configuration/ImportXmlWithAopNamespace-context.xml</config>
 		<config>src/test/java/org/springframework/context/annotation/Spr6602Tests-context.xml</config>
-		<config>src/test/java/org/springframework/context/annotation/FeatureConfigurationImportResourceTests-context.xml</config>
 	</configs>
 	<configSets>
 	</configSets>