From fee0aac0ed8089c858631024584843caf22356e9 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Tue, 12 Oct 2010 17:55:48 -0400
Subject: [PATCH] INT-1509, removed depndency on TaskExecutor in favor of
 Executor

---
 .../integration/endpoint/AbstractPollingEndpoint.java     | 6 +++---
 .../integration/scheduling/PollerMetadata.java            | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java
index a330c4b56d..c01b5fcb05 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java
@@ -18,13 +18,13 @@ package org.springframework.integration.endpoint;
 
 import java.util.List;
 import java.util.concurrent.Callable;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ScheduledFuture;
 
 import org.aopalliance.aop.Advice;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.core.task.SyncTaskExecutor;
-import org.springframework.core.task.TaskExecutor;
 import org.springframework.integration.MessageHandlingException;
 import org.springframework.integration.MessagingException;
 import org.springframework.integration.channel.MessagePublishingErrorHandler;
@@ -43,7 +43,7 @@ import org.springframework.util.ErrorHandler;
  */
 public abstract class AbstractPollingEndpoint extends AbstractEndpoint implements BeanClassLoaderAware {
 
-	private volatile TaskExecutor taskExecutor = new SyncTaskExecutor();
+	private volatile Executor taskExecutor = new SyncTaskExecutor();
 
 	private volatile ErrorHandler errorHandler;
 
@@ -84,7 +84,7 @@ public abstract class AbstractPollingEndpoint extends AbstractEndpoint implement
 				return;
 			}
 			Assert.notNull(this.pollerMetadata.getTrigger(), "Trigger is required");
-			TaskExecutor providedExecutor = this.pollerMetadata.getTaskExecutor();
+			Executor providedExecutor = this.pollerMetadata.getTaskExecutor();
 			if (providedExecutor != null) {
 				this.taskExecutor = providedExecutor;
 			}
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/scheduling/PollerMetadata.java b/spring-integration-core/src/main/java/org/springframework/integration/scheduling/PollerMetadata.java
index 45f93ebf78..1084c49c9d 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/scheduling/PollerMetadata.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/scheduling/PollerMetadata.java
@@ -17,9 +17,9 @@
 package org.springframework.integration.scheduling;
 
 import java.util.List;
+import java.util.concurrent.Executor;
 
 import org.aopalliance.aop.Advice;
-import org.springframework.core.task.TaskExecutor;
 import org.springframework.scheduling.Trigger;
 import org.springframework.scheduling.support.PeriodicTrigger;
 
@@ -39,7 +39,7 @@ public class PollerMetadata {
 
 	private List<Advice> adviceChain;
 
-	private volatile TaskExecutor taskExecutor;
+	private volatile Executor taskExecutor;
 
 	public void setTrigger(Trigger trigger) {
 		this.trigger = trigger;
@@ -82,11 +82,11 @@ public class PollerMetadata {
 		return this.adviceChain;
 	}
 
-	public void setTaskExecutor(TaskExecutor taskExecutor) {
+	public void setTaskExecutor(Executor taskExecutor) {
 		this.taskExecutor = taskExecutor;
 	}
 
-	public TaskExecutor getTaskExecutor() {
+	public Executor getTaskExecutor() {
 		return this.taskExecutor;
 	}
 }