diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/PollableFileSource.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/PollableFileSource.java index add46d61ad..1390985096 100644 --- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/PollableFileSource.java +++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/PollableFileSource.java @@ -30,10 +30,10 @@ import org.apache.commons.logging.LogFactory; import org.springframework.core.io.Resource; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.MessageDeliveryAware; import org.springframework.integration.message.MessageSource; -import org.springframework.integration.message.MessagingException; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformer.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformer.java index 8d875d2f7d..530a7f4091 100644 --- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformer.java +++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformer.java @@ -22,9 +22,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.file.FileNameGenerator; import org.springframework.integration.message.MessageBuilder; -import org.springframework.integration.message.MessagingException; import org.springframework.integration.transformer.Transformer; import org.springframework.util.Assert; diff --git a/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/AbstractDirectorySource.java b/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/AbstractDirectorySource.java index fe090f444d..f94bb65034 100644 --- a/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/AbstractDirectorySource.java +++ b/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/AbstractDirectorySource.java @@ -25,10 +25,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageDeliveryAware; import org.springframework.integration.message.MessageSource; -import org.springframework.integration.message.MessagingException; /** * Base class for implementing a PollableSource that creates messages from files diff --git a/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/QueuedFTPClientPool.java b/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/QueuedFTPClientPool.java index c9f9e90714..e7c9944099 100644 --- a/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/QueuedFTPClientPool.java +++ b/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/QueuedFTPClientPool.java @@ -28,7 +28,7 @@ import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.net.ftp.FTPClientConfig; import org.apache.commons.net.ftp.FTPReply; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGateway.java b/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGateway.java index 0312280554..fe2fe9e155 100644 --- a/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGateway.java +++ b/org.springframework.integration.httpinvoker/src/main/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGateway.java @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.adapter.MessageHandler; import org.springframework.integration.adapter.RemotingInboundGatewaySupport; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; import org.springframework.remoting.httpinvoker.HttpInvokerServiceExporter; import org.springframework.web.HttpRequestHandler; diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsListener.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsListener.java index dace0d59ad..35a3e1139f 100644 --- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsListener.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsListener.java @@ -21,8 +21,8 @@ import javax.jms.MessageListener; import org.springframework.integration.channel.MessageChannelTemplate; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.MessageDeliveryException; -import org.springframework.integration.message.MessagingException; import org.springframework.jms.support.converter.MessageConverter; import org.springframework.util.Assert; diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/HeaderMappingMessageConverter.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/HeaderMappingMessageConverter.java index 416b044516..9c497d90c0 100644 --- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/HeaderMappingMessageConverter.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/HeaderMappingMessageConverter.java @@ -26,8 +26,8 @@ import org.apache.commons.logging.LogFactory; import org.springframework.integration.adapter.MessageHeaderMapper; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.MessageBuilder; -import org.springframework.integration.message.MessagingException; import org.springframework.jms.support.converter.MessageConversionException; import org.springframework.jms.support.converter.MessageConverter; import org.springframework.jms.support.converter.SimpleMessageConverter; diff --git a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/DefaultFolderConnection.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/DefaultFolderConnection.java index 8f420a7f67..f995e540da 100644 --- a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/DefaultFolderConnection.java +++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/DefaultFolderConnection.java @@ -88,7 +88,7 @@ public class DefaultFolderConnection implements Lifecycle, DisposableBean, Folde return this.monitoringStrategy.receive(this.folder); } catch (Exception e) { - throw new org.springframework.integration.message.MessagingException( + throw new org.springframework.integration.core.MessagingException( "failure occurred while receiving from folder", e); } } @@ -120,7 +120,7 @@ public class DefaultFolderConnection implements Lifecycle, DisposableBean, Folde this.running = true; } catch (MessagingException e) { - throw new org.springframework.integration.message.MessagingException( + throw new org.springframework.integration.core.MessagingException( "Failed to start FolderConnection", e); } } diff --git a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/PollingMailSource.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/PollingMailSource.java index 0943534d9a..6d3cb0a2dc 100644 --- a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/PollingMailSource.java +++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/PollingMailSource.java @@ -23,10 +23,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.mail.monitor.MonitoringStrategy; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageSource; -import org.springframework.integration.message.MessagingException; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/transformer/AbstractMailMessageTransformer.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/transformer/AbstractMailMessageTransformer.java index d70d18e5bb..0277276664 100644 --- a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/transformer/AbstractMailMessageTransformer.java +++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/transformer/AbstractMailMessageTransformer.java @@ -27,9 +27,9 @@ import org.apache.commons.logging.LogFactory; import org.springframework.integration.adapter.MessageMappingException; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.mail.MailHeaders; import org.springframework.integration.message.MessageBuilder; -import org.springframework.integration.message.MessagingException; import org.springframework.integration.transformer.Transformer; import org.springframework.util.Assert; diff --git a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamSource.java b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamSource.java index 11fc944f8e..7f30932f7b 100644 --- a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamSource.java +++ b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamSource.java @@ -21,9 +21,9 @@ import java.io.IOException; import java.io.InputStream; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.MessageSource; -import org.springframework.integration.message.MessagingException; /** * A pollable source for receiving bytes from an {@link InputStream}. diff --git a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamWritingMessageConsumer.java b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamWritingMessageConsumer.java index d2ecaedc8d..07d3da544e 100644 --- a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamWritingMessageConsumer.java +++ b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamWritingMessageConsumer.java @@ -24,8 +24,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.MessageConsumer; -import org.springframework.integration.message.MessagingException; /** * A {@link MessageConsumer} that writes a byte array to an {@link OutputStream}. diff --git a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamSource.java b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamSource.java index 1389c53275..b4e8eab864 100644 --- a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamSource.java +++ b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamSource.java @@ -22,8 +22,8 @@ import java.io.InputStreamReader; import java.io.Reader; import java.io.UnsupportedEncodingException; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.MessageSource; -import org.springframework.integration.message.MessagingException; import org.springframework.integration.message.StringMessage; import org.springframework.util.Assert; diff --git a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamWritingMessageConsumer.java b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamWritingMessageConsumer.java index 03d592651e..91271f7c7d 100644 --- a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamWritingMessageConsumer.java +++ b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamWritingMessageConsumer.java @@ -27,8 +27,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.MessageConsumer; -import org.springframework.integration.message.MessagingException; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/SimpleWebServiceOutboundGateway.java b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/SimpleWebServiceOutboundGateway.java index 6eb24c9926..72d9fbfc64 100644 --- a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/SimpleWebServiceOutboundGateway.java +++ b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/SimpleWebServiceOutboundGateway.java @@ -26,7 +26,7 @@ import javax.xml.transform.dom.DOMSource; import org.w3c.dom.Document; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; import org.springframework.ws.WebServiceMessageFactory; import org.springframework.ws.client.core.SourceExtractor; import org.springframework.ws.client.core.WebServiceMessageCallback; diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/DefaultXmlPayloadConverter.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/DefaultXmlPayloadConverter.java index 994ab13537..625c9f4cc7 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/DefaultXmlPayloadConverter.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/DefaultXmlPayloadConverter.java @@ -21,7 +21,8 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; + import org.w3c.dom.Document; import org.w3c.dom.Node; import org.xml.sax.InputSource; diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/result/DomResultFactory.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/result/DomResultFactory.java index 92073fa1a9..5de9a15f55 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/result/DomResultFactory.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/result/DomResultFactory.java @@ -22,7 +22,7 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.Result; import javax.xml.transform.dom.DOMResult; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; /** * @author Jonas Partner diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathSingleChannelRouter.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathSingleChannelRouter.java index bd5bb16d3a..fe2a8da974 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathSingleChannelRouter.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathSingleChannelRouter.java @@ -21,7 +21,7 @@ import java.util.Map; import org.w3c.dom.Node; import org.springframework.integration.core.Message; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.xml.DefaultXmlPayloadConverter; import org.springframework.integration.xml.XmlPayloadConverter; import org.springframework.xml.xpath.XPathExpression; diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/source/DomSourceFactory.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/source/DomSourceFactory.java index 899583ffda..63964740da 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/source/DomSourceFactory.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/source/DomSourceFactory.java @@ -24,7 +24,8 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; + import org.w3c.dom.Document; import org.xml.sax.InputSource; diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/source/StringSourceFactory.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/source/StringSourceFactory.java index bb544cefaf..22e7893e14 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/source/StringSourceFactory.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/source/StringSourceFactory.java @@ -20,7 +20,7 @@ import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; import org.springframework.xml.transform.StringResult; import org.springframework.xml.transform.StringSource; import org.w3c.dom.Document; diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java index 9f662f41a7..1c5adcfd3f 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java @@ -35,7 +35,7 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.springframework.integration.core.Message; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.splitter.AbstractMessageSplitter; import org.springframework.integration.xml.DefaultXmlPayloadConverter; import org.springframework.integration.xml.XmlPayloadConverter; diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformer.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformer.java index f3b15f267e..38b568a057 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformer.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformer.java @@ -24,7 +24,7 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.Result; import javax.xml.transform.dom.DOMResult; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; import org.springframework.xml.transform.StringResult; import org.w3c.dom.Document; import org.xml.sax.InputSource; diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/ResultToStringTransformer.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/ResultToStringTransformer.java index de33125612..a409d0dc87 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/ResultToStringTransformer.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/ResultToStringTransformer.java @@ -26,7 +26,7 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; import org.springframework.xml.transform.StringResult; /** diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XmlPayloadMarshallingTransformer.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XmlPayloadMarshallingTransformer.java index 1c405aa1a9..fd83df37ee 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XmlPayloadMarshallingTransformer.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XmlPayloadMarshallingTransformer.java @@ -21,7 +21,7 @@ import java.io.IOException; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.Result; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.transformer.AbstractPayloadTransformer; import org.springframework.integration.xml.result.DomResultFactory; import org.springframework.integration.xml.result.ResultFactory; diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XmlPayloadUnmarshallingTransformer.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XmlPayloadUnmarshallingTransformer.java index feeb3365d7..cb9d005193 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XmlPayloadUnmarshallingTransformer.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XmlPayloadUnmarshallingTransformer.java @@ -23,7 +23,7 @@ import javax.xml.transform.dom.DOMSource; import org.w3c.dom.Document; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.transformer.AbstractPayloadTransformer; import org.springframework.integration.xml.source.DomSourceFactory; import org.springframework.integration.xml.source.SourceFactory; diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java index 5d77834c20..ba16447f90 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java @@ -29,7 +29,7 @@ import javax.xml.transform.stream.StreamSource; import org.w3c.dom.Document; import org.springframework.core.io.Resource; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.transformer.AbstractPayloadTransformer; import org.springframework.integration.xml.result.DomResultFactory; import org.springframework.integration.xml.result.ResultFactory; diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests.java index ce3398436c..cfef0e1d9b 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests.java @@ -29,8 +29,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.MessagingException; import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.xml.transform.StringSource; diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/router/XPathMultiChannelRouterTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/router/XPathMultiChannelRouterTests.java index 8de9bf3c1d..d4011b2f29 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/router/XPathMultiChannelRouterTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/router/XPathMultiChannelRouterTests.java @@ -22,8 +22,8 @@ import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.MessagingException; import org.springframework.integration.message.StringMessage; import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.xml.xpath.XPathExpression; diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/router/XPathSingleChannelRouterTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/router/XPathSingleChannelRouterTests.java index f421cf03fe..7547b009c9 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/router/XPathSingleChannelRouterTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/router/XPathSingleChannelRouterTests.java @@ -22,8 +22,8 @@ import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.MessagingException; import org.springframework.integration.message.StringMessage; import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.xml.xpath.XPathExpression; diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/source/DomSourceFactoryTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/source/DomSourceFactoryTests.java index 505e2c0220..dba7e98eff 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/source/DomSourceFactoryTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/source/DomSourceFactoryTests.java @@ -31,7 +31,7 @@ import org.junit.Test; import org.w3c.dom.Document; import org.xml.sax.InputSource; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; import org.springframework.xml.transform.StringResult; /** diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/source/StringSourceTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/source/StringSourceTests.java index b5de33f3b3..62d6266ec3 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/source/StringSourceTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/source/StringSourceTests.java @@ -21,7 +21,8 @@ import java.io.BufferedReader; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.message.MessagingException; + +import org.springframework.integration.core.MessagingException; import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.xml.transform.StringSource; import org.w3c.dom.Document; diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/splitter/XPathMessageSplitterTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/splitter/XPathMessageSplitterTests.java index a9000ee146..78d7927ab3 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/splitter/XPathMessageSplitterTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/splitter/XPathMessageSplitterTests.java @@ -29,8 +29,8 @@ import org.w3c.dom.Node; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.MessagingException; import org.springframework.integration.xml.util.XmlTestUtil; /** diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformerTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformerTests.java index bae1bbe6d5..4c84d4c52e 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformerTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformerTests.java @@ -26,7 +26,7 @@ import org.junit.Before; import org.junit.Test; import org.w3c.dom.Document; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.xml.transform.StringResult; diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/ResultToStringTransfomerTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/ResultToStringTransfomerTests.java index 57f350bd45..b1ac67ba71 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/ResultToStringTransfomerTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/ResultToStringTransfomerTests.java @@ -24,7 +24,8 @@ import javax.xml.transform.sax.SAXResult; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.message.MessagingException; + +import org.springframework.integration.core.MessagingException; import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.xml.transform.StringResult; diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/XsltPayloadTransformerTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/XsltPayloadTransformerTests.java index fc6b89fd86..96407d09e9 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/XsltPayloadTransformerTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/XsltPayloadTransformerTests.java @@ -30,7 +30,7 @@ import org.w3c.dom.Document; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.xml.transform.StringSource; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageListMethodAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageListMethodAdapter.java index b907a93be0..366f2377fa 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageListMethodAdapter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageListMethodAdapter.java @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.List; import org.springframework.integration.core.Message; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.util.DefaultMethodInvoker; import org.springframework.util.Assert; import org.springframework.util.ReflectionUtils; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelResolutionException.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelResolutionException.java index c1a0269949..5ae5293d0d 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelResolutionException.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelResolutionException.java @@ -16,7 +16,7 @@ package org.springframework.integration.channel; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; /** * Thrown by a ChannelResolver when it cannot resolve a channel name. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java index beec35646d..5e7e69054d 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java @@ -20,8 +20,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.integration.core.MessageChannel; +import org.springframework.integration.core.MessagingException; 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/channel/interceptor/MessageStoringInterceptor.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageStoringInterceptor.java index 00120ff9e9..2aaa634003 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageStoringInterceptor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageStoringInterceptor.java @@ -25,8 +25,8 @@ import org.springframework.integration.channel.BlockingChannel; import org.springframework.integration.channel.ChannelInterceptor; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.MessageStore; -import org.springframework.integration.message.MessagingException; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/core/MessageChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/core/MessageChannel.java index 662bffd80c..889d5b4999 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/core/MessageChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/core/MessageChannel.java @@ -16,7 +16,6 @@ package org.springframework.integration.core; - /** * Base channel interface defining common behavior for message sending and receiving. * diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessagingException.java b/org.springframework.integration/src/main/java/org/springframework/integration/core/MessagingException.java similarity index 94% rename from org.springframework.integration/src/main/java/org/springframework/integration/message/MessagingException.java rename to org.springframework.integration/src/main/java/org/springframework/integration/core/MessagingException.java index f6fdd7a741..01f973cb90 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessagingException.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/core/MessagingException.java @@ -14,9 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.message; - -import org.springframework.integration.core.Message; +package org.springframework.integration.core; /** * The base exception for any failures within the messaging system. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumer.java index cc729d3404..c312dd4f21 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumer.java @@ -20,9 +20,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.MessageConsumer; import org.springframework.integration.message.MessageHandlingException; -import org.springframework.integration.message.MessagingException; import org.springframework.integration.util.ErrorHandler; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java index b455dfaba5..2ff0e3b241 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java @@ -24,11 +24,11 @@ import org.springframework.integration.channel.MessageChannelTemplate; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.MessageProducer; import org.springframework.integration.message.MessageRejectedException; -import org.springframework.integration.message.MessagingException; import org.springframework.integration.selector.MessageSelector; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageDeliveryException.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageDeliveryException.java index 9b3b5f474f..b077a65c18 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageDeliveryException.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageDeliveryException.java @@ -17,6 +17,7 @@ package org.springframework.integration.message; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; /** * Exception that indicates an error during message delivery. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageHandlingException.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageHandlingException.java index 2ae9b3f9b9..f785fcbc2a 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageHandlingException.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageHandlingException.java @@ -17,6 +17,7 @@ package org.springframework.integration.message; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; /** * Exception that indicates an error during message handling. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingConsumer.java index 7c6397f510..f368f9e066 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingConsumer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingConsumer.java @@ -19,6 +19,7 @@ package org.springframework.integration.message; import java.lang.reflect.Method; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingSource.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingSource.java index 3c81e41ff4..5f0d9b221f 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingSource.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingSource.java @@ -21,6 +21,7 @@ import java.lang.reflect.Method; import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.util.DefaultMethodInvoker; import org.springframework.integration.util.MethodInvoker; import org.springframework.integration.util.MethodValidator; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java index 3145fc6f24..b420ba8cfb 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java @@ -26,7 +26,7 @@ import org.springframework.integration.channel.BeanFactoryChannelResolver; import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java index df081dd105..03b77b92c6 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java @@ -26,8 +26,8 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.MessageMappingMethodInvoker; -import org.springframework.integration.message.MessagingException; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractHeaderTransformer.java b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractHeaderTransformer.java index 89cd990942..a44debac0f 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractHeaderTransformer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractHeaderTransformer.java @@ -20,8 +20,8 @@ import java.util.HashMap; import java.util.Map; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.MessageBuilder; -import org.springframework.integration.message.MessagingException; /** * A base class for {@link Transformer} implementations that modify diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractPayloadTransformer.java b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractPayloadTransformer.java index 8e5622a87d..8ddfc6a4b0 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractPayloadTransformer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractPayloadTransformer.java @@ -17,8 +17,8 @@ package org.springframework.integration.transformer; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.MessageBuilder; -import org.springframework.integration.message.MessagingException; /** * A base class for {@link Transformer} implementations that modify diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java index 0cea6ba792..c2ae272605 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java @@ -30,11 +30,11 @@ import org.springframework.integration.channel.ThreadLocalChannel; import org.springframework.integration.config.annotation.MessagingAnnotationPostProcessor; import org.springframework.integration.config.xml.MessageBusParser; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer; import org.springframework.integration.endpoint.ReplyMessageHolder; import org.springframework.integration.endpoint.ServiceActivatingConsumer; import org.springframework.integration.endpoint.SubscribingConsumerEndpoint; -import org.springframework.integration.message.MessagingException; import org.springframework.integration.message.StringMessage; import org.springframework.integration.util.TestUtils; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java index 37380dfcaf..cb0e0bdba5 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java @@ -31,10 +31,10 @@ import org.junit.Test; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.MessageRejectedException; -import org.springframework.integration.message.MessagingException; import org.springframework.integration.message.StringMessage; import org.springframework.integration.message.TestHandlers; import org.springframework.integration.selector.MessageSelector; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java index e4d1639aa7..df61db7232 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java @@ -30,6 +30,7 @@ import org.springframework.context.support.GenericApplicationContext; import org.springframework.integration.bus.DefaultMessageBus; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.endpoint.PollingConsumerEndpoint; import org.springframework.integration.util.TestUtils; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java index ec5eebd27f..fa9c8e6caf 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertNotNull; import org.junit.Test; import org.springframework.integration.core.Message; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.MethodInvokingSource; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/selector/PayloadTypeSelectorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/selector/PayloadTypeSelectorTests.java index bf5c63e13e..cc2cfe8676 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/selector/PayloadTypeSelectorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/selector/PayloadTypeSelectorTests.java @@ -21,9 +21,9 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.ErrorMessage; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.MessagingException; import org.springframework.integration.message.StringMessage; import org.springframework.integration.selector.PayloadTypeSelector; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java index 9c470f7cf6..186751493b 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java @@ -32,9 +32,9 @@ import org.springframework.integration.channel.TestChannelResolver; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.MessageBuilder; -import org.springframework.integration.message.MessagingException; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java index b65f18e248..31d4c6ead4 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; import org.springframework.integration.core.Message; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/RouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/RouterTests.java index b799d784e3..dfe991f284 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/RouterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/RouterTests.java @@ -28,8 +28,8 @@ import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.MessageDeliveryException; -import org.springframework.integration.message.MessagingException; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java index 647cc43813..251679846f 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java @@ -25,7 +25,7 @@ import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; -import org.springframework.integration.message.MessagingException; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/PayloadTransformerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/PayloadTransformerTests.java index f2678f85d5..425a70b83d 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/PayloadTransformerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/PayloadTransformerTests.java @@ -23,8 +23,8 @@ import java.util.Date; import org.junit.Test; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.MessagingException; import org.springframework.integration.message.StringMessage; /**