From fea222b37f968158f9a85ad81decfe7c3d2cf362 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Tue, 11 Nov 2008 23:08:45 +0000
Subject: [PATCH] The <message-bus/> element is no longer necessary. It has
 been removed from the XSD (INT-462). The annotations are enabled by a
 separate element, and the application-event-multicaster element is also now
 separate.

---
 ...icationEventInboundChannelAdapterTests.xml |   7 +-
 ...boundChannelAdapterParserTests-context.xml |   2 -
 .../httpInvokerInboundGatewayParserTests.xml  |   2 -
 .../httpInvokerOutboundGatewayParserTests.xml |   2 -
 ...ithConnectionFactoryAndDestinationName.xml |   2 -
 .../jmsGatewayWithConnectionFactoryOnly.xml   |   2 -
 ...jmsGatewayWithDefaultConnectionFactory.xml |   2 -
 .../config/jmsGatewayWithMessageConverter.xml |   2 -
 ...undWithConnectionFactoryAndDestination.xml |   2 -
 ...ithConnectionFactoryAndDestinationName.xml |   2 -
 ...DestinationAndDefaultConnectionFactory.xml |   2 -
 ...inationNameAndDefaultConnectionFactory.xml |   2 -
 .../jms/config/jmsInboundWithHeaderMapper.xml |   2 -
 .../jms/config/jmsInboundWithJmsTemplate.xml  |   2 -
 .../config/rmiInboundGatewayParserTests.xml   |   2 -
 .../config/rmiOutboundGatewayParserTests.xml  |   2 -
 .../samples/cafe/annotation/cafeDemo.xml      |   2 +-
 .../integration/samples/cafe/xml/cafeDemo.xml |   2 -
 .../samples/filecopy/fileCopyDemo-binary.xml  |   2 -
 .../samples/filecopy/fileCopyDemo-file.xml    |   2 -
 .../samples/filecopy/fileCopyDemo-text.xml    |   2 -
 .../samples/helloworld/helloWorldDemo.xml     |   2 -
 .../integration/samples/jms/common.xml        |   7 +-
 .../samples/oddeven/cronOddEvenDemo.xml       |   2 +-
 .../samples/oddeven/intervalOddEvenDemo.xml   |   2 +-
 .../integration/samples/quote/quoteDemo.xml   |   2 +-
 .../samples/ws/temperatureConversion.xml      |   2 -
 ...dapterSecurityIntegrationTests-context.xml |   2 -
 ...shallingTransformerParserTests-context.xml |   2 -
 ...shallingTransformerParserTests-context.xml |   2 -
 ...tPayloadTransformerParserTests-context.xml |   2 -
 ...axbMarshallingIntegrationTests-context.xml |   7 +-
 .../JaxbMarshallingIntegrationTests.java      |  10 +-
 .../xml/AbstractConsumerEndpointParser.java   |   1 -
 .../ApplicationEventMulticasterParser.java    |  66 +++++++++++
 .../config/xml/EnableAnnotationsParser.java   |  53 +++++++++
 .../xml/IntegrationNamespaceHandler.java      | 104 +++++++++++++++---
 .../config/xml/IntegrationNamespaceUtils.java |  36 ------
 .../config/xml/MessageBusParser.java          | 104 ------------------
 .../config/xml/spring-integration-1.0.xsd     |  17 ++-
 ...rentAggregatorIntegrationTests-context.xml |   2 +-
 .../ConcurrentAggregatorIntegrationTests.java |  24 ++++
 .../ChannelAdapterParserTests-context.xml     |   2 -
 .../config/FilterParserTests-context.xml      |   2 -
 ...ChannelAdapterAdviceChainTests-context.xml |   2 +-
 ...annelAdapterTransactionalTests-context.xml |   2 +-
 ...tationConsumerAdviceChainTests-context.xml |   2 +-
 ...tionConsumerTransactionalTests-context.xml |   2 +-
 .../config/aggregatorParserTests.xml          |   2 -
 ...notatedEndpointActivationTests-context.xml |   2 +-
 ...messageParameterAnnotatedEndpointTests.xml |   2 +-
 ...eActivatorAnnotationPostProcessorTests.xml |   2 +-
 .../simpleAnnotatedEndpointTests.xml          |   2 +-
 .../annotation/testAnnotatedAggregator.xml    |   2 +-
 .../typeConvertingEndpointTests.xml           |   2 +-
 ...tionStrategyMethodWithMissingReference.xml |   2 -
 .../config/endpointInterceptorTests.xml       |  47 --------
 .../config/endpointWithSelector.xml           |   2 -
 .../config/invalidMethodNameAggregator.xml    |   2 -
 .../config/messageBusElementAndBean.xml       |  14 ---
 .../messageBusWithAsyncEventMulticaster.xml   |   2 +-
 .../config/messageBusWithAutoStartup.xml      |  12 --
 .../config/messageBusWithDefaults.xml         |   4 +-
 .../config/messageBusWithErrorChannel.xml     |   2 -
 .../config/messageBusWithMessageBusAware.xml  |  14 ---
 ...messageBusWithoutAsyncEventMulticaster.xml |   4 +-
 .../config/multipleMessageBusElements.xml     |  14 ---
 .../config/resequencerParserTests.xml         |   2 -
 .../config/simpleEndpointTests.xml            |   2 -
 .../config/xml/gatewayParserTests.xml         |   2 -
 .../dispatcher/propagationMandatoryTests.xml  |   2 -
 .../propagationNotSupportedTests.xml          |   2 -
 .../dispatcher/propagationRequiredTests.xml   |   2 -
 .../propagationRequiresNewTests.xml           |   2 -
 .../dispatcher/propagationSupportsTests.xml   |   2 -
 .../dispatcher/transactionTests.xml           |   2 -
 .../endpoint/returnAddressTests.xml           |   2 -
 .../integration/filter/filterContextTests.xml |   2 -
 .../gateway/gatewayWithRendezvousChannel.xml  |   2 -
 .../gateway/gatewayWithResponseCorrelator.xml |   2 -
 .../router/config/routerParserTests.xml       |   2 -
 .../router/config/splitterAggregatorTests.xml |   2 -
 .../router/config/splitterParserTests.xml     |   2 -
 .../SplitterIntegrationTests-context.xml      |   2 +-
 .../transformer/transformerContextTests.xml   |   2 -
 85 files changed, 275 insertions(+), 402 deletions(-)
 create mode 100644 org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ApplicationEventMulticasterParser.java
 create mode 100644 org.springframework.integration/src/main/java/org/springframework/integration/config/xml/EnableAnnotationsParser.java
 delete mode 100644 org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MessageBusParser.java
 delete mode 100644 org.springframework.integration/src/test/java/org/springframework/integration/config/endpointInterceptorTests.xml
 delete mode 100644 org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusElementAndBean.xml
 delete mode 100644 org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAutoStartup.xml
 delete mode 100644 org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithMessageBusAware.xml
 delete mode 100644 org.springframework.integration/src/test/java/org/springframework/integration/config/multipleMessageBusElements.xml

diff --git a/org.springframework.integration.event/src/test/java/org/springframework/integration/event/applicationEventInboundChannelAdapterTests.xml b/org.springframework.integration.event/src/test/java/org/springframework/integration/event/applicationEventInboundChannelAdapterTests.xml
index 6bd308ef43..5e339a8b32 100644
--- a/org.springframework.integration.event/src/test/java/org/springframework/integration/event/applicationEventInboundChannelAdapterTests.xml
+++ b/org.springframework.integration.event/src/test/java/org/springframework/integration/event/applicationEventInboundChannelAdapterTests.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:integration="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<integration:message-bus/>
-
 	<bean id="channel" class="org.springframework.integration.channel.QueueChannel"/>
 
 	<bean id="adapter" class="org.springframework.integration.event.ApplicationEventInboundChannelAdapter">
diff --git a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParserTests-context.xml b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParserTests-context.xml
index 208f1f5a36..264784f570 100644
--- a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParserTests-context.xml
+++ b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParserTests-context.xml
@@ -13,8 +13,6 @@
 			http://www.springframework.org/schema/integration/file
 			http://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd">
 
-	<si:message-bus/>
-
 	<si:channel id="testChannel"/>
 
 	<file:outbound-channel-adapter id="simpleAdapter"
diff --git a/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/httpInvokerInboundGatewayParserTests.xml b/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/httpInvokerInboundGatewayParserTests.xml
index 994dde0bde..b500342f94 100644
--- a/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/httpInvokerInboundGatewayParserTests.xml
+++ b/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/httpInvokerInboundGatewayParserTests.xml
@@ -10,8 +10,6 @@
 			http://www.springframework.org/schema/integration/httpinvoker
 			http://www.springframework.org/schema/integration/httpinvoker/spring-integration-httpinvoker-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="testChannel"/>
 
 	<httpinvoker:inbound-gateway id="gatewayWithDefaults" request-channel="testChannel"/>
diff --git a/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/httpInvokerOutboundGatewayParserTests.xml b/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/httpInvokerOutboundGatewayParserTests.xml
index 1a96b67206..f97fcc05df 100644
--- a/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/httpInvokerOutboundGatewayParserTests.xml
+++ b/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/config/httpInvokerOutboundGatewayParserTests.xml
@@ -10,8 +10,6 @@
 			http://www.springframework.org/schema/integration/httpinvoker
 			http://www.springframework.org/schema/integration/httpinvoker/spring-integration-httpinvoker-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="testChannel"/>
 
 	<httpinvoker:outbound-gateway id="gateway" url="http://localhost:8080/test" request-channel="testChannel"/>
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml
index fffe481bd3..42913b0a8a 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml
@@ -10,8 +10,6 @@
 			http://www.springframework.org/schema/integration/jms
 			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd">
 
-	<si:message-bus/>
-
 	<si:channel id="requestChannel"/>
 
 	<jms:inbound-gateway id="jmsGateway"
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryOnly.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryOnly.xml
index fcf515784b..c84dd18b85 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryOnly.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithConnectionFactoryOnly.xml
@@ -10,8 +10,6 @@
 			http://www.springframework.org/schema/integration/jms
 			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd">
 
-	<si:message-bus/>
-
 	<si:channel id="requestChannel"/>
 
 	<jms:inbound-gateway id="jmsGateway"
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml
index 66d3a4c612..5bb3f658c6 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithDefaultConnectionFactory.xml
@@ -10,8 +10,6 @@
 			http://www.springframework.org/schema/integration/jms
 			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd">
 
-	<si:message-bus/>
-
 	<si:channel id="requestChannel"/>
 
 	<jms:inbound-gateway id="jmsGateway"
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithMessageConverter.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithMessageConverter.xml
index a0252048f2..745c16e9dc 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithMessageConverter.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsGatewayWithMessageConverter.xml
@@ -10,8 +10,6 @@
 			http://www.springframework.org/schema/integration/jms
 			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd">
 
-	<si:message-bus/>
-
 	<si:channel id="requestChannel"/>
 
 	<jms:inbound-gateway id="jmsGateway"
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestination.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestination.xml
index 8831366bec..c0c97612d2 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestination.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestination.xml
@@ -10,8 +10,6 @@
 			http://www.springframework.org/schema/integration/jms
 			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd">
 
-	<integration:message-bus/>
-
 	<jms:inbound-channel-adapter channel="output"
 								 connection-factory="testConnectionFactory"
 	                			 destination="testDestination"/>
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestinationName.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestinationName.xml
index bb15093d09..fc53f9fac8 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestinationName.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithConnectionFactoryAndDestinationName.xml
@@ -10,8 +10,6 @@
 			http://www.springframework.org/schema/integration/jms
 			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd">
 
-	<integration:message-bus/>
-
 	<jms:inbound-channel-adapter channel="output"
 	 							 connection-factory="testConnectionFactory"
 	                			 destination-name="testDestinationName"/>
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationAndDefaultConnectionFactory.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationAndDefaultConnectionFactory.xml
index fb631edaf6..9601e94567 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationAndDefaultConnectionFactory.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationAndDefaultConnectionFactory.xml
@@ -10,8 +10,6 @@
 			http://www.springframework.org/schema/integration/jms
 			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd">
 
-	<integration:message-bus/>
-
 	<jms:inbound-channel-adapter channel="output" destination="testDestination"/>
 
 	<integration:channel id="output">
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationNameAndDefaultConnectionFactory.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationNameAndDefaultConnectionFactory.xml
index f46a651084..e2eba096c5 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationNameAndDefaultConnectionFactory.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithDestinationNameAndDefaultConnectionFactory.xml
@@ -10,8 +10,6 @@
 			http://www.springframework.org/schema/integration/jms
 			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd">
 
-	<integration:message-bus/>
-
 	<jms:inbound-channel-adapter channel="output" destination-name="testDestinationName"/>
 
 	<integration:channel id="output">
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithHeaderMapper.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithHeaderMapper.xml
index 7c513305ca..2f09e20281 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithHeaderMapper.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithHeaderMapper.xml
@@ -10,8 +10,6 @@
 			http://www.springframework.org/schema/integration/jms
 			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd">
 
-	<integration:message-bus/>
-
 	<jms:inbound-channel-adapter channel="output" jms-template="jmsTemplate" header-mapper="mapper"/>
 
 	<integration:channel id="output">
diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithJmsTemplate.xml b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithJmsTemplate.xml
index af12ed7b4d..9a0d70a037 100644
--- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithJmsTemplate.xml
+++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/jmsInboundWithJmsTemplate.xml
@@ -10,8 +10,6 @@
 			http://www.springframework.org/schema/integration/jms
 			http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd">
 
-	<integration:message-bus/>
-
 	<jms:inbound-channel-adapter jms-template="jmsTemplate" channel="output"/>
 
 	<integration:channel id="output">
diff --git a/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/rmiInboundGatewayParserTests.xml b/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/rmiInboundGatewayParserTests.xml
index 9a3cffa125..ef406e83eb 100644
--- a/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/rmiInboundGatewayParserTests.xml
+++ b/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/rmiInboundGatewayParserTests.xml
@@ -10,8 +10,6 @@
 			http://www.springframework.org/schema/integration/rmi
 			http://www.springframework.org/schema/integration/rmi/spring-integration-rmi-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="testChannel"/>
 
 	<rmi:inbound-gateway id="gatewayWithDefaults" request-channel="testChannel"/>
diff --git a/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/rmiOutboundGatewayParserTests.xml b/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/rmiOutboundGatewayParserTests.xml
index dca1471a2e..11cb0d7c4d 100644
--- a/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/rmiOutboundGatewayParserTests.xml
+++ b/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/rmiOutboundGatewayParserTests.xml
@@ -10,8 +10,6 @@
 			http://www.springframework.org/schema/integration/rmi
 			http://www.springframework.org/schema/integration/rmi/spring-integration-rmi-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="localChannel"/>
 
 	<rmi:outbound-gateway id="gateway" request-channel="localChannel" remote-channel="testChannel" host="localhost"/>
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
index 520b04946b..667c4ff6c8 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/annotation/cafeDemo.xml
@@ -13,7 +13,7 @@
 			http://www.springframework.org/schema/integration/stream
 			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
 
-	<message-bus enable-annotations="true"/>
+	<enable-annotations/>
 
 	<context:component-scan base-package="org.springframework.integration.samples.cafe.annotation"/>
 
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
index 5ea6223f2e..51ad040307 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
@@ -10,8 +10,6 @@
 			http://www.springframework.org/schema/integration/stream
 			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
 
-	<message-bus/>
-
 	<gateway id="cafe" service-interface="org.springframework.integration.samples.cafe.Cafe"/>
 
 	<channel id="orders"/>
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml
index 77f2f35f5d..1a94550adb 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-binary.xml
@@ -12,8 +12,6 @@
 
 	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-	<integration:message-bus/>
-
 	<file:inbound-channel-adapter id="filesIn"
 	                              directory="file:${java.io.tmpdir}/spring-integration-samples/input"/>
 
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
index 0f757c844c..69060100c0 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-file.xml
@@ -12,8 +12,6 @@
 
 	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-	<integration:message-bus/>
-
 	<file:inbound-channel-adapter id="filesIn"
 	                              directory="file:${java.io.tmpdir}/spring-integration-samples/input">
 		<integration:poller>
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml
index d9314fd922..21c590f4e7 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/filecopy/fileCopyDemo-text.xml
@@ -12,8 +12,6 @@
 
 	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-	<integration:message-bus/>
-
 	<file:inbound-channel-adapter id="filesIn"
 	                              directory="file:${java.io.tmpdir}/spring-integration-samples/input"
 	                              filename-pattern="[a-z]+.txt"/>
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml
index d36c478043..75e622853e 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/helloworld/helloWorldDemo.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="inputChannel"/>
 
 	<channel id="outputChannel">
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/common.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/common.xml
index 1ea64fe9bb..222ad520e2 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/common.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/common.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:integration="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
-
-	<integration:message-bus/>
+			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="connectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
 		<property name="targetConnectionFactory">
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
index bb6cdf7cc0..d49d57ccec 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/cronOddEvenDemo.xml
@@ -7,7 +7,7 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus enable-annotations="true"/>
+	<enable-annotations/>
 
 	<channel id="even"/>
 	<channel id="odd"/>
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
index 7f7d04b0c8..2941278765 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/oddeven/intervalOddEvenDemo.xml
@@ -7,7 +7,7 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus enable-annotations="true"/>
+	<enable-annotations/>
 
 	<channel id="even"/>
 	<channel id="odd"/>
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
index 2aa7dff7ab..7c92ea7510 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/quote/quoteDemo.xml
@@ -10,7 +10,7 @@
 			http://www.springframework.org/schema/integration/stream
 			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
 
-	<message-bus enable-annotations="true"/>
+	<enable-annotations/>
 
 	<beans:bean class="org.springframework.integration.samples.quote.TickerStream"/>
 
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
index 4fc3dd1f39..00dc9e4997 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/temperatureConversion.xml
@@ -13,8 +13,6 @@
 			http://www.springframework.org/schema/integration/ws
 			http://www.springframework.org/schema/integration/ws/spring-integration-ws-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="fahrenheitChannel"/>
 
 	<!-- The Web Service outbound Messaging Gateway receives from the
diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests-context.xml b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests-context.xml
index f58dfbc3dc..7bc7c5bdfd 100644
--- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests-context.xml
+++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests-context.xml
@@ -18,8 +18,6 @@
 
 	<beans:import resource="classpath:org/springframework/integration/security/config/commonSecurityConfiguration.xml"/>
 
-	<message-bus/>
-
 	<si-security:secured-channels>
 		<si-security:access-policy pattern="secured.*" send-access="ROLE_ADMIN"/>
 	</si-security:secured-channels>
diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests-context.xml b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests-context.xml
index 8d2725d605..cbf5a3a0c5 100644
--- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests-context.xml
+++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests-context.xml
@@ -10,8 +10,6 @@
 			http://www.springframework.org/schema/integration/xml
 			http://www.springframework.org/schema/integration/xml/spring-integration-xml-1.0.xsd">
 
-	<si:message-bus/>
-
 	<si:channel id="output">
 		<si:queue capacity="1"/>
 	</si:channel>
diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests-context.xml b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests-context.xml
index 9c2310ac47..7c31e2a7bc 100644
--- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests-context.xml
+++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests-context.xml
@@ -10,8 +10,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<si:message-bus/>
-
 	<si:channel id="input" />
 	
 	<si:channel id="pollableInput" >
diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests-context.xml b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests-context.xml
index 6070c9368c..d7d58b4f6b 100644
--- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests-context.xml
+++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests-context.xml
@@ -10,8 +10,6 @@
 			http://www.springframework.org/schema/integration/xml
 			http://www.springframework.org/schema/integration/xml/spring-integration-xml-1.0.xsd">
 
-	<si:message-bus/>
-
 	<si:channel id="output">
 		<si:queue capacity="1"/>
 	</si:channel>
diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/jaxbmarshaling/JaxbMarshallingIntegrationTests-context.xml b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/jaxbmarshaling/JaxbMarshallingIntegrationTests-context.xml
index 1bb02536eb..6aea3e79af 100644
--- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/jaxbmarshaling/JaxbMarshallingIntegrationTests-context.xml
+++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/jaxbmarshaling/JaxbMarshallingIntegrationTests-context.xml
@@ -2,8 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:si-xml="http://www.springframework.org/schema/integration/xml"
 	xmlns:si="http://www.springframework.org/schema/integration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xmlns:context="http://www.springframework.org/schema/context"
-	
+	xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
@@ -13,9 +12,7 @@
 			http://www.springframework.org/schema/context 
 			http://www.springframework.org/schema/context/spring-context-2.5.xsd">
 			
-	<context:annotation-config />
-
-	<si:message-bus />
+	<context:annotation-config/>
 
 	<si:channel id="marshallIn"/>
 	
diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/jaxbmarshaling/JaxbMarshallingIntegrationTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/jaxbmarshaling/JaxbMarshallingIntegrationTests.java
index 6f5b7b1c34..20a9ef2204 100644
--- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/jaxbmarshaling/JaxbMarshallingIntegrationTests.java
+++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/jaxbmarshaling/JaxbMarshallingIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2008 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.integration.xml.transformer.jaxbmarshaling;
 
 import static org.junit.Assert.assertEquals;
@@ -24,6 +25,8 @@ import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMResult;
 
 import org.junit.Test;
+import org.w3c.dom.Document;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.integration.channel.PollableChannel;
@@ -32,11 +35,12 @@ import org.springframework.integration.message.GenericMessage;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
 import org.springframework.xml.transform.StringSource;
-import org.w3c.dom.Document;
 
+/**
+ * @author Jonas Partner
+ */
 @ContextConfiguration
 public class JaxbMarshallingIntegrationTests extends AbstractJUnit4SpringContextTests {
-
 	
 	@Autowired @Qualifier("marshallIn")
 	MessageChannel marshallIn;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractConsumerEndpointParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractConsumerEndpointParser.java
index 8fa97b4988..cf6e654fb2 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractConsumerEndpointParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/AbstractConsumerEndpointParser.java
@@ -87,7 +87,6 @@ public abstract class AbstractConsumerEndpointParser extends AbstractSingleBeanD
 
 	@Override
 	protected final void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-		IntegrationNamespaceUtils.registerTaskSchedulerIfNecessary(parserContext.getRegistry());
 		BeanDefinitionBuilder consumerBuilder = this.parseConsumer(element, parserContext);
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(consumerBuilder, element, OUTPUT_CHANNEL_ATTRIBUTE);
 		IntegrationNamespaceUtils.setReferenceIfAttributeDefined(consumerBuilder, element, SELECTOR_ATTRIBUTE);
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ApplicationEventMulticasterParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ApplicationEventMulticasterParser.java
new file mode 100644
index 0000000000..e6a971a820
--- /dev/null
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/ApplicationEventMulticasterParser.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2002-2008 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.integration.config.xml;
+
+import java.util.concurrent.CopyOnWriteArraySet;
+
+import org.w3c.dom.Element;
+
+import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.context.event.SimpleApplicationEventMulticaster;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.core.task.TaskExecutor;
+import org.springframework.integration.context.IntegrationContextUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * Parser for the &lt;application-event-multicaster&gt; element of the
+ * integration namespace.
+ * 
+ * @author Mark Fisher
+ */
+public class ApplicationEventMulticasterParser extends AbstractSingleBeanDefinitionParser {
+
+	@Override
+	protected Class<?> getBeanClass(Element element) {
+		return SimpleApplicationEventMulticaster.class;
+	}
+
+	@Override
+	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
+			throws BeanDefinitionStoreException {
+		return AbstractApplicationContext.APPLICATION_EVENT_MULTICASTER_BEAN_NAME;
+	}
+
+	@Override
+	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
+		String taskExecutorRef = element.getAttribute("task-executor");
+		if (StringUtils.hasText(taskExecutorRef)) {
+			builder.addPropertyReference("taskExecutor", taskExecutorRef);
+		}
+		else {
+			TaskExecutor taskExecutor = IntegrationContextUtils.createTaskExecutor(1, 10, 0, "event-multicaster-");
+			builder.addPropertyValue("taskExecutor", taskExecutor);
+		}
+		builder.addPropertyValue("collectionClass", CopyOnWriteArraySet.class);
+	}
+
+}
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/EnableAnnotationsParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/EnableAnnotationsParser.java
new file mode 100644
index 0000000000..170a7a6a74
--- /dev/null
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/EnableAnnotationsParser.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2002-2008 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.integration.config.xml;
+
+import org.w3c.dom.Element;
+
+import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.integration.config.annotation.MessagingAnnotationPostProcessor;
+
+/**
+ * Parser for the &lt;enable-annotations&gt; element of the integration namespace.
+ * Adds a {@link MessagingAnnotationPostProcessor} to the application context.
+ * 
+ * @author Mark Fisher
+ */
+public class EnableAnnotationsParser extends AbstractSingleBeanDefinitionParser {
+
+	@Override
+	protected Class<?> getBeanClass(Element element) {
+		return MessagingAnnotationPostProcessor.class;
+	}
+
+	@Override
+	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
+			throws BeanDefinitionStoreException {
+		return "internal." + MessagingAnnotationPostProcessor.class.getName();
+	}
+
+	@Override
+	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
+		builder.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
+	}
+
+}
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java
index c049a37d58..debb466d05 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java
@@ -16,7 +16,23 @@
 
 package org.springframework.integration.config.xml;
 
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.BeanDefinitionHolder;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.beans.factory.xml.NamespaceHandler;
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.core.task.TaskExecutor;
+import org.springframework.integration.channel.MessagePublishingErrorHandler;
+import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.context.IntegrationContextUtils;
+import org.springframework.integration.scheduling.SimpleTaskScheduler;
 
 /**
  * Namespace handler for the integration namespace.
@@ -24,25 +40,79 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
  * @author Mark Fisher
  * @author Marius Bogoevici
  */
-public class IntegrationNamespaceHandler extends NamespaceHandlerSupport {
+public class IntegrationNamespaceHandler implements NamespaceHandler {
+
+	private volatile boolean initializedContext;
+
+	private final NamespaceHandlerSupport delegate = new NamespaceHandlerDelegate();
+
 
 	public void init() {
-		registerBeanDefinitionParser("message-bus", new MessageBusParser());
-		registerBeanDefinitionParser("channel", new PointToPointChannelParser());
-		registerBeanDefinitionParser("thread-local-channel", new ThreadLocalChannelParser());
-		registerBeanDefinitionParser("publish-subscribe-channel", new PublishSubscribeChannelParser());
-		registerBeanDefinitionParser("service-activator", new ServiceActivatorParser());
-		registerBeanDefinitionParser("transformer", new TransformerParser());
-		registerBeanDefinitionParser("filter", new FilterParser());
-		registerBeanDefinitionParser("router", new RouterParser());
-		registerBeanDefinitionParser("splitter", new SplitterParser());
-		registerBeanDefinitionParser("aggregator", new AggregatorParser());
-		registerBeanDefinitionParser("resequencer", new ResequencerParser());
-		registerBeanDefinitionParser("inbound-channel-adapter", new MethodInvokingInboundChannelAdapterParser());
-		registerBeanDefinitionParser("outbound-channel-adapter", new MethodInvokingOutboundChannelAdapterParser());
-		registerBeanDefinitionParser("gateway", new GatewayParser());
-		registerBeanDefinitionParser("selector-chain", new SelectorChainParser());
-		registerBeanDefinitionParser("thread-pool-task-executor", new PoolExecutorParser());
+		this.delegate.init();
+	}
+
+	public BeanDefinition parse(Element element, ParserContext parserContext) {
+		if (!this.initializedContext) {
+			registerTaskSchedulerIfNecessary(parserContext.getRegistry());
+			this.initializedContext = true;
+		}
+		return this.delegate.parse(element, parserContext);
+	}	
+
+	public BeanDefinitionHolder decorate(Node source, BeanDefinitionHolder definition, ParserContext parserContext) {
+		return this.delegate.decorate(source, definition, parserContext);
+	}
+
+	/**
+	 * Register a TaskScheduler in the given BeanDefinitionRegistry if not yet present.
+	 * The bean name for which this is checking is defined by the constant
+	 * {@link IntegrationContextUtils#TASK_SCHEDULER_BEAN_NAME}.
+	 */
+	private static void registerTaskSchedulerIfNecessary(BeanDefinitionRegistry registry) {
+		if (!registry.containsBeanDefinition(IntegrationContextUtils.ERROR_CHANNEL_BEAN_NAME)) {
+			RootBeanDefinition errorChannelDef = new RootBeanDefinition(QueueChannel.class);
+			BeanDefinitionHolder errorChannelHolder = new BeanDefinitionHolder(
+					errorChannelDef, IntegrationContextUtils.ERROR_CHANNEL_BEAN_NAME);
+			BeanDefinitionReaderUtils.registerBeanDefinition(errorChannelHolder, registry);
+		}
+		TaskExecutor taskExecutor = null;
+		if (!registry.containsBeanDefinition(IntegrationContextUtils.TASK_SCHEDULER_BEAN_NAME)) {
+			taskExecutor = IntegrationContextUtils.createTaskExecutor(2, 100, 0, "task-scheduler-");
+			BeanDefinitionBuilder schedulerBuilder = BeanDefinitionBuilder.genericBeanDefinition(SimpleTaskScheduler.class);
+			schedulerBuilder.addConstructorArgValue(taskExecutor);
+			BeanDefinitionBuilder errorHandlerBuilder = BeanDefinitionBuilder.genericBeanDefinition(MessagePublishingErrorHandler.class);
+			errorHandlerBuilder.addPropertyReference("defaultErrorChannel", IntegrationContextUtils.ERROR_CHANNEL_BEAN_NAME);
+			String errorHandlerBeanName = BeanDefinitionReaderUtils.registerWithGeneratedName(
+					errorHandlerBuilder.getBeanDefinition(), registry);
+			schedulerBuilder.addPropertyReference("errorHandler", errorHandlerBeanName);
+			BeanDefinitionHolder schedulerHolder = new BeanDefinitionHolder(
+					schedulerBuilder.getBeanDefinition(), IntegrationContextUtils.TASK_SCHEDULER_BEAN_NAME);
+			BeanDefinitionReaderUtils.registerBeanDefinition(schedulerHolder, registry);
+		}
+	}
+
+
+	private static class NamespaceHandlerDelegate extends NamespaceHandlerSupport {
+
+		public void init() {
+			registerBeanDefinitionParser("channel", new PointToPointChannelParser());
+			registerBeanDefinitionParser("thread-local-channel", new ThreadLocalChannelParser());
+			registerBeanDefinitionParser("publish-subscribe-channel", new PublishSubscribeChannelParser());
+			registerBeanDefinitionParser("service-activator", new ServiceActivatorParser());
+			registerBeanDefinitionParser("transformer", new TransformerParser());
+			registerBeanDefinitionParser("filter", new FilterParser());
+			registerBeanDefinitionParser("router", new RouterParser());
+			registerBeanDefinitionParser("splitter", new SplitterParser());
+			registerBeanDefinitionParser("aggregator", new AggregatorParser());
+			registerBeanDefinitionParser("resequencer", new ResequencerParser());
+			registerBeanDefinitionParser("inbound-channel-adapter", new MethodInvokingInboundChannelAdapterParser());
+			registerBeanDefinitionParser("outbound-channel-adapter", new MethodInvokingOutboundChannelAdapterParser());
+			registerBeanDefinitionParser("gateway", new GatewayParser());
+			registerBeanDefinitionParser("selector-chain", new SelectorChainParser());
+			registerBeanDefinitionParser("enable-annotations", new EnableAnnotationsParser());
+			registerBeanDefinitionParser("application-event-multicaster", new ApplicationEventMulticasterParser());
+			registerBeanDefinitionParser("thread-pool-task-executor", new PoolExecutorParser());
+		}
 	}
 
 }
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java
index cb05d7adb0..61f66d1172 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java
@@ -23,19 +23,11 @@ import org.w3c.dom.Element;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.core.Conventions;
-import org.springframework.core.task.TaskExecutor;
-import org.springframework.integration.channel.MessagePublishingErrorHandler;
-import org.springframework.integration.channel.QueueChannel;
-import org.springframework.integration.context.IntegrationContextUtils;
 import org.springframework.integration.scheduling.CronTrigger;
 import org.springframework.integration.scheduling.IntervalTrigger;
-import org.springframework.integration.scheduling.SimpleTaskScheduler;
 import org.springframework.integration.scheduling.Trigger;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 import org.springframework.util.Assert;
@@ -203,32 +195,4 @@ public abstract class IntegrationNamespaceUtils {
 		targetBuilder.addPropertyValue("transactionDefinition", txDefinition);
 	}
 
-	/**
-	 * Register a TaskScheduler in the given BeanDefinitionRegistry if not yet present.
-	 * The bean name for which this is checking is defined by the constant
-	 * {@link IntegrationContextUtils#TASK_SCHEDULER_BEAN_NAME}.
-	 */
-	public static synchronized void registerTaskSchedulerIfNecessary(BeanDefinitionRegistry registry) {
-		if (!registry.containsBeanDefinition(IntegrationContextUtils.ERROR_CHANNEL_BEAN_NAME)) {
-			RootBeanDefinition errorChannelDef = new RootBeanDefinition(QueueChannel.class);
-			BeanDefinitionHolder errorChannelHolder = new BeanDefinitionHolder(
-					errorChannelDef, IntegrationContextUtils.ERROR_CHANNEL_BEAN_NAME);
-			BeanDefinitionReaderUtils.registerBeanDefinition(errorChannelHolder, registry);
-		}
-		TaskExecutor taskExecutor = null;
-		if (!registry.containsBeanDefinition(IntegrationContextUtils.TASK_SCHEDULER_BEAN_NAME)) {
-			taskExecutor = IntegrationContextUtils.createTaskExecutor(2, 100, 0, "integration-main-");
-			BeanDefinitionBuilder schedulerBuilder = BeanDefinitionBuilder.genericBeanDefinition(SimpleTaskScheduler.class);
-			schedulerBuilder.addConstructorArgValue(taskExecutor);
-			BeanDefinitionBuilder errorHandlerBuilder = BeanDefinitionBuilder.genericBeanDefinition(MessagePublishingErrorHandler.class);
-			errorHandlerBuilder.addPropertyReference("defaultErrorChannel", IntegrationContextUtils.ERROR_CHANNEL_BEAN_NAME);
-			String errorHandlerBeanName = BeanDefinitionReaderUtils.registerWithGeneratedName(
-					errorHandlerBuilder.getBeanDefinition(), registry);
-			schedulerBuilder.addPropertyReference("errorHandler", errorHandlerBeanName);
-			BeanDefinitionHolder schedulerHolder = new BeanDefinitionHolder(
-					schedulerBuilder.getBeanDefinition(), IntegrationContextUtils.TASK_SCHEDULER_BEAN_NAME);
-			BeanDefinitionReaderUtils.registerBeanDefinition(schedulerHolder, registry);
-		}
-	}
-
 }
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MessageBusParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MessageBusParser.java
deleted file mode 100644
index 232f40e650..0000000000
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MessageBusParser.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2002-2008 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.integration.config.xml;
-
-import java.util.concurrent.CopyOnWriteArraySet;
-
-import org.w3c.dom.Element;
-
-import org.springframework.beans.factory.BeanDefinitionStoreException;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.BeanDefinitionHolder;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
-import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.context.event.SimpleApplicationEventMulticaster;
-import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.core.task.TaskExecutor;
-import org.springframework.integration.bus.ApplicationContextMessageBus;
-import org.springframework.integration.config.annotation.MessagingAnnotationPostProcessor;
-import org.springframework.integration.context.IntegrationContextUtils;
-
-/**
- * Parser for the &lt;message-bus&gt; element of the integration namespace.
- * 
- * @author Mark Fisher
- * @author Marius Bogoevici
- */
-public class MessageBusParser extends AbstractSimpleBeanDefinitionParser {
-
-	private static final String MESSAGING_ANNOTATION_POST_PROCESSOR_BEAN_NAME =
-			"internal.MessagingAnnotationPostProcessor";
-
-	private static final String ASYNC_EVENT_MULTICASTER_ATTRIBUTE = "configure-async-event-multicaster";
-
-
-	@Override
-	protected Class<?> getBeanClass(Element element) {
-		return ApplicationContextMessageBus.class;
-	}
-
-	@Override
-	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
-			throws BeanDefinitionStoreException {
-		return "messageBus";
-	}
-
-
-	@Override
-	protected boolean isEligibleAttribute(String attributeName) {
-		return !ASYNC_EVENT_MULTICASTER_ATTRIBUTE.equals(attributeName) &&
-				!"enable-annotations".equals(attributeName) &&
-				super.isEligibleAttribute(attributeName);
-	}
-
-	@Override
-	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-		super.doParse(element, parserContext, builder);
-		IntegrationNamespaceUtils.registerTaskSchedulerIfNecessary(parserContext.getRegistry());
-		if ("true".equals(element.getAttribute(ASYNC_EVENT_MULTICASTER_ATTRIBUTE).toLowerCase())) {
-			TaskExecutor taskExecutor = IntegrationContextUtils.createTaskExecutor(1, 10, 0, "event-multicaster-");
-			BeanDefinitionBuilder eventMulticasterBuilder = BeanDefinitionBuilder.genericBeanDefinition(
-					SimpleApplicationEventMulticaster.class);
-			eventMulticasterBuilder.addPropertyValue("taskExecutor", taskExecutor);
-			eventMulticasterBuilder.addPropertyValue("collectionClass", CopyOnWriteArraySet.class);
-			BeanDefinitionHolder holder = new BeanDefinitionHolder(eventMulticasterBuilder.getBeanDefinition(),
-					AbstractApplicationContext.APPLICATION_EVENT_MULTICASTER_BEAN_NAME);
-			BeanDefinitionReaderUtils.registerBeanDefinition(holder, parserContext.getRegistry());
-		}
-		this.addPostProcessors(element, parserContext);
-	}
-
-	/**
-	 * Adds extra post-processors to the context, to inject the objects configured by the MessageBus
-	 */
-	private void addPostProcessors(Element element, ParserContext parserContext) {
-		if ("true".equals(element.getAttribute("enable-annotations").toLowerCase())) {
-			this.registerMessagingAnnotationPostProcessor(parserContext);
-		}
-	}
-
-	private void registerMessagingAnnotationPostProcessor(ParserContext parserContext) {
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MessagingAnnotationPostProcessor.class);
-		builder.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
-		parserContext.getRegistry().registerBeanDefinition(
-				MESSAGING_ANNOTATION_POST_PROCESSOR_BEAN_NAME, builder.getBeanDefinition());
-	}
-
-}
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd
index fd11a928f1..659b948c29 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd
@@ -16,15 +16,24 @@
 		]]></xsd:documentation>
 	</xsd:annotation>
 
-	<xsd:element name="message-bus">
+	<xsd:element name="enable-annotations">
+		<xsd:annotation>
+			<xsd:documentation>
+	Enables annotation support for Message Endpoints.
+			</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+
+	<xsd:element name="application-event-multicaster">
 		<xsd:complexType>
 			<xsd:annotation>
 				<xsd:documentation>
-	Defines the Message Bus for this Application Context.
+	Defines the ApplicationEventMulticaster to use for this ApplicationContext.
+	The "task-executor" reference is optional. If not provided, an instance of
+	ThreadPoolTaskExecutor will be created by default.
 				</xsd:documentation>
 			</xsd:annotation>
-			<xsd:attribute name="enable-annotations" type="xsd:boolean"/>
-			<xsd:attribute name="configure-async-event-multicaster" type="xsd:boolean"/>
+			<xsd:attribute name="task-executor"/>
 		</xsd:complexType>
 	</xsd:element>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests-context.xml
index e2865645d3..0bd8c8c721 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests-context.xml
@@ -6,7 +6,7 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus enable-annotations="true"/>
+	<enable-annotations/>
 	
 	<channel id="input">
 		<queue capacity="5"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests.java
index f1a7325db0..fff3b9c3e2 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2002-2008 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.integration.aggregator.integration;
 
 import static org.junit.Assert.*;
@@ -8,6 +24,7 @@ import java.util.Map;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.integration.channel.PollableChannel;
@@ -17,9 +34,13 @@ import org.springframework.integration.message.GenericMessage;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+/**
+ * @author Iwein Fuld
+ */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
 public class ConcurrentAggregatorIntegrationTests {
+
 	@Autowired
 	@Qualifier("input")
 	private MessageChannel input;
@@ -28,6 +49,7 @@ public class ConcurrentAggregatorIntegrationTests {
 	@Qualifier("output")
 	private PollableChannel output;
 
+
 	@Test
 	public void configOk() throws Exception {
 		// nothing to assert
@@ -42,6 +64,7 @@ public class ConcurrentAggregatorIntegrationTests {
 		assertEquals(0+1+2+3+4, output.receive().getPayload());
 	}
 
+
 	//configured in context associated with this test
 	public static class SummingAggregator {
 		public Integer sum(List<Integer> numbers) {
@@ -53,6 +76,7 @@ public class ConcurrentAggregatorIntegrationTests {
 		}
 	}
 
+
 	private Map<String, Object> stubHeaders(int sequenceNumber, int sequenceSize, int correllationId) {
 		Map<String, Object> headers = new HashMap<String, Object>();
 		headers.put(MessageHeaders.SEQUENCE_NUMBER, sequenceNumber);
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml
index 7b16df9763..992980da67 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="queueChannel">
 		<queue capacity="10"/>
 	</channel>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/FilterParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/FilterParserTests-context.xml
index bec8933f79..9821fc9c2a 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/FilterParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/FilterParserTests-context.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="adapterOutput">
 		<queue capacity="1"/>
 	</channel>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationChannelAdapterAdviceChainTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationChannelAdapterAdviceChainTests-context.xml
index 929485164b..8856e02ca1 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationChannelAdapterAdviceChainTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationChannelAdapterAdviceChainTests-context.xml
@@ -10,7 +10,7 @@
 			http://www.springframework.org/schema/integration/stream
 			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
 
-	<message-bus enable-annotations="true"/>
+	<enable-annotations/>
 
 	<channel id="output">
 		<queue capacity="1"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationChannelAdapterTransactionalTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationChannelAdapterTransactionalTests-context.xml
index a466b5216f..2767229093 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationChannelAdapterTransactionalTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationChannelAdapterTransactionalTests-context.xml
@@ -10,7 +10,7 @@
 			http://www.springframework.org/schema/integration/stream
 			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
 
-	<message-bus enable-annotations="true"/>
+	<enable-annotations/>
 
 	<channel id="output">
 		<queue capacity="1"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerAdviceChainTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerAdviceChainTests-context.xml
index 88d88976ee..9593ac0df6 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerAdviceChainTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerAdviceChainTests-context.xml
@@ -10,7 +10,7 @@
 			http://www.springframework.org/schema/integration/stream
 			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
 
-	<message-bus enable-annotations="true"/>
+	<enable-annotations/>
 
 	<channel id="input">
 		<queue capacity="1"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerTransactionalTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerTransactionalTests-context.xml
index 1ee5eadf23..69c4b02bf2 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerTransactionalTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerTransactionalTests-context.xml
@@ -10,7 +10,7 @@
 			http://www.springframework.org/schema/integration/stream
 			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
 
-	<message-bus enable-annotations="true"/>
+	<enable-annotations/>
 
 	<channel id="input">
 		<queue capacity="1"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/aggregatorParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/aggregatorParserTests.xml
index 4cea807346..449283371c 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/aggregatorParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/aggregatorParserTests.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="outputChannel">
 		<queue capacity="5"/>
 	</channel>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests-context.xml
index a1d47fde15..3267189d50 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests-context.xml
@@ -7,7 +7,7 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus enable-annotations="true"/>
+	<enable-annotations/>
 
 	<channel id="input"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/messageParameterAnnotatedEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/messageParameterAnnotatedEndpointTests.xml
index 9f6f0cd176..61ab17e773 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/messageParameterAnnotatedEndpointTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/messageParameterAnnotatedEndpointTests.xml
@@ -7,7 +7,7 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<integration:message-bus enable-annotations="true"/>
+	<integration:enable-annotations/>
 
 	<integration:channel id="inputChannel"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/serviceActivatorAnnotationPostProcessorTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/serviceActivatorAnnotationPostProcessorTests.xml
index bc9b5de33f..a492c05f62 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/serviceActivatorAnnotationPostProcessorTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/serviceActivatorAnnotationPostProcessorTests.xml
@@ -7,7 +7,7 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus enable-annotations="true"/>
+	<enable-annotations/>
 
 	<channel id="inputChannel"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml
index 1ac85122bf..f44050ee2d 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml
@@ -7,7 +7,7 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<integration:message-bus enable-annotations="true"/>
+	<integration:enable-annotations/>
 
 	<integration:channel id="inputChannel"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/testAnnotatedAggregator.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/testAnnotatedAggregator.xml
index 6df7de8e61..909140d9cd 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/testAnnotatedAggregator.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/testAnnotatedAggregator.xml
@@ -9,7 +9,7 @@
 			http://www.springframework.org/schema/context
 			http://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
-	<message-bus enable-annotations="true"/>
+	<enable-annotations/>
 
 	<channel id="inputChannel"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml
index d4144a866f..367ee1aeda 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml
@@ -7,7 +7,7 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<integration:message-bus enable-annotations="true"/>
+	<integration:enable-annotations/>
 
 	<integration:channel id="inputChannel"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/completionStrategyMethodWithMissingReference.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/completionStrategyMethodWithMissingReference.xml
index 2d331be11f..48f5050073 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/completionStrategyMethodWithMissingReference.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/completionStrategyMethodWithMissingReference.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 				
-	<message-bus/>
-	
 	<aggregator id="aggregator" ref="adderBean" method="add" completion-strategy="testCompletionStrategy"
 		input-channel="input-channel" output-channel="replyChannel">
 	</aggregator>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointInterceptorTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointInterceptorTests.xml
deleted file mode 100644
index f377e03fd5..0000000000
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointInterceptorTests.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
-
-	<message-bus/>
-
-	<channel id="inputChannelForBeans"/>
-	<channel id="inputChannelForRefs"/>
-	<channel id="outputChannel">
-		<queue capacity="10"/>
-	</channel>
-
-	<service-activator id="endpointWithBeanInterceptors"
-	                   input-channel="inputChannelForBeans"
-	                   ref="testHandler"
-	                   output-channel="outputChannel">
-		<interceptors>
-			<beans:bean class="org.springframework.integration.config.TestPreHandleInterceptor"/>
-			<beans:bean class="org.springframework.integration.config.TestPostHandleInterceptor"/>
-		</interceptors>
-	</service-activator>
-
-	<service-activator id="endpointWithRefInterceptors"
-	                   input-channel="inputChannelForRefs"
-	                   ref="testHandler"
-	                   output-channel="outputChannel">
-		<interceptors>
-			<ref bean="preInterceptor"/>
-			<ref bean="postInterceptor"/>
-		</interceptors>
-	</service-activator>
-
-
-	<beans:bean id="testHandler" class="org.springframework.integration.config.TestHandler">
-		<beans:property name="replyMessageText" value="test"/>
-	</beans:bean>
-
-	<beans:bean id="preInterceptor" class="org.springframework.integration.config.TestPreHandleInterceptor"/>
-
-	<beans:bean id="postInterceptor" class="org.springframework.integration.config.TestPostHandleInterceptor"/>
-
-</beans:beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithSelector.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithSelector.xml
index 2b0a3ca82c..63d9fa18e6 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithSelector.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/endpointWithSelector.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="testChannel"/>
 
 	<service-activator id="endpoint" input-channel="testChannel"
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/invalidMethodNameAggregator.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/invalidMethodNameAggregator.xml
index 0aaa5c1ed1..f98240ff4f 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/invalidMethodNameAggregator.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/invalidMethodNameAggregator.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 			
-	<message-bus/>		
-
 	<channel id="inputChannel"/>
 	<channel id="replyChannel"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusElementAndBean.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusElementAndBean.xml
deleted file mode 100644
index 53c3de920b..0000000000
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusElementAndBean.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:integration="http://www.springframework.org/schema/integration"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
-
-	<integration:message-bus/>
-
-	<bean id="bus" class="org.springframework.integration.bus.ApplicationContextMessageBus"/>
-
-</beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAsyncEventMulticaster.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAsyncEventMulticaster.xml
index 7ef5bf54a1..acd0720778 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAsyncEventMulticaster.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAsyncEventMulticaster.xml
@@ -7,6 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus configure-async-event-multicaster="true"/>
+	<application-event-multicaster/>
 
 </beans:beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAutoStartup.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAutoStartup.xml
deleted file mode 100644
index 88cf9fe4dc..0000000000
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithAutoStartup.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
-
-	<message-bus auto-startup="true"/>
-
-</beans:beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithDefaults.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithDefaults.xml
index 71e3274fcb..c61fd4cdc8 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithDefaults.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithDefaults.xml
@@ -7,6 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-    
+	<channel id="test"/>
+
 </beans:beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithErrorChannel.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithErrorChannel.xml
index 7281542157..e399b88e06 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithErrorChannel.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithErrorChannel.xml
@@ -9,6 +9,4 @@
 
 	<channel id="errorChannel"/>
 
-	<message-bus/>
-
 </beans:beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithMessageBusAware.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithMessageBusAware.xml
deleted file mode 100644
index 07683716a1..0000000000
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithMessageBusAware.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
-
-	<message-bus/>
-
-	<beans:bean id="messageBusAwareBean" class="org.springframework.integration.bus.TestMessageBusAwareImpl"/>
-
-</beans:beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithoutAsyncEventMulticaster.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithoutAsyncEventMulticaster.xml
index c3c2428e11..9a39c07d9e 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithoutAsyncEventMulticaster.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/messageBusWithoutAsyncEventMulticaster.xml
@@ -5,8 +5,8 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus configure-async-event-multicaster="false"/>
+	<channel id="test"/>
 
 </beans:beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/multipleMessageBusElements.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/multipleMessageBusElements.xml
deleted file mode 100644
index 3ab2907afe..0000000000
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/multipleMessageBusElements.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
-
-	<message-bus/>
-
-	<message-bus/>
-
-</beans:beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/resequencerParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/resequencerParserTests.xml
index 6d3a0a2a5b..cced5aed7c 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/resequencerParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/resequencerParserTests.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="inputChannel"/>
 
 	<channel id="outputChannel">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
index 31f2d328c2..19573b403b 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="testChannel">
 		<queue capacity="50"/>
 	</channel>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/gatewayParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/gatewayParserTests.xml
index 06447b112a..b9a73ebcd7 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/gatewayParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/gatewayParserTests.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="requestChannel">
 		<queue capacity="100"/>
 	</channel>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml
index 359055188c..1115b70362 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="input">
 		<queue capacity="1"/>
 	</channel>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml
index eb82ce1204..56defabfae 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="input">
 		<queue capacity="1"/>
 	</channel>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml
index 8b4b9bd0b4..fb04cf40d9 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="input">
 		<queue capacity="1"/>
 	</channel>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml
index b43e0859ce..18308604ea 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="input">
 		<queue capacity="1"/>
 	</channel>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml
index eb82ca3629..e591406322 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="input">
 		<queue capacity="1"/>
 	</channel>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/transactionTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/transactionTests.xml
index ee8a4303ec..769d4951c8 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/transactionTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/transactionTests.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="badInput">
 		<queue capacity="1"/>
 	</channel>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml
index 88d7011bc1..d3dec63e2a 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<si:message-bus/>
-
 	<si:channel id="channel1"/>
 	<si:channel id="channel2">
 		<si:queue capacity="5"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/filter/filterContextTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/filter/filterContextTests.xml
index a6b82bde53..b985edfb17 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/filter/filterContextTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/filter/filterContextTests.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="input"/>
 
 	<channel id="output">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml
index 54b8b8cf0e..1dc2291b7e 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="requestChannel"/>
 
 	<service-activator ref="testHandler" input-channel="requestChannel"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml
index da85e3d222..a59e9eef69 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="requestChannel"/>
 
 	<channel id="replyChannel">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/routerParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/routerParserTests.xml
index ef6aa6788a..24be26f7f3 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/routerParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/routerParserTests.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="input"/>
 
 	<channel id="inputForRouterWithDefaultOutput"/>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterAggregatorTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterAggregatorTests.xml
index f2fc46f637..877b082bcb 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterAggregatorTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterAggregatorTests.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="numbers"/>
 	<channel id="splits"/>
 	<channel id="results">
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterParserTests.xml
index bbd4ddd42a..b714130a11 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/splitterParserTests.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="output">
 		<queue capacity="10"/>
 	</channel>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-context.xml
index afa6ba0ac1..2bdd62e23e 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-context.xml
@@ -6,7 +6,7 @@
 		http://www.springframework.org/schema/integration
 		http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus enable-annotations="true"/>
+	<enable-annotations/>
 
 	<channel id="inAnnotated" />
 	<channel id="inDefault" />
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/transformerContextTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/transformerContextTests.xml
index 35be06cddd..2185a213dd 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/transformerContextTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/transformerContextTests.xml
@@ -7,8 +7,6 @@
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
 
-	<message-bus/>
-
 	<channel id="input"/>
 
 	<channel id="output">