Moved PooledMessageHandler to the handler package.

spring-integration-core/src/main/java/org/springframework/integration/bus/MessageBus.java

@@ -42,6 +42,7 @@ import org.springframework.integration.dispatcher.MessageDispatcher;
 import org.springframework.integration.endpoint.ConcurrencyPolicy;
 import org.springframework.integration.endpoint.MessageEndpoint;
 import org.springframework.integration.handler.MessageHandler;
+import org.springframework.integration.handler.PooledMessageHandler;
 import org.springframework.integration.scheduling.MessagePublishingErrorHandler;
 import org.springframework.integration.scheduling.MessagingTaskScheduler;
 import org.springframework.integration.scheduling.MessagingTaskSchedulerAware;

spring-integration-core/src/main/java/org/springframework/integration/handler/InterceptingMessageHandler.java

@@ -34,7 +34,7 @@ public abstract class InterceptingMessageHandler implements MessageHandler {
 		this.target = target;
 	}
 
-	public Message handle(Message message) {
+	public Message<?> handle(Message<?> message) {
 		return handle(message, this.target);
 	}
 
@@ -46,6 +46,6 @@ public abstract class InterceptingMessageHandler implements MessageHandler {
 	 * @param target the intercepted handler
 	 * @return a reply message or null
 	 */
-	public abstract Message handle(Message message, MessageHandler target);
+	public abstract Message<?> handle(Message<?> message, MessageHandler target);
 
 }

spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java

@@ -23,7 +23,8 @@ import org.springframework.integration.message.Message;
 
 /**
  * A message handler implementation that passes incoming messages through a
- * chain of handlers.
+ * chain of handlers. The chain will be broken by any handler throwing an
+ * exception or returning <em>null</em>.
  * 
  * @author Mark Fisher
  */
@@ -51,7 +52,7 @@ public class MessageHandlerChain implements MessageHandler {
 		this.handlers.addAll(handlers);
 	}
 
-	public Message handle(Message message) {
+	public Message<?> handle(Message<?> message) {
 		for (MessageHandler next : handlers) {
 			message = next.handle(message);
 			if (message == null) {

spring-integration-core/src/main/java/org/springframework/integration/handler/PooledMessageHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.bus;
+package org.springframework.integration.handler;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -30,7 +30,6 @@ import org.springframework.context.Lifecycle;
 import org.springframework.integration.dispatcher.MessageHandlerNotRunningException;
 import org.springframework.integration.dispatcher.MessageHandlerRejectedExecutionException;
 import org.springframework.integration.dispatcher.MessageSelectorRejectedException;
-import org.springframework.integration.handler.MessageHandler;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.selector.MessageSelector;
 import org.springframework.scheduling.concurrent.CustomizableThreadFactory;