Introduce FeatureSpecification support

Introduce FeatureSpecification interface and implementations

    FeatureSpecification objects decouple the configuration of
    spring container features from the concern of parsing XML
    namespaces, allowing for reuse in code-based configuration
    (see @Feature* annotations below).

    * ComponentScanSpec
    * TxAnnotationDriven
    * MvcAnnotationDriven
    * MvcDefaultServletHandler
    * MvcResources
    * MvcViewControllers

Refactor associated BeanDefinitionParsers to delegate to new impls above

    The following BeanDefinitionParser implementations now deal only
    with the concern of XML parsing.  Validation is handled by their
    corresponding FeatureSpecification object.  Bean definition creation
    and registration is handled by their corresponding
    FeatureSpecificationExecutor type.

    * ComponentScanBeanDefinitionParser
    * AnnotationDrivenBeanDefinitionParser (tx)
    * AnnotationDrivenBeanDefinitionParser (mvc)
    * DefaultServletHandlerBeanDefinitionParser
    * ResourcesBeanDefinitionParser
    * ViewControllerBeanDefinitionParser

Update AopNamespaceUtils to decouple from XML (DOM API)

    Methods necessary for executing TxAnnotationDriven specification
    (and eventually, the AspectJAutoProxy specification) have been
    added that accept boolean arguments for whether to proxy
    target classes and whether to expose the proxy via threadlocal.

    Methods that accepted and introspected DOM Element objects still
    exist but have been deprecated.

Introduce @FeatureConfiguration classes and @Feature methods

    Allow for creation and configuration of FeatureSpecification objects
    at the user level.  A companion for @Configuration classes allowing
    for completely code-driven configuration of the Spring container.

    See changes in ConfigurationClassPostProcessor for implementation
    details.

    See Feature*Tests for usage examples.

    FeatureTestSuite in .integration-tests is a JUnit test suite designed
    to aggregate all BDP and Feature* related tests for a convenient way
    to confirm that Feature-related changes don't break anything.
    Uncomment this test and execute from Eclipse / IDEA. Due to classpath
    issues, this cannot be compiled by Ant/Ivy at the command line.

Introduce @FeatureAnnotation meta-annotation and @ComponentScan impl

    @FeatureAnnotation provides an alternate mechanism for creating
    and executing FeatureSpecification objects.  See @ComponentScan
    and its corresponding ComponentScanAnnotationParser implementation
    for details.  See ComponentScanAnnotationIntegrationTests for usage
    examples

Introduce Default[Formatting]ConversionService implementations

    Allows for convenient instantiation of ConversionService objects
    containing defaults appropriate for most environments.  Replaces
    similar support originally in ConversionServiceFactory (which is now
    deprecated). This change was justified by the need to avoid use
    of FactoryBeans in @Configuration classes (such as
    FormattingConversionServiceFactoryBean). It is strongly preferred
    that users simply instantiate and configure the objects that underlie
    our FactoryBeans. In the case of the ConversionService types, the
    easiest way to do this is to create Default* subtypes. This also
    follows convention with the rest of the framework.

Minor updates to util classes

    All in service of changes above. See diffs for self-explanatory
    details.

    * BeanUtils
    * ObjectUtils
    * ReflectionUtils

org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionNamespaceHandlerTests.java

@@ -19,6 +19,7 @@ package org.springframework.transaction.annotation;
 import java.lang.management.ManagementFactory;
 import java.util.Collection;
 import java.util.Map;
+
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 

org.springframework.transaction/src/test/java/org/springframework/transaction/annotation/TxAnnotationDrivenFeatureTests.java

@@ -0,0 +1,147 @@
+/*
+ * Copyright 2002-2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.transaction.annotation;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+import java.util.Map;
+
+import org.junit.Test;
+import org.springframework.aop.support.AopUtils;
+import org.springframework.beans.factory.CannotLoadBeanClassException;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Feature;
+import org.springframework.context.annotation.FeatureConfiguration;
+import org.springframework.context.config.AdviceMode;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.CallCountingTransactionManager;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.AnnotationTransactionNamespaceHandlerTests.TransactionalTestBean;
+import org.springframework.transaction.config.TxAnnotationDriven;
+
+/**
+ * Integration tests for {@link TxAnnotationDriven} support within @Configuration
+ * classes. Adapted from original tx: namespace tests at
+ * {@link AnnotationTransactionNamespaceHandlerTests}.
+ *
+ * @author Chris Beams
+ * @since 3.1
+ */
+public class TxAnnotationDrivenFeatureTests {
+	@Test
+	public void transactionProxyIsCreated() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(TxFeature.class, TxManagerConfig.class);
+		ctx.refresh();
+		TransactionalTestBean bean = ctx.getBean(TransactionalTestBean.class);
+		assertThat("testBean is not a proxy", AopUtils.isAopProxy(bean), is(true));
+		Map<?,?> services = ctx.getBeansWithAnnotation(Service.class);
+		assertThat("Stereotype annotation not visible", services.containsKey("testBean"), is(true));
+	}
+
+	@Test
+	public void txManagerIsResolvedOnInvocationOfTransactionalMethod() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(TxFeature.class, TxManagerConfig.class);
+		ctx.refresh();
+		TransactionalTestBean bean = ctx.getBean(TransactionalTestBean.class);
+
+		// invoke a transactional method, causing the PlatformTransactionManager bean to be resolved.
+		bean.findAllFoos();
+	}
+
+	@Test
+	public void txManagerIsResolvedCorrectlyWhenMultipleManagersArePresent() {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(TxFeature.class, MultiTxManagerConfig.class);
+		ctx.refresh();
+		TransactionalTestBean bean = ctx.getBean(TransactionalTestBean.class);
+
+		// invoke a transactional method, causing the PlatformTransactionManager bean to be resolved.
+		bean.findAllFoos();
+	}
+
+	/**
+	 * A cheap test just to prove that in ASPECTJ mode, the AnnotationTransactionAspect does indeed
+	 * get loaded -- or in this case, attempted to be loaded at which point the test fails.
+	 */
+	@Test
+	public void proxyTypeAspectJCausesRegistrationOfAnnotationTransactionAspect() {
+		try {
+			new AnnotationConfigApplicationContext(TxWithAspectJFeature.class, TxManagerConfig.class);
+			fail("should have thrown CNFE when trying to load AnnotationTransactionAspect. " +
+					"Do you actually have org.springframework.aspects on the classpath?");
+		} catch (CannotLoadBeanClassException ex) {
+			ClassNotFoundException cause = (ClassNotFoundException) ex.getCause();
+			assertThat(cause.getMessage(), equalTo("org.springframework.transaction.aspectj.AnnotationTransactionAspect"));
+		}
+	}
+
+}
+
+@FeatureConfiguration
+class TxFeature {
+
+	@Feature
+	public TxAnnotationDriven tx(TxManagerConfig txManagerConfig) {
+		return new TxAnnotationDriven(txManagerConfig.txManager());
+	}
+}
+
+
+@FeatureConfiguration
+class TxWithAspectJFeature {
+
+	@Feature
+	public TxAnnotationDriven tx(PlatformTransactionManager txManager) {
+		return new TxAnnotationDriven(txManager).mode(AdviceMode.ASPECTJ);
+	}
+
+}
+
+
+@Configuration
+class TxManagerConfig {
+
+	@Bean
+	public TransactionalTestBean testBean() {
+		return new TransactionalTestBean();
+	}
+
+	@Bean
+	public PlatformTransactionManager txManager() {
+		return new CallCountingTransactionManager();
+	}
+
+}
+
+
+@Configuration
+class MultiTxManagerConfig extends TxManagerConfig {
+
+	@Bean
+	public PlatformTransactionManager txManager2() {
+		return new CallCountingTransactionManager();
+	}
+
+}
+