Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Fisher
2008-10-15 02:54:29 +00:00
parent ea2bb3e7c7
commit 08043b541d
252 changed files with 268 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/AbstractRemotingOutboundGateway.java
View File

@@ -19,9 +19,9 @@ package org.springframework.integration.adapter;
import java.io.Serializable;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.core.Message;
import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer;
import org.springframework.integration.endpoint.ReplyMessageHolder;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageHandlingException;
import org.springframework.remoting.RemoteAccessException;

2
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageHandler.java
View File

@@ -16,7 +16,7 @@
package org.springframework.integration.adapter;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* Interface used for proxy-based remoting adapters (e.g. RMI and HttpInvoker).

2
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageMappingException.java
View File

@@ -16,7 +16,7 @@
package org.springframework.integration.adapter;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageHandlingException;
/**

2
org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/RemotingInboundGatewaySupport.java
View File

@@ -16,8 +16,8 @@
package org.springframework.integration.adapter;
import org.springframework.integration.core.Message;
import org.springframework.integration.gateway.SimpleMessagingGateway;
import org.springframework.integration.message.Message;
/**
* Support class for inbound Messaging Gateways.

2
org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventPublishingMessageConsumer.java
View File

@@ -19,8 +19,8 @@ package org.springframework.integration.event;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware;
import org.springframework.integration.core.Message;
import org.springframework.integration.endpoint.AbstractMessageConsumer;
import org.springframework.integration.message.Message;
import org.springframework.util.Assert;
/**

2
org.springframework.integration.event/src/main/java/org/springframework/integration/event/MessagingEvent.java
View File

@@ -17,7 +17,7 @@
package org.springframework.integration.event;
import org.springframework.context.ApplicationEvent;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* A subclass of {@link ApplicationEvent} that wraps a {@link Message}.

2
org.springframework.integration.event/src/test/java/org/springframework/integration/event/ApplicationEventInboundChannelAdapterTests.java
View File

@@ -32,7 +32,7 @@ import org.springframework.context.event.ContextStoppedEvent;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.channel.PollableChannel;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* @author Mark Fisher

2
org.springframework.integration.event/src/test/java/org/springframework/integration/event/ApplicationEventPublishingMessageConsumerTests.java
View File

@@ -23,7 +23,7 @@ import org.junit.Test;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.StringMessage;
/**

2
org.springframework.integration.file/src/main/java/org/springframework/integration/file/DefaultFileNameGenerator.java
View File

@@ -18,7 +18,7 @@ package org.springframework.integration.file;
import java.io.File;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.util.StringUtils;
/**

2
org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileNameGenerator.java
View File

@@ -16,7 +16,7 @@
package org.springframework.integration.file;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* Strategy interface for generating a file name from a message.

2
org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileWritingMessageConsumer.java
View File

@@ -21,7 +21,7 @@ import java.io.FileOutputStream;
import java.io.OutputStreamWriter;
import java.nio.charset.Charset;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageConsumer;
import org.springframework.integration.message.MessageHandlingException;
import org.springframework.util.Assert;

2
org.springframework.integration.file/src/main/java/org/springframework/integration/file/PollableFileSource.java
View File

@@ -29,8 +29,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.core.io.Resource;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.GenericMessage;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageDeliveryAware;
import org.springframework.integration.message.MessageSource;
import org.springframework.integration.message.MessagingException;

2
org.springframework.integration.file/src/main/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformer.java
View File

@@ -21,8 +21,8 @@ import java.io.File;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.core.Message;
import org.springframework.integration.file.FileNameGenerator;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.integration.message.MessagingException;
import org.springframework.integration.transformer.Transformer;

2
org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceIntegrationTests.java
View File

@@ -33,7 +33,7 @@ import org.junit.runner.RunWith;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.test.annotation.Repeat;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

2
org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceTests.java
View File

@@ -25,7 +25,7 @@ import java.io.File;
import org.junit.Before;
import org.junit.Test;
import org.springframework.core.io.Resource;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* @author Iwein Fuld

2
org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/CustomFileNameGenerator.java
View File

@@ -18,8 +18,8 @@ package org.springframework.integration.file.config;
import java.util.Date;
import org.springframework.integration.core.Message;
import org.springframework.integration.file.FileNameGenerator;
import org.springframework.integration.message.Message;
/**
* @author Marius Bogoevici

2
org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/AbstractDirectorySource.java
View File

@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.integration.message.MessageDeliveryAware;
import org.springframework.integration.message.MessageSource;

2
org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageConsumer.java
View File

@@ -23,7 +23,7 @@ import java.io.IOException;
import org.apache.commons.net.ftp.FTPClient;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageConsumer;
import org.springframework.integration.message.MessageDeliveryException;
import org.springframework.util.Assert;

2
org.springframework.integration.ftp/src/test/java/org/springframework/integration/ftp/FtpSendingMessageConsumerTests.java
View File

@@ -30,8 +30,8 @@ import org.apache.commons.net.ftp.FTPClient;
import org.junit.Before;
import org.junit.Test;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.GenericMessage;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageDeliveryException;
/**

2
org.springframework.integration.ftp/src/test/java/org/springframework/integration/ftp/FtpSourceTests.java
View File

@@ -45,7 +45,7 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* @author Iwein Fuld

2
org.springframework.integration.ftp/src/test/java/org/springframework/integration/ftp/config/FtpSourceIntegrationTests.java
View File

@@ -26,9 +26,9 @@ import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.integration.core.Message;
import org.springframework.integration.ftp.FtpSource;
import org.springframework.integration.ftp.QueuedFTPClientPool;
import org.springframework.integration.message.Message;
/**
* @author Iwein Fuld

2
org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGatewayTests.java
View File

@@ -31,8 +31,8 @@ import org.junit.Test;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.core.Message;
import org.springframework.integration.httpinvoker.HttpInvokerInboundGateway;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.StringMessage;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;

2
org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsListener.java
View File

@@ -20,7 +20,7 @@ import javax.jms.MessageListener;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.channel.MessageChannelTemplate;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageDeliveryException;
import org.springframework.integration.message.MessagingException;
import org.springframework.jms.support.converter.MessageConverter;

2
org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/HeaderMappingMessageConverter.java
View File

@@ -25,7 +25,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.adapter.MessageHeaderMapper;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.integration.message.MessagingException;
import org.springframework.jms.support.converter.MessageConversionException;

2
org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageConsumer.java
View File

@@ -16,7 +16,7 @@
package org.springframework.integration.jms;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageConsumer;
/**

2
org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsSource.java
View File

@@ -19,8 +19,8 @@ package org.springframework.integration.jms;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.GenericMessage;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageSource;
import org.springframework.jms.core.JmsTemplate;

2
org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java
View File

@@ -28,9 +28,9 @@ import javax.jms.JMSException;
import org.junit.Test;
import org.springframework.integration.core.Message;
import org.springframework.integration.jms.DefaultJmsHeaderMapper;
import org.springframework.integration.jms.JmsHeaders;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageBuilder;
/**

2
org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsGatewayParserTests.java
View File

@@ -27,8 +27,8 @@ import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.core.Message;
import org.springframework.integration.jms.JmsGateway;
import org.springframework.integration.message.Message;
import org.springframework.jms.connection.JmsTransactionManager;
import org.springframework.jms.listener.AbstractMessageListenerContainer;

2
org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java
View File

@@ -26,7 +26,7 @@ import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.channel.PollableChannel;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* @author Mark Fisher

2
org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailSendingMessageConsumer.java
View File

@@ -21,7 +21,7 @@ import javax.mail.internet.MimeMessage;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.integration.adapter.MessageMappingException;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageConsumer;
import org.springframework.integration.message.MessageHeaders;
import org.springframework.mail.MailMessage;

2
org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/PollingMailSource.java
View File

@@ -22,8 +22,8 @@ import java.util.concurrent.ConcurrentLinkedQueue;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.core.Message;
import org.springframework.integration.mail.monitor.MonitoringStrategy;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.integration.message.MessageSource;
import org.springframework.integration.message.MessagingException;

2
org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/transformer/AbstractMailMessageTransformer.java
View File

@@ -26,8 +26,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.adapter.MessageMappingException;
import org.springframework.integration.core.Message;
import org.springframework.integration.mail.MailHeaders;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.integration.message.MessagingException;
import org.springframework.integration.transformer.Transformer;

2
org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailSendingMessageConsumerContextTests.java
View File

@@ -72,7 +72,7 @@ public class MailSendingMessageConsumerContextTests {
@Test
public void byteArrayMessage() throws Exception {
byte[] payload = {1, 2, 3};
org.springframework.integration.message.Message<?> message =
org.springframework.integration.core.Message<?> message =
MessageBuilder.withPayload(payload)
.setHeader(MailHeaders.ATTACHMENT_FILENAME, "attachment.txt")
.setHeader(MailHeaders.TO, MailTestsHelper.TO)

2
org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailSendingMessageConsumerTests.java
View File

@@ -71,7 +71,7 @@ public class MailSendingMessageConsumerTests {
@Test
public void byteArrayMessage() throws Exception {
byte[] payload = {1, 2, 3};
org.springframework.integration.message.Message<byte[]> message =
org.springframework.integration.core.Message<byte[]> message =
MessageBuilder.withPayload(payload)
.setHeader(MailHeaders.ATTACHMENT_FILENAME, "attachment.txt")
.setHeader(MailHeaders.TO, MailTestsHelper.TO)

2
org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailTestsHelper.java
View File

@@ -16,7 +16,7 @@
package org.springframework.integration.mail;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.mail.SimpleMailMessage;

2
org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/SubscribableMailSourceTests.java
View File

@@ -27,7 +27,7 @@ import org.easymock.classextension.EasyMock;
import org.junit.Test;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* @author Jonas Partner

2
org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/RmiOutboundGatewayTests.java
View File

@@ -27,8 +27,8 @@ import org.junit.Test;
import org.springframework.integration.adapter.MessageHandler;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.GenericMessage;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.integration.message.MessageHandlingException;
import org.springframework.integration.message.StringMessage;

2
org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/RmiOutboundGatewayParserTests.java
View File

@@ -26,7 +26,7 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.StringMessage;
import org.springframework.integration.rmi.RmiInboundGateway;

2
org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/Cafe.java
View File

@@ -22,7 +22,7 @@ import org.springframework.integration.annotation.Gateway;
* The entry point for Cafe Demo. The demo's main() method invokes the
* '<code>placeOrder</code>' method on a generated MessagingGateway proxy.
* The gateway then passes the {@link Order} as the payload of a
* {@link org.springframework.integration.message.Message} to the
* {@link org.springframework.integration.core.Message} to the
* configured <em>requestChannel</em>. The channel ('orders') is
* defined in the 'cafeDemo.xml' file.
*

2
org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java
View File

@@ -18,7 +18,7 @@ package org.springframework.integration.samples.ws;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.integration.ws.AbstractWebServiceOutboundGateway;

2
org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/ChannelInvocation.java
View File

@@ -19,7 +19,7 @@ package org.springframework.integration.security.channel;
import org.aopalliance.intercept.MethodInvocation;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.util.Assert;
/**

2
org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/TestConsumer.java
View File

@@ -19,7 +19,7 @@ package org.springframework.integration.security.channel;
import java.util.ArrayList;
import java.util.List;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageConsumer;
/**

2
org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java
View File

@@ -39,7 +39,7 @@ import org.springframework.beans.DirectFieldAccessor;
import org.springframework.integration.channel.AbstractPollableChannel;
import org.springframework.integration.channel.ChannelInterceptor;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.security.channel.ChannelAccessPolicy;
import org.springframework.integration.security.channel.ChannelInvocationDefinitionSource;
import org.springframework.integration.security.channel.ChannelSecurityInterceptor;

2
org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamSource.java
View File

@@ -20,8 +20,8 @@ import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.GenericMessage;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageSource;
import org.springframework.integration.message.MessagingException;

2
org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamWritingMessageConsumer.java
View File

@@ -23,7 +23,7 @@ import java.io.OutputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageConsumer;
import org.springframework.integration.message.MessagingException;

2
org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamWritingMessageConsumer.java
View File

@@ -26,7 +26,7 @@ import java.io.Writer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageConsumer;
import org.springframework.integration.message.MessagingException;
import org.springframework.util.Assert;

2
org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/ByteStreamSourceTests.java
View File

@@ -23,7 +23,7 @@ import java.io.ByteArrayInputStream;
import org.junit.Test;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* @author Mark Fisher

2
org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/CharacterStreamSourceTests.java
View File

@@ -23,7 +23,7 @@ import java.io.StringReader;
import org.junit.Test;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* @author Mark Fisher

2
org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParserTests.java
View File

@@ -32,8 +32,8 @@ import org.junit.Test;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.core.Message;
import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageSource;
/**

2
org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java
View File

@@ -20,9 +20,9 @@ import java.io.IOException;
import java.net.URI;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.core.Message;
import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer;
import org.springframework.integration.endpoint.ReplyMessageHolder;
import org.springframework.integration.message.Message;
import org.springframework.util.Assert;
import org.springframework.ws.WebServiceMessage;
import org.springframework.ws.WebServiceMessageFactory;

2
org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathMultiChannelRouter.java
View File

@@ -22,7 +22,7 @@ import java.util.Map;
import org.w3c.dom.DOMException;
import org.w3c.dom.Node;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.xml.XmlPayloadConverter;
import org.springframework.util.Assert;
import org.springframework.xml.xpath.NodeMapper;

2
org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathSingleChannelRouter.java
View File

@@ -20,7 +20,7 @@ import java.util.Map;
import org.w3c.dom.Node;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessagingException;
import org.springframework.integration.xml.DefaultXmlPayloadConverter;
import org.springframework.integration.xml.XmlPayloadConverter;

2
org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/selector/BooleanTestXPathMessageSelector.java
View File

@@ -21,7 +21,7 @@ import java.util.Map;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.selector.MessageSelector;
import org.springframework.xml.xpath.XPathExpression;

2
org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelector.java
View File

@@ -21,7 +21,7 @@ import java.util.Map;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.selector.MessageSelector;
import org.springframework.xml.xpath.XPathExpression;

2
org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java
View File

@@ -34,7 +34,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessagingException;
import org.springframework.integration.splitter.AbstractMessageSplitter;
import org.springframework.integration.xml.DefaultXmlPayloadConverter;

2
org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests.java
View File

@@ -29,8 +29,8 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.channel.PollableChannel;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.GenericMessage;
import org.springframework.integration.message.Message;
import org.springframework.integration.xml.config.StubResultFactory.StubStringResult;
import org.springframework.xml.transform.StringResult;

2
org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests.java
View File

@@ -28,8 +28,8 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.channel.PollableChannel;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.GenericMessage;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessagingException;
import org.springframework.integration.xml.util.XmlTestUtil;
import org.springframework.xml.transform.StringSource;

2
org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests.java
View File

@@ -29,8 +29,8 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.channel.PollableChannel;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.GenericMessage;
import org.springframework.integration.message.Message;
import org.springframework.integration.xml.config.StubResultFactory.StubStringResult;
import org.springframework.integration.xml.util.XmlTestUtil;
import org.springframework.xml.transform.StringResult;

2
org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/splitter/XPathMessageSplitterTests.java
View File

@@ -28,8 +28,8 @@ import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.GenericMessage;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessagingException;
import org.springframework.integration.xml.util.XmlTestUtil;

2
org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageAggregator.java
View File

@@ -18,7 +18,7 @@ package org.springframework.integration.aggregator;
import java.util.List;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.util.Assert;

2
org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrier.java
View File

@@ -24,7 +24,7 @@ import java.util.concurrent.locks.ReentrantLock;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* Default implementation for a {@link MessageBarrier}.

2
org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierConsumer.java
View File

@@ -31,8 +31,8 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.channel.MessageChannelTemplate;
import org.springframework.integration.core.Message;
import org.springframework.integration.endpoint.AbstractMessageConsumer;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageConsumer;
import org.springframework.integration.message.MessageHandlingException;
import org.springframework.integration.message.MessageProducer;

2
org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AggregationBarrier.java
View File

@@ -18,7 +18,7 @@ package org.springframework.integration.aggregator;
import java.util.List;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* MessageBarrier implementation for message aggregation. Delegates to a

2
org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CompletionStrategy.java
View File

@@ -18,7 +18,7 @@ package org.springframework.integration.aggregator;
import java.util.List;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* Strategy for determining when a group of messages reaches a state of

2
org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CompletionStrategyAdapter.java
View File

@@ -19,7 +19,7 @@ package org.springframework.integration.aggregator;
import java.lang.reflect.Method;
import java.util.List;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.util.Assert;
/**

2
org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageBarrier.java
View File

@@ -18,7 +18,7 @@ package org.springframework.integration.aggregator;
import java.util.List;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* Common interface for routing components that release a list of

2
org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageListMethodAdapter.java
View File

@@ -23,7 +23,7 @@ import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessagingException;
import org.springframework.integration.util.DefaultMethodInvoker;
import org.springframework.util.Assert;

2
org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageSequenceComparator.java
View File

@@ -18,7 +18,7 @@ package org.springframework.integration.aggregator;
import java.util.Comparator;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* A {@link Comparator} implementation based on the 'sequence number'

2
org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MethodInvokingAggregator.java
View File

@@ -20,8 +20,8 @@ import java.lang.reflect.Method;
import java.util.List;
import org.springframework.integration.annotation.Aggregator;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.GenericMessage;
import org.springframework.integration.message.Message;
import org.springframework.integration.util.DefaultMethodResolver;
import org.springframework.integration.util.MethodResolver;
import org.springframework.util.Assert;

2
org.springframework.integration/src/main/java/org/springframework/integration/aggregator/Resequencer.java
View File

@@ -18,7 +18,7 @@ package org.springframework.integration.aggregator;
import java.util.List;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageHeaders;
/**

2
org.springframework.integration/src/main/java/org/springframework/integration/aggregator/ResequencingMessageBarrier.java
View File

@@ -22,7 +22,7 @@ import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* MessageBarrier implementation for resequencing. It can either

2
org.springframework.integration/src/main/java/org/springframework/integration/aggregator/SequenceSizeCompletionStrategy.java
View File

@@ -18,7 +18,7 @@ package org.springframework.integration.aggregator;
import java.util.List;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.util.CollectionUtils;
/**

2
org.springframework.integration/src/main/java/org/springframework/integration/annotation/Gateway.java
View File

@@ -30,7 +30,7 @@ import java.lang.annotation.Target;
* where the annotation attributes can override the default channel settings.
*
* <p>A method annotated with @Gateway may accept a single non-annotated
* parameter of type {@link org.springframework.integration.message.Message}
* parameter of type {@link org.springframework.integration.core.Message}
* or of the intended Message payload type. Method parameters may be mapped
* to individual Message header values by using the {@link Header @Header}
* parameter annotation. Alternatively, to pass the entire Message headers

2
org.springframework.integration/src/main/java/org/springframework/integration/annotation/Router.java
View File

@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
* based on a message, message header(s), or both.
* <p>
* A method annotated with @Router may accept a parameter of type
* {@link org.springframework.integration.message.Message} or of the expected
* {@link org.springframework.integration.core.Message} or of the expected
* Message payload's type. Any type conversion supported by
* {@link org.springframework.beans.SimpleTypeConverter} will be applied to
* the Message payload if necessary. Header values can also be passed as

2
org.springframework.integration/src/main/java/org/springframework/integration/annotation/ServiceActivator.java
View File

@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
* Indicates that a method is capable of handling a message or message payload.
* <p>
* A method annotated with @ServiceActivator may accept a parameter of type
* {@link org.springframework.integration.message.Message} or of the expected
* {@link org.springframework.integration.core.Message} or of the expected
* Message payload's type. Any type conversion supported by
* {@link org.springframework.beans.SimpleTypeConverter} will be applied to
* the Message payload if necessary. Header values can also be passed as

2
org.springframework.integration/src/main/java/org/springframework/integration/annotation/Splitter.java
View File

@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
* payload to produce multiple messages or payloads.
* <p>
* A method annotated with @Splitter may accept a parameter of type
* {@link org.springframework.integration.message.Message} or of the expected
* {@link org.springframework.integration.core.Message} or of the expected
* Message payload's type. Any type conversion supported by
* {@link org.springframework.beans.SimpleTypeConverter} will be applied to
* the Message payload if necessary. Header values can also be passed as

2
org.springframework.integration/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java
View File

@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.channel.MessageChannelTemplate;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.util.Assert;

2
org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultErrorChannel.java
View File

@@ -22,7 +22,7 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.channel.RendezvousChannel;
import org.springframework.integration.channel.interceptor.ChannelInterceptorAdapter;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* The default error channel implementation used by the {@link MessageBus}.

2
org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java
View File

@@ -23,7 +23,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.BeanNameAware;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* Base class for {@link MessageChannel} implementations providing common

2
org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractPollableChannel.java
View File

@@ -16,7 +16,7 @@
package org.springframework.integration.channel;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* Base class for all pollable channels.

2
org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractSubscribableChannel.java
View File

@@ -16,8 +16,8 @@
package org.springframework.integration.channel;
import org.springframework.integration.core.Message;
import org.springframework.integration.dispatcher.MessageDispatcher;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageConsumer;
import org.springframework.util.Assert;

2
org.springframework.integration/src/main/java/org/springframework/integration/channel/BlockingChannel.java
View File

@@ -16,7 +16,7 @@
package org.springframework.integration.channel;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* Extends the base MessageChannel interface for channels that may block when a

2
org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelInterceptor.java
View File

@@ -16,7 +16,7 @@
package org.springframework.integration.channel;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* Interface for interceptors that are able to view and/or modify the

2
org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelPurger.java
View File

@@ -19,7 +19,7 @@ package org.springframework.integration.channel;
import java.util.ArrayList;
import java.util.List;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.selector.MessageSelector;
import org.springframework.util.Assert;

2
org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannel.java
View File

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

2
org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannelTemplate.java
View File

@@ -24,7 +24,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.integration.selector.MessageSelector;
import org.springframework.transaction.PlatformTransactionManager;

2
org.springframework.integration/src/main/java/org/springframework/integration/channel/NullChannel.java
View File

@@ -21,7 +21,7 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.selector.MessageSelector;
/**

2
org.springframework.integration/src/main/java/org/springframework/integration/channel/PollableChannel.java
View File

@@ -18,7 +18,7 @@ package org.springframework.integration.channel;
import java.util.List;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.selector.MessageSelector;
/**

2
org.springframework.integration/src/main/java/org/springframework/integration/channel/PriorityChannel.java
View File

@@ -21,7 +21,7 @@ import java.util.concurrent.PriorityBlockingQueue;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessagePriority;
/**

2
org.springframework.integration/src/main/java/org/springframework/integration/channel/QueueChannel.java
View File

@@ -22,7 +22,7 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.selector.MessageSelector;
import org.springframework.util.Assert;

2
org.springframework.integration/src/main/java/org/springframework/integration/channel/RendezvousChannel.java
View File

@@ -18,7 +18,7 @@ package org.springframework.integration.channel;
import java.util.concurrent.SynchronousQueue;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* A zero-capacity version of {@link QueueChannel} that delegates to a

2
org.springframework.integration/src/main/java/org/springframework/integration/channel/ThreadLocalChannel.java
View File

@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Queue;
import java.util.concurrent.LinkedBlockingQueue;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.selector.MessageSelector;
/**

2
org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/ChannelInterceptorAdapter.java
View File

@@ -18,7 +18,7 @@ package org.springframework.integration.channel.interceptor;
import org.springframework.integration.channel.ChannelInterceptor;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
/**
* A {@link ChannelInterceptor} with no-op method implementations so that

2
org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java
View File

@@ -20,7 +20,7 @@ import java.util.Arrays;
import java.util.List;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageDeliveryException;
import org.springframework.integration.selector.MessageSelector;

2
org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageStoringInterceptor.java
View File

@@ -24,7 +24,7 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.integration.channel.BlockingChannel;
import org.springframework.integration.channel.ChannelInterceptor;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageStore;
import org.springframework.integration.message.MessagingException;
import org.springframework.util.Assert;

2
org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java
View File

@@ -23,7 +23,7 @@ import org.springframework.context.Lifecycle;
import org.springframework.integration.channel.BlockingChannel;
import org.springframework.integration.channel.ChannelInterceptor;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.selector.MessageSelector;
import org.springframework.util.Assert;

4
org.springframework.integration/src/main/java/org/springframework/integration/message/Message.java → org.springframework.integration/src/main/java/org/springframework/integration/core/Message.java
View File

@@ -14,7 +14,9 @@
* limitations under the License.
*/
package org.springframework.integration.message;
package org.springframework.integration.core;
import org.springframework.integration.message.MessageHeaders;
/**
* The central interface that any Message type must implement.

2
org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/AbstractDispatcher.java
View File

@@ -23,7 +23,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.core.task.TaskExecutor;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageConsumer;
import org.springframework.integration.message.MessageRejectedException;

2
org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/BroadcastingDispatcher.java
View File

@@ -17,7 +17,7 @@
package org.springframework.integration.dispatcher;
import org.springframework.core.task.TaskExecutor;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.integration.message.MessageConsumer;

2
org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/MessageDispatcher.java
View File

@@ -16,7 +16,7 @@
package org.springframework.integration.dispatcher;
import org.springframework.integration.message.Message;
import org.springframework.integration.core.Message;
import org.springframework.integration.message.MessageConsumer;
/**

Some files were not shown because too many files have changed in this diff Show More