From 09f916189963385466e0f56dd1c668106143c1da Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Wed, 17 Sep 2008 12:40:46 +0000
Subject: [PATCH] MessageBus interface no longer extends DisposableBean. Now,
 the DefaultMessageBus implementation implements DisposableBean directly.

---
 .../org/springframework/integration/bus/DefaultMessageBus.java | 2 +-
 .../java/org/springframework/integration/bus/MessageBus.java   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

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 590bfded85..642a769ceb 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
@@ -61,7 +61,7 @@ import org.springframework.util.Assert;
  * @author Mark Fisher
  * @author Marius Bogoevici
  */
-public class DefaultMessageBus implements MessageBus, ApplicationContextAware, ApplicationListener {
+public class DefaultMessageBus implements MessageBus, ApplicationContextAware, ApplicationListener, DisposableBean {
 
 	private static final int DEFAULT_DISPATCHER_POOL_SIZE = 10;
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBus.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBus.java
index ae4a12b585..c1c219b4db 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBus.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/MessageBus.java
@@ -16,7 +16,6 @@
 
 package org.springframework.integration.bus;
 
-import org.springframework.beans.factory.DisposableBean;
 import org.springframework.context.Lifecycle;
 import org.springframework.integration.channel.ChannelRegistry;
 import org.springframework.integration.channel.MessageChannel;
@@ -27,7 +26,7 @@ import org.springframework.integration.endpoint.EndpointRegistry;
  * 
  * @author Mark Fisher
  */
-public interface MessageBus extends ChannelRegistry, EndpointRegistry, Lifecycle, DisposableBean {
+public interface MessageBus extends ChannelRegistry, EndpointRegistry, Lifecycle {
 
 	MessageChannel getErrorChannel();