diff --git a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests-context.xml b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests-context.xml
index e94a116e79..3ca8b78dd4 100644
--- a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests-context.xml
+++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests-context.xml
@@ -1,11 +1,14 @@
 <?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:task="http://www.springframework.org/schema/task"
 	xmlns:util="http://www.springframework.org/schema/util"
 	xmlns:mail="http://www.springframework.org/schema/integration/mail"
 	xmlns:integration="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/task
+			http://www.springframework.org/schema/task/spring-task.xsd
 			http://www.springframework.org/schema/util
 			http://www.springframework.org/schema/util/spring-util.xsd
 			http://www.springframework.org/schema/integration
@@ -33,6 +36,6 @@
 		<prop key="foo">bar</prop>
 	</util:properties>
 
-	<integration:thread-pool-task-executor id="executor" max-size="5"/>
+	<task:executor id="executor" pool-size="5"/>
 
 </beans>
\ No newline at end of file
diff --git a/org.springframework.integration.osgi/src/test/java/org/springframework/integration/osgi/config/xml/base-bus-config.xml b/org.springframework.integration.osgi/src/test/java/org/springframework/integration/osgi/config/xml/base-bus-config.xml
index d0d2495078..b172a63904 100644
--- a/org.springframework.integration.osgi/src/test/java/org/springframework/integration/osgi/config/xml/base-bus-config.xml
+++ b/org.springframework.integration.osgi/src/test/java/org/springframework/integration/osgi/config/xml/base-bus-config.xml
@@ -1,11 +1,13 @@
 <?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:task="http://www.springframework.org/schema/task"
 	xmlns:si-control="http://www.springframework.org/schema/integration/integration-control-bus"
 	xmlns:si="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-	                   http://www.springframework.org/schema/integration/integration-control-bus http://www.springframework.org/schema/integration/integration-control-bus/spring-integration-bus-1.0.xsd
-                       http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd">
+	                    http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd
+	                    http://www.springframework.org/schema/integration/integration-control-bus http://www.springframework.org/schema/integration/integration-control-bus/spring-integration-bus-1.0.xsd
+                        http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd">
 	
 	<!-- SERVICE REGISTRATION CONFIG-->
 	<si:publish-subscribe-channel id="serviceRegistrationControlChannel" task-executor="executor"/>
@@ -31,6 +33,6 @@
 		<si:mapping value="BINDING" channel="serviceBindingControlChannel"/>
 		<si:mapping value="UNBINDING" channel="serviceBindingControlChannel"/>
 	</si:header-value-router>
-	
-	<si:thread-pool-task-executor id="executor" core-size="10"/>
+
+	<task:executor id="executor" pool-size="10"/>
 </beans>
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 3b88fe32dc..0f19c9dbdf 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
@@ -55,7 +55,6 @@ public class IntegrationNamespaceHandler extends AbstractIntegrationNamespaceHan
 		registerBeanDefinitionParser("poller", new PollerParser());
 		registerBeanDefinitionParser("annotation-config", new AnnotationConfigParser());
 		registerBeanDefinitionParser("application-event-multicaster", new ApplicationEventMulticasterParser());
-		registerBeanDefinitionParser("thread-pool-task-executor", new ThreadPoolTaskExecutorParser());
 		registerBeanDefinitionParser("publisher", new PublisherParser());
 	}
 
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 8aaf94aa0e..2c76e28c00 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
@@ -1,10 +1,11 @@
 <?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.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:task="http://www.springframework.org/schema/task"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input">
 		<queue capacity="5" />
@@ -17,8 +18,7 @@
 		</poller>
 	</aggregator>
 
-	<thread-pool-task-executor id="executor"
-		core-size="5" />
+	<task:executor id="executor" pool-size="5"/>
 
 	<channel id="output">
 		<queue capacity="5" />
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests-context.xml
index 416df66f4c..6b98d4f318 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests-context.xml
@@ -1,10 +1,11 @@
 <?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.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:task="http://www.springframework.org/schema/task"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<annotation-config />
 
@@ -18,12 +19,10 @@
 		</poller>
 	</aggregator>
 
-	<thread-pool-task-executor id="executor"
-		core-size="5" />
+	<task:executor id="executor" pool-size="5"/>
 
 	<channel id="output">
 		<queue capacity="5" />
 	</channel>
 
-
 </beans:beans>
\ No newline at end of file
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests.java
index be11bd781a..633fb2cabe 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 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.aggregator.integration;
 
 import static org.hamcrest.CoreMatchers.is;
@@ -26,6 +27,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.aggregator.AbstractMessageAggregator;
@@ -40,7 +42,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 /**
  * @author Alex Peters
  * @author Iwein Fuld
- * 
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
@@ -48,14 +49,15 @@ public class DefaultMessageAggregatorIntegrationTests {
 
 	@Autowired
 	@Qualifier("input")
-	MessageChannel input;
+	private MessageChannel input;
 
 	@Autowired
 	@Qualifier("output")
-	PollableChannel output;
+	private PollableChannel output;
 
 	@Autowired
-	AbstractMessageAggregator aggregator;
+	private AbstractMessageAggregator aggregator;
+
 
 	@Test
 	public void configOk() throws Exception {
@@ -71,15 +73,17 @@ public class DefaultMessageAggregatorIntegrationTests {
 		}
 		Object payload = output.receive().getPayload();
 		assertThat(payload, is(List.class));
-		assertTrue(payload + " doesn't contain all of {0,1,2,3,4}", ((List) payload).containsAll(Arrays.asList(0, 1, 2,
-				3, 4)));
+		assertTrue(payload + " doesn't contain all of {0,1,2,3,4}",
+				((List) payload).containsAll(Arrays.asList(0, 1, 2, 3, 4)));
 	}
 
-	Map<String, Object> stubHeaders(int sequenceNumber, int sequenceSize, int correllationId) {
+
+	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);
 		headers.put(MessageHeaders.SEQUENCE_SIZE, sequenceSize);
 		headers.put(MessageHeaders.CORRELATION_ID, correllationId);
 		return headers;
 	}
+
 }
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/publishSubscribeChannelParserTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/publishSubscribeChannelParserTests.xml
index 82a940ef99..a9fc6d0001 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/publishSubscribeChannelParserTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/publishSubscribeChannelParserTests.xml
@@ -2,10 +2,10 @@
 <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.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+	xmlns:task="http://www.springframework.org/schema/task"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<publish-subscribe-channel id="defaultChannel"/>
 
@@ -21,7 +21,7 @@
 
 	<publish-subscribe-channel id="channelWithErrorHandler" error-handler="testErrorHandler"/>
 
-	<thread-pool-task-executor id="pool" max-size="1"/>
+	<task:executor id="pool" pool-size="1"/>
 
 	<beans:bean id="testErrorHandler" class="org.springframework.integration.config.TestErrorHandler"/>
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingOutboundChannelAdapterParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingOutboundChannelAdapterParserTests-context.xml
index 1023262f06..9e8f1a1d22 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingOutboundChannelAdapterParserTests-context.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingOutboundChannelAdapterParserTests-context.xml
@@ -2,10 +2,10 @@
 <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.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+	xmlns:task="http://www.springframework.org/schema/task"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="channel"/>
 	
@@ -25,6 +25,6 @@
         </poller> 
 	</outbound-channel-adapter>
 
-	<thread-pool-task-executor id="executor" core-size="5" /> 
+	<task:executor id="executor" pool-size="5" /> 
 
 </beans:beans>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties
index ea07eb36bb..bab247be53 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties
@@ -17,9 +17,13 @@ splitter-inner-success=\
 splitter-inner-success-with-poller=\
 <?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" \
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" \
+	xmlns:beans="http://www.springframework.org/schema/beans" \
+	xmlns:task="http://www.springframework.org/schema/task" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
 			http://www.springframework.org/schema/beans/spring-beans.xsd \
+			http://www.springframework.org/schema/task \
+			http://www.springframework.org/schema/task/spring-task.xsd \
 			http://www.springframework.org/schema/integration \
 			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"> \
@@ -34,14 +38,18 @@ splitter-inner-success-with-poller=\
             <interval-trigger interval="20" /> \
         </poller> \
 	</splitter>  \
-	<thread-pool-task-executor id="executor" core-size="5" /> \
+	<task:executor id="executor" pool-size="5" /> \
 </beans:beans> 
 splitter-inner-success-with-poller-reversed-order=\
 <?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" \
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" \
+	xmlns:beans="http://www.springframework.org/schema/beans" \
+	xmlns:task="http://www.springframework.org/schema/task" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
 			http://www.springframework.org/schema/beans/spring-beans.xsd \
+			http://www.springframework.org/schema/task \
+			http://www.springframework.org/schema/task/spring-task.xsd \
 			http://www.springframework.org/schema/integration \
 			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"> \
@@ -56,7 +64,7 @@ splitter-inner-success-with-poller-reversed-order=\
         </poller> \
         <beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestSplitter" /> \
 	</splitter>  \
-	<thread-pool-task-executor id="executor" core-size="5" /> \
+	<task:executor id="executor" pool-size="5" /> \
 </beans:beans> 
 splitter-ref-success=\
 <?xml version="1.0" encoding="UTF-8"?> \
@@ -272,9 +280,13 @@ aggregator-ref-success=\
 aggregator-inner-concurrent-success=\
 <?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" \
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" \
+	xmlns:beans="http://www.springframework.org/schema/beans" \
+	xmlns:task="http://www.springframework.org/schema/task" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
 			http://www.springframework.org/schema/beans/spring-beans.xsd \
+			http://www.springframework.org/schema/task \
+			http://www.springframework.org/schema/task/spring-task.xsd \
 			http://www.springframework.org/schema/integration \
 			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"> \
@@ -289,14 +301,18 @@ aggregator-inner-concurrent-success=\
 		</poller> \
 		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestAggregator"/> \
 	</aggregator> \
-	<thread-pool-task-executor id="executor" core-size="5" /> \
+	<task:executor id="executor" pool-size="5" /> \
 </beans:beans>
 aggregator-inner-concurrent-success-reorder-bean-poller=\
 <?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" \
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" \
+	xmlns:beans="http://www.springframework.org/schema/beans" \
+	xmlns:task="http://www.springframework.org/schema/task" \
 	xsi:schemaLocation="http://www.springframework.org/schema/beans \
 			http://www.springframework.org/schema/beans/spring-beans.xsd \
+			http://www.springframework.org/schema/task \
+			http://www.springframework.org/schema/task/spring-task.xsd \
 			http://www.springframework.org/schema/integration \
 			http://www.springframework.org/schema/integration/spring-integration.xsd"> \
 	<channel id="inChannel"> \
@@ -311,7 +327,7 @@ aggregator-inner-concurrent-success-reorder-bean-poller=\
 			<interval-trigger interval="20" /> \
 		</poller> \
 	</aggregator> \
-	<thread-pool-task-executor id="executor" core-size="5" /> \
+	<task:executor id="executor" pool-size="5" /> \
 </beans:beans>
 aggregator-failure-refAndBean=\
 <?xml version="1.0" encoding="UTF-8"?> \
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/pollingEndpointErrorHandlingTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/pollingEndpointErrorHandlingTests.xml
index 172782b162..f49f51b4e1 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/pollingEndpointErrorHandlingTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/pollingEndpointErrorHandlingTests.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
+<beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:si="http://www.springframework.org/schema/integration"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+	xmlns:si="http://www.springframework.org/schema/integration"
+	xmlns:task="http://www.springframework.org/schema/task"
+	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd">
 
 	<si:channel id="errorChannel">
 		<si:queue capacity="10"/>
@@ -15,6 +15,6 @@
 		<property name="taskExecutor" ref="taskExecutor"/>
 	</bean>
 
-	<si:thread-pool-task-executor id="taskExecutor" core-size="1" max-size="1" rejection-policy="CALLER_RUNS"/>
+	<task:executor id="taskExecutor" pool-size="1" rejection-policy="CALLER_RUNS"/>
 
 </beans>