Moved MessagingException into the new 'org.springframework.integration.core' package.

This commit is contained in:
Mark Fisher
2008-10-15 03:28:50 +00:00
parent 262bd8fd9c
commit ebcccdc5c9
61 changed files with 65 additions and 59 deletions

View File

@@ -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;
/**

View File

@@ -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;

View File

@@ -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

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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);
}
}

View File

@@ -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;
/**

View File

@@ -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;

View File

@@ -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}.

View File

@@ -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}.

View File

@@ -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;

View File

@@ -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;
/**

View File

@@ -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;

View File

@@ -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;

View File

@@ -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

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;
/**

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;
/**

View File

@@ -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;

View File

@@ -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;
/**

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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.

View File

@@ -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;
/**

View File

@@ -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;
/**

View File

@@ -16,7 +16,6 @@
package org.springframework.integration.core;
/**
* Base channel interface defining common behavior for message sending and receiving.
*

View File

@@ -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.

View File

@@ -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;

View File

@@ -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;

View File

@@ -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.

View File

@@ -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.

View File

@@ -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;
/**

View File

@@ -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;

View File

@@ -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;
/**

View File

@@ -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;
/**

View File

@@ -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

View File

@@ -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

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;
/**

View File

@@ -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;

View File

@@ -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;
/**

View File

@@ -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;
/**

View File

@@ -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;
/**

View File

@@ -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;
/**

View File

@@ -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;
/**