From 1ce101f2bf9db89edf736c7fdde42a7704dfb846 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 14 Aug 2008 15:47:12 +0000
Subject: [PATCH] Moved MessagePublishingErrorHandler from 'scheduling' package
 to 'channel'.

---
 .../springframework/integration/bus/DefaultMessageBus.java   | 2 +-
 .../MessagePublishingErrorHandler.java                       | 5 ++---
 .../endpoint/interceptor/ConcurrencyInterceptor.java         | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename org.springframework.integration/src/main/java/org/springframework/integration/{scheduling => channel}/MessagePublishingErrorHandler.java (92%)

diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java
index c0b02935d5..8cd8709914 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java
@@ -43,6 +43,7 @@ import org.springframework.integration.channel.ChannelRegistry;
 import org.springframework.integration.channel.ChannelRegistryAware;
 import org.springframework.integration.channel.DefaultChannelRegistry;
 import org.springframework.integration.channel.MessageChannel;
+import org.springframework.integration.channel.MessagePublishingErrorHandler;
 import org.springframework.integration.channel.factory.ChannelFactory;
 import org.springframework.integration.channel.factory.QueueChannelFactory;
 import org.springframework.integration.endpoint.DefaultEndpointRegistry;
@@ -53,7 +54,6 @@ import org.springframework.integration.message.MessageSource;
 import org.springframework.integration.message.MessageTarget;
 import org.springframework.integration.message.PollableSource;
 import org.springframework.integration.message.SubscribableSource;
-import org.springframework.integration.scheduling.MessagePublishingErrorHandler;
 import org.springframework.integration.scheduling.PollingSchedule;
 import org.springframework.integration.scheduling.Schedule;
 import org.springframework.integration.scheduling.TaskScheduler;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/scheduling/MessagePublishingErrorHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java
similarity index 92%
rename from org.springframework.integration/src/main/java/org/springframework/integration/scheduling/MessagePublishingErrorHandler.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java
index c0ae88750e..5dd091822f 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/scheduling/MessagePublishingErrorHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.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.
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.scheduling;
+package org.springframework.integration.channel;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.message.ErrorMessage;
 import org.springframework.integration.message.MessagingException;
 import org.springframework.integration.util.ErrorHandler;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/interceptor/ConcurrencyInterceptor.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/interceptor/ConcurrencyInterceptor.java
index 9cc5d86fe9..f61236083c 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/interceptor/ConcurrencyInterceptor.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/interceptor/ConcurrencyInterceptor.java
@@ -36,13 +36,13 @@ import org.springframework.core.task.TaskExecutor;
 import org.springframework.integration.channel.ChannelRegistry;
 import org.springframework.integration.channel.ChannelRegistryAware;
 import org.springframework.integration.channel.MessageChannel;
+import org.springframework.integration.channel.MessagePublishingErrorHandler;
 import org.springframework.integration.endpoint.ConcurrencyPolicy;
 import org.springframework.integration.endpoint.EndpointInterceptor;
 import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.handler.MessageHandlerRejectedExecutionException;
 import org.springframework.integration.message.AsyncMessage;
 import org.springframework.integration.message.Message;
-import org.springframework.integration.scheduling.MessagePublishingErrorHandler;
 import org.springframework.integration.util.ErrorHandler;
 import org.springframework.scheduling.concurrent.ConcurrentTaskExecutor;
 import org.springframework.scheduling.concurrent.CustomizableThreadFactory;