From 0bd4dab4e3326be511d5a9e9cecdfa8279935993 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Fri, 26 Oct 2012 15:47:11 +0200
Subject: [PATCH] Filter @Configuration classes out of LTW test

Moving @EnableMBeanExport and its MBeanExportConfiguration
@Configuration class into context.annotation caused a side effect with
ComponentScanningWithLTWTests, which component scans context.annotation
in order to test LTW behavior. Picking up MBeanExportConfiguration
without proper MBean configuration resulted in a NullPointerException
during test execution.

This commit simply filters out all @Configuration classes from the LTW
test's component-scanning directive.

Issue: SPR-8943
---
 .../context/annotation/ltw/ComponentScanningWithLTWTests.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml b/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml
index 2134144b55..59ae0b8b44 100644
--- a/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml
+++ b/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml
@@ -8,7 +8,10 @@
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"
 	default-autowire="byType">
 
-	<context:component-scan base-package="org.springframework.context.annotation"/>
+	<context:component-scan base-package="org.springframework.context.annotation">
+		<context:exclude-filter type="annotation"
+		                        expression="org.springframework.context.annotation.Configuration"/>
+	</context:component-scan>
 
 	<context:load-time-weaver aspectj-weaving="off"/>