diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageBarrier.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageBarrier.java index 66c5ce7ab3..86ba925d9d 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageBarrier.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageBarrier.java @@ -19,8 +19,8 @@ import java.util.concurrent.ConcurrentMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.integration.Message; +import org.springframework.integration.core.MessageSource; import org.springframework.integration.handler.AbstractMessageHandler; -import org.springframework.integration.message.MessageSource; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupStore; import org.springframework.integration.store.SimpleMessageStore; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java index 9d7ccb6e04..e1b4852457 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java @@ -26,8 +26,8 @@ import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.SmartLifecycle; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.core.MessageChannel; +import org.springframework.integration.core.MessageSource; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; -import org.springframework.integration.message.MessageSource; import org.springframework.integration.scheduling.PollerMetadata; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageSource.java b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageSource.java similarity index 89% rename from spring-integration-core/src/main/java/org/springframework/integration/message/MessageSource.java rename to spring-integration-core/src/main/java/org/springframework/integration/core/MessageSource.java index 70489205f2..8ba2540068 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageSource.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2010 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,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.message; +package org.springframework.integration.core; import org.springframework.integration.Message; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java index 005ac37c6c..d5bb009e6a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java @@ -18,8 +18,8 @@ package org.springframework.integration.endpoint; import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; +import org.springframework.integration.core.MessageSource; import org.springframework.integration.core.MessagingTemplate; -import org.springframework.integration.message.MessageSource; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MethodInvokingMessageSource.java b/spring-integration-core/src/main/java/org/springframework/integration/message/MethodInvokingMessageSource.java index ae0a6080b6..96f267081f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/MethodInvokingMessageSource.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/message/MethodInvokingMessageSource.java @@ -23,6 +23,7 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.Message; import org.springframework.integration.MessagingException; import org.springframework.integration.core.GenericMessage; +import org.springframework.integration.core.MessageSource; import org.springframework.integration.util.DefaultMethodInvoker; import org.springframework.integration.util.MethodInvoker; import org.springframework.integration.util.MethodValidator; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java b/spring-integration-core/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java index 505b981c44..213fbd230b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java @@ -34,12 +34,12 @@ import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.core.ErrorMessage; import org.springframework.integration.core.GenericMessage; import org.springframework.integration.core.MessageBuilder; +import org.springframework.integration.core.MessageSource; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.endpoint.PollingConsumer; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; -import org.springframework.integration.message.MessageSource; import org.springframework.integration.message.StringMessage; import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.test.util.TestUtils.TestApplicationContext; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/TestSource.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/TestSource.java index 061d999a9e..539ba60a09 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/TestSource.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/TestSource.java @@ -17,7 +17,7 @@ package org.springframework.integration.channel.config; import org.springframework.integration.Message; -import org.springframework.integration.message.MessageSource; +import org.springframework.integration.core.MessageSource; import org.springframework.integration.message.StringMessage; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java index 5280f802ce..3711debb5d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java @@ -29,7 +29,7 @@ import org.aopalliance.intercept.MethodInvocation; import org.junit.Test; import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.message.MessageSource; +import org.springframework.integration.core.MessageSource; import org.springframework.integration.message.StringMessage; import org.springframework.integration.scheduling.PollerMetadata; import org.springframework.integration.test.util.TestUtils; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestSource.java b/spring-integration-core/src/test/java/org/springframework/integration/config/TestSource.java index 01c1e748b9..064d4b269d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/TestSource.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/TestSource.java @@ -17,7 +17,7 @@ package org.springframework.integration.config; import org.springframework.integration.Message; -import org.springframework.integration.message.MessageSource; +import org.springframework.integration.core.MessageSource; import org.springframework.integration.message.StringMessage; /** diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java b/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java index a51f37b280..ef78598160 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java @@ -23,7 +23,7 @@ import org.springframework.integration.Message; import org.springframework.integration.MessagingException; import org.springframework.integration.aggregator.ResequencingMessageGroupProcessor; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.message.MessageSource; +import org.springframework.integration.core.MessageSource; import org.springframework.util.Assert; import java.io.File; diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapter.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapter.java index 89b2fd82d1..2cd7e014d5 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapter.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapter.java @@ -26,7 +26,7 @@ import javax.sql.DataSource; import org.springframework.dao.DataAccessException; import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.message.MessageSource; +import org.springframework.integration.core.MessageSource; import org.springframework.jdbc.core.ColumnMapRowMapper; import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.ResultSetExtractor; diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java index e9dc78e59f..af85b04110 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java @@ -24,7 +24,7 @@ import javax.jms.Destination; import org.springframework.integration.Message; import org.springframework.integration.MessagingException; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.message.MessageSource; +import org.springframework.integration.core.MessageSource; import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.support.converter.MessageConverter; diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/AttributePollingMessageSource.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/AttributePollingMessageSource.java index e11847f934..23194f1b2f 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/AttributePollingMessageSource.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/AttributePollingMessageSource.java @@ -22,9 +22,9 @@ import javax.management.ObjectName; import org.springframework.integration.Message; import org.springframework.integration.MessagingException; +import org.springframework.integration.core.MessageSource; import org.springframework.integration.gateway.SimpleMessageMapper; import org.springframework.integration.message.InboundMessageMapper; -import org.springframework.integration.message.MessageSource; import org.springframework.jmx.support.ObjectNameManager; import org.springframework.util.Assert; diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailReceivingMessageSource.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailReceivingMessageSource.java index c7ee952c31..38af0fb4c0 100644 --- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailReceivingMessageSource.java +++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailReceivingMessageSource.java @@ -26,7 +26,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.integration.Message; import org.springframework.integration.MessagingException; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.message.MessageSource; +import org.springframework.integration.core.MessageSource; import org.springframework.util.Assert; /** diff --git a/spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamReadingMessageSource.java b/spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamReadingMessageSource.java index 00bab75472..1511a67211 100644 --- a/spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamReadingMessageSource.java +++ b/spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamReadingMessageSource.java @@ -23,7 +23,7 @@ import java.io.InputStream; import org.springframework.integration.Message; import org.springframework.integration.MessagingException; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.message.MessageSource; +import org.springframework.integration.core.MessageSource; /** * A pollable source for receiving bytes from an {@link InputStream}. diff --git a/spring-integration-stream/src/main/java/org/springframework/integration/stream/CharacterStreamReadingMessageSource.java b/spring-integration-stream/src/main/java/org/springframework/integration/stream/CharacterStreamReadingMessageSource.java index d17a3a5f5c..a935b49b3f 100644 --- a/spring-integration-stream/src/main/java/org/springframework/integration/stream/CharacterStreamReadingMessageSource.java +++ b/spring-integration-stream/src/main/java/org/springframework/integration/stream/CharacterStreamReadingMessageSource.java @@ -23,7 +23,7 @@ import java.io.Reader; import java.io.UnsupportedEncodingException; import org.springframework.integration.MessagingException; -import org.springframework.integration.message.MessageSource; +import org.springframework.integration.core.MessageSource; import org.springframework.integration.message.StringMessage; import org.springframework.util.Assert; diff --git a/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParserTests.java b/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParserTests.java index a4eec26c9b..d5663277bc 100644 --- a/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParserTests.java +++ b/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParserTests.java @@ -33,8 +33,8 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.Message; +import org.springframework.integration.core.MessageSource; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; -import org.springframework.integration.message.MessageSource; /** * @author Mark Fisher diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppMessageProducer.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppMessageProducer.java index 5b9f9e570f..d4a16e340a 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppMessageProducer.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppMessageProducer.java @@ -20,7 +20,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.message.MessageSource; +import org.springframework.integration.core.MessageSource; import org.springframework.integration.xmpp.XmppHeaders; import java.util.Date; diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventProducer.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventProducer.java index 9f70338aa7..e372274487 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventProducer.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventProducer.java @@ -22,6 +22,7 @@ import org.jivesoftware.smack.packet.Presence; import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; +import org.springframework.integration.core.MessageSource; import org.springframework.integration.message.*; import org.springframework.integration.xmpp.XmppHeaders;