From 45282ec459bc7ef676c103276d9c3e782536f4a0 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Wed, 25 Aug 2010 14:25:40 +0000
Subject: [PATCH] INT-1257, INT-1263 Refactoring Message History (work in
 progress): removed MessageHistory and MessageHistoryEvent, moved
 MessageHistoryWriter and NamedComponent to the 'context' package.

---
 .../org/springframework/integration/rmi/RmiInboundGateway.java  | 2 +-
 .../security/channel/ChannelInvocationDefinitionSource.java     | 2 +-
 .../org/springframework/integration/test/util/TestUtils.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/RmiInboundGateway.java b/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/RmiInboundGateway.java
index b014b8456d..35dc80a2af 100644
--- a/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/RmiInboundGateway.java
+++ b/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/RmiInboundGateway.java
@@ -19,10 +19,10 @@ package org.springframework.integration.rmi;
 import java.rmi.registry.Registry;
 
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.integration.context.NamedComponent;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.gateway.RemotingInboundGatewaySupport;
 import org.springframework.integration.gateway.RequestReplyExchanger;
-import org.springframework.integration.history.NamedComponent;
 import org.springframework.remoting.rmi.RmiServiceExporter;
 import org.springframework.remoting.support.RemoteInvocationExecutor;
 import org.springframework.util.Assert;
diff --git a/spring-integration-security/src/main/java/org/springframework/integration/security/channel/ChannelInvocationDefinitionSource.java b/spring-integration-security/src/main/java/org/springframework/integration/security/channel/ChannelInvocationDefinitionSource.java
index 9870817eb8..bdf8e7d4ec 100644
--- a/spring-integration-security/src/main/java/org/springframework/integration/security/channel/ChannelInvocationDefinitionSource.java
+++ b/spring-integration-security/src/main/java/org/springframework/integration/security/channel/ChannelInvocationDefinitionSource.java
@@ -25,8 +25,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
 
+import org.springframework.integration.context.NamedComponent;
 import org.springframework.integration.core.MessageChannel;
-import org.springframework.integration.history.NamedComponent;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityMetadataSource;
 import org.springframework.util.Assert;
diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/util/TestUtils.java b/spring-integration-test/src/main/java/org/springframework/integration/test/util/TestUtils.java
index 5f5b6a622c..4c74a4d703 100644
--- a/spring-integration-test/src/main/java/org/springframework/integration/test/util/TestUtils.java
+++ b/spring-integration-test/src/main/java/org/springframework/integration/test/util/TestUtils.java
@@ -36,11 +36,11 @@ import org.springframework.integration.MessageRejectedException;
 import org.springframework.integration.channel.MessagePublishingErrorHandler;
 import org.springframework.integration.context.BeanFactoryChannelResolver;
 import org.springframework.integration.context.IntegrationContextUtils;
+import org.springframework.integration.context.NamedComponent;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.core.MessageHandler;
 import org.springframework.integration.endpoint.AbstractEndpoint;
 import org.springframework.integration.endpoint.AbstractPollingEndpoint;
-import org.springframework.integration.history.NamedComponent;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.scheduling.support.PeriodicTrigger;
 import org.springframework.util.Assert;