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

INT-1129 renamed 'message' package to 'mapping' since that is all that remains there

Browse Source
This commit is contained in:
Mark Fisher
2010-07-28 15:25:33 +00:00
parent 3f00c75740
commit 6257853512
41 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java
View File

@@ -30,7 +30,7 @@ import org.springframework.integration.endpoint.AbstractEndpoint;
import org.springframework.integration.endpoint.PollingConsumer;
import org.springframework.integration.endpoint.EventDrivenConsumer;
import org.springframework.integration.handler.BridgeHandler;
import org.springframework.integration.message.InboundMessageMapper;
import org.springframework.integration.mapping.InboundMessageMapper;
import org.springframework.scheduling.support.PeriodicTrigger;
import org.springframework.util.Assert;

2
spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
View File

@@ -38,7 +38,7 @@ import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.endpoint.AbstractEndpoint;
import org.springframework.integration.handler.ArgumentArrayMessageMapper;
import org.springframework.integration.message.InboundMessageMapper;
import org.springframework.integration.mapping.InboundMessageMapper;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.StringUtils;

4
spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessageMapper.java
View File

@@ -18,8 +18,8 @@ package org.springframework.integration.gateway;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.message.InboundMessageMapper;
import org.springframework.integration.message.OutboundMessageMapper;
import org.springframework.integration.mapping.InboundMessageMapper;
import org.springframework.integration.mapping.OutboundMessageMapper;
/**
* An implementation of the {@link InboundMessageMapper} and

4
spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java
View File

@@ -18,8 +18,8 @@ package org.springframework.integration.gateway;
import org.springframework.integration.Message;
import org.springframework.integration.MessagingException;
import org.springframework.integration.message.InboundMessageMapper;
import org.springframework.integration.message.OutboundMessageMapper;
import org.springframework.integration.mapping.InboundMessageMapper;
import org.springframework.integration.mapping.OutboundMessageMapper;
import org.springframework.util.Assert;
/**

2
spring-integration-core/src/main/java/org/springframework/integration/handler/ArgumentArrayMessageMapper.java
View File

@@ -40,7 +40,7 @@ import org.springframework.integration.annotation.Header;
import org.springframework.integration.annotation.Headers;
import org.springframework.integration.annotation.Payload;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.message.InboundMessageMapper;
import org.springframework.integration.mapping.InboundMessageMapper;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;

2
spring-integration-core/src/main/java/org/springframework/integration/json/InboundJsonMessageMapper.java
View File

@@ -32,7 +32,7 @@ import org.codehaus.jackson.type.TypeReference;
import org.springframework.integration.Message;
import org.springframework.integration.MessageHeaders;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.message.InboundMessageMapper;
import org.springframework.integration.mapping.InboundMessageMapper;
import org.springframework.util.Assert;
/**

2
spring-integration-core/src/main/java/org/springframework/integration/json/OutboundJsonMessageMapper.java
View File

@@ -4,7 +4,7 @@ import java.io.StringWriter;
import org.codehaus.jackson.map.ObjectMapper;
import org.springframework.integration.Message;
import org.springframework.integration.message.OutboundMessageMapper;
import org.springframework.integration.mapping.OutboundMessageMapper;
/**
* {@link OutboundMessageMapper} implementation the converts a {@link Message} to a JSON string representation.

2
spring-integration-core/src/main/java/org/springframework/integration/message/HeaderMapper.java → spring-integration-core/src/main/java/org/springframework/integration/mapping/HeaderMapper.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.message;
package org.springframework.integration.mapping;
import java.util.Map;

2
spring-integration-core/src/main/java/org/springframework/integration/message/InboundMessageMapper.java → spring-integration-core/src/main/java/org/springframework/integration/mapping/InboundMessageMapper.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.message;
package org.springframework.integration.mapping;
import org.springframework.integration.Message;

2
spring-integration-core/src/main/java/org/springframework/integration/message/MessageMappingException.java → spring-integration-core/src/main/java/org/springframework/integration/mapping/MessageMappingException.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.message;
package org.springframework.integration.mapping;
import org.springframework.integration.Message;
import org.springframework.integration.MessagingException;

2
spring-integration-core/src/main/java/org/springframework/integration/message/OutboundMessageMapper.java → spring-integration-core/src/main/java/org/springframework/integration/mapping/OutboundMessageMapper.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.message;
package org.springframework.integration.mapping;
import org.springframework.integration.Message;

2
spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests.java
View File

@@ -28,7 +28,7 @@ import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.core.StringMessage;
import org.springframework.integration.core.SubscribableChannel;
import org.springframework.integration.message.InboundMessageMapper;
import org.springframework.integration.mapping.InboundMessageMapper;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

2
spring-integration-http/src/main/java/org/springframework/integration/http/DefaultHttpHeaderMapper.java
View File

@@ -20,7 +20,7 @@ import java.util.Map;
import org.springframework.http.HttpHeaders;
import org.springframework.integration.MessageHeaders;
import org.springframework.integration.message.HeaderMapper;
import org.springframework.integration.mapping.HeaderMapper;
/**
* Default {@link HeaderMapper} implementation for HTTP.

2
spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java
View File

@@ -32,7 +32,7 @@ import org.springframework.integration.MessagingException;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
import org.springframework.integration.message.HeaderMapper;
import org.springframework.integration.mapping.HeaderMapper;
import org.springframework.util.Assert;
import org.springframework.web.client.ResponseErrorHandler;
import org.springframework.web.client.RestTemplate;

2
spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestHandlingEndpointSupport.java
View File

@@ -43,7 +43,7 @@ import org.springframework.integration.Message;
import org.springframework.integration.MessagingException;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.gateway.AbstractMessagingGateway;
import org.springframework.integration.message.HeaderMapper;
import org.springframework.integration.mapping.HeaderMapper;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.LinkedMultiValueMap;

2
spring-integration-http/src/main/java/org/springframework/integration/http/InboundRequestMapper.java
View File

@@ -18,7 +18,7 @@ package org.springframework.integration.http;
import javax.servlet.http.HttpServletRequest;
import org.springframework.integration.message.InboundMessageMapper;
import org.springframework.integration.mapping.InboundMessageMapper;
/**
* Strategy interface for mapping from an inbound {@link HttpServletRequest}

2
spring-integration-http/src/main/java/org/springframework/integration/http/OutboundRequestMapper.java
View File

@@ -17,7 +17,7 @@
package org.springframework.integration.http;
import org.springframework.http.HttpEntity;
import org.springframework.integration.message.OutboundMessageMapper;
import org.springframework.integration.mapping.OutboundMessageMapper;
/**
* Strategy for mapping to an {@link HttpEntity} from a message.

2
spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/AbstractTcpSendingMessageHandler.java
View File

@@ -24,7 +24,7 @@ import org.springframework.integration.MessageDeliveryException;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.MessageRejectedException;
import org.springframework.integration.ip.AbstractInternetProtocolSendingMessageHandler;
import org.springframework.integration.message.MessageMappingException;
import org.springframework.integration.mapping.MessageMappingException;
/**
* Abstract class for TCP sending message handlers. Implementations

2
spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NetSocketReader.java
View File

@@ -26,7 +26,7 @@ import java.nio.ByteBuffer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.message.MessageMappingException;
import org.springframework.integration.mapping.MessageMappingException;
/**
* A SocketReader that reads from a {@link java.net.Socket}. Threads

2
spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/NioSocketReader.java
View File

@@ -24,7 +24,7 @@ import java.nio.channels.SocketChannel;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.message.MessageMappingException;
import org.springframework.integration.mapping.MessageMappingException;
/**
* A non-blocking SocketReader that reads from a {@link java.nio.channels.SocketChannel}.

2
spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGateway.java
View File

@@ -22,7 +22,7 @@ import java.util.concurrent.Executor;
import org.springframework.integration.Message;
import org.springframework.integration.gateway.AbstractMessagingGateway;
import org.springframework.integration.message.MessageMappingException;
import org.springframework.integration.mapping.MessageMappingException;
/**
* Simple implementation of a TCP/IP inbound gateway; uses {@link java.net.Socket}

2
spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketIoUtils.java
View File

@@ -21,7 +21,7 @@ import java.net.Socket;
import java.nio.channels.SocketChannel;
import org.springframework.beans.BeanUtils;
import org.springframework.integration.message.MessageMappingException;
import org.springframework.integration.mapping.MessageMappingException;
/**
* @author Gary Russell

4
spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketMessageMapper.java
View File

@@ -22,8 +22,8 @@ import org.springframework.integration.Message;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.ip.IpHeaders;
import org.springframework.integration.message.InboundMessageMapper;
import org.springframework.integration.message.OutboundMessageMapper;
import org.springframework.integration.mapping.InboundMessageMapper;
import org.springframework.integration.mapping.OutboundMessageMapper;
/**
* Maps incoming data from a {@link SocketReader} to a {@link Message} and from

2
spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandler.java
View File

@@ -32,7 +32,7 @@ import org.springframework.integration.ip.tcp.connection.AbstractConnectionFacto
import org.springframework.integration.ip.tcp.connection.ConnectionFactory;
import org.springframework.integration.ip.tcp.connection.TcpConnection;
import org.springframework.integration.ip.tcp.connection.TcpSender;
import org.springframework.integration.message.MessageMappingException;
import org.springframework.integration.mapping.MessageMappingException;
/**
* Tcp outbound channel adapter using a TcpConnection to

4
spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapper.java
View File

@@ -21,8 +21,8 @@ import org.springframework.integration.Message;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.ip.IpHeaders;
import org.springframework.integration.message.InboundMessageMapper;
import org.springframework.integration.message.OutboundMessageMapper;
import org.springframework.integration.mapping.InboundMessageMapper;
import org.springframework.integration.mapping.OutboundMessageMapper;
/**
* Maps incoming data from a {@link TcpConnection} to a {@link Message}.

2
spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/converter/ByteArrayStxEtxConverter.java
View File

@@ -20,7 +20,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import org.springframework.integration.message.MessageMappingException;
import org.springframework.integration.mapping.MessageMappingException;
/**
* Converts data in an InputStream to a byte[]; data is prefixed by <stx> and

6
spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java
View File

@@ -29,9 +29,9 @@ import org.springframework.integration.MessageHeaders;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.ip.IpHeaders;
import org.springframework.integration.ip.util.RegexUtils;
import org.springframework.integration.message.InboundMessageMapper;
import org.springframework.integration.message.MessageMappingException;
import org.springframework.integration.message.OutboundMessageMapper;
import org.springframework.integration.mapping.InboundMessageMapper;
import org.springframework.integration.mapping.MessageMappingException;
import org.springframework.integration.mapping.OutboundMessageMapper;
import org.springframework.util.Assert;
/**

2
spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapperTests.java
View File

@@ -30,7 +30,7 @@ import org.springframework.integration.Message;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.ip.IpHeaders;
import org.springframework.integration.ip.udp.DatagramPacketMessageMapper;
import org.springframework.integration.message.MessageMappingException;
import org.springframework.integration.mapping.MessageMappingException;
/**
* @author Gary Russell

2
spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationBackedMessageChannel.java
View File

@@ -33,7 +33,7 @@ import org.springframework.integration.dispatcher.MessageDispatcher;
import org.springframework.integration.dispatcher.RoundRobinLoadBalancingStrategy;
import org.springframework.integration.dispatcher.UnicastingDispatcher;
import org.springframework.integration.gateway.SimpleMessageMapper;
import org.springframework.integration.message.InboundMessageMapper;
import org.springframework.integration.mapping.InboundMessageMapper;
import org.springframework.jms.core.JmsTemplate;
import org.springframework.jms.listener.AbstractMessageListenerContainer;
import org.springframework.jms.support.converter.MessageConverter;

2
spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsHeaderMapper.java
View File

@@ -18,7 +18,7 @@ package org.springframework.integration.jms;
import javax.jms.Message;
import org.springframework.integration.message.HeaderMapper;
import org.springframework.integration.mapping.HeaderMapper;
/**
* Strategy interface for mapping integration Message headers to an outbound

2
spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExceptionHandlingSiConsumerTests.java
View File

@@ -27,7 +27,7 @@ import org.junit.Test;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.message.InboundMessageMapper;
import org.springframework.integration.mapping.InboundMessageMapper;
import org.springframework.jms.core.JmsTemplate;
import org.springframework.jms.core.MessageCreator;

2
spring-integration-jmx/src/main/java/org/springframework/integration/jmx/AttributePollingMessageSource.java
View File

@@ -24,7 +24,7 @@ import org.springframework.integration.Message;
import org.springframework.integration.MessagingException;
import org.springframework.integration.core.MessageSource;
import org.springframework.integration.gateway.SimpleMessageMapper;
import org.springframework.integration.message.InboundMessageMapper;
import org.springframework.integration.mapping.InboundMessageMapper;
import org.springframework.jmx.support.ObjectNameManager;
import org.springframework.util.Assert;

2
spring-integration-jmx/src/main/java/org/springframework/integration/jmx/DefaultNotificationMapper.java
View File

@@ -22,7 +22,7 @@ import javax.management.Notification;
import javax.management.ObjectName;
import org.springframework.integration.Message;
import org.springframework.integration.message.OutboundMessageMapper;
import org.springframework.integration.mapping.OutboundMessageMapper;
import org.springframework.util.Assert;
/**

2
spring-integration-jmx/src/main/java/org/springframework/integration/jmx/NotificationPublishingMessageHandler.java
View File

@@ -28,7 +28,7 @@ import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.ListableBeanFactory;
import org.springframework.integration.Message;
import org.springframework.integration.handler.AbstractMessageHandler;
import org.springframework.integration.message.OutboundMessageMapper;
import org.springframework.integration.mapping.OutboundMessageMapper;
import org.springframework.jmx.export.MBeanExporter;
import org.springframework.jmx.export.annotation.ManagedResource;
import org.springframework.jmx.export.notification.NotificationPublisher;

2
spring-integration-mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java
View File

@@ -24,7 +24,7 @@ import org.springframework.integration.Message;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.MessageHeaders;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.message.MessageMappingException;
import org.springframework.integration.mapping.MessageMappingException;
import org.springframework.mail.MailMessage;
import org.springframework.mail.SimpleMailMessage;
import org.springframework.mail.javamail.JavaMailSender;

2
spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java
View File

@@ -33,7 +33,7 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.integration.core.GenericMessage;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.message.MessageMappingException;
import org.springframework.integration.mapping.MessageMappingException;
import org.springframework.mail.SimpleMailMessage;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

6
spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppPresenceMessageMapper.java
View File

@@ -23,15 +23,15 @@ import org.jivesoftware.smack.packet.Presence;
import org.springframework.integration.Message;
import org.springframework.integration.MessageHeaders;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.message.InboundMessageMapper;
import org.springframework.integration.message.OutboundMessageMapper;
import org.springframework.integration.mapping.InboundMessageMapper;
import org.springframework.integration.mapping.OutboundMessageMapper;
import org.springframework.integration.xmpp.XmppHeaders;
import org.springframework.util.StringUtils;
/**
* Implementation of the strategy interface {@link org.springframework.integration.message.OutboundMessageMapper}. This is the hook that lets the adapter receive various payloads from
* Implementation of the strategy interface {@link org.springframework.integration.mapping.OutboundMessageMapper}. This is the hook that lets the adapter receive various payloads from
* components inside Spring Integration and forward them correctly as {@link org.jivesoftware.smack.packet.Presence} instances.
*
* @author Josh Long

2
spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpoint.java
View File

@@ -31,7 +31,7 @@ import org.springframework.integration.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.integration.endpoint.AbstractEndpoint;
import org.springframework.integration.message.InboundMessageMapper;
import org.springframework.integration.mapping.InboundMessageMapper;
import java.util.Collection;

2
spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageSendingHandler.java
View File

@@ -10,7 +10,7 @@ import org.springframework.integration.MessageDeliveryException;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.MessageRejectedException;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.message.OutboundMessageMapper;
import org.springframework.integration.mapping.OutboundMessageMapper;
/**
* This class will facilitate publishing updated presence values for a given connection. This change happens on the

2
spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java
View File

@@ -32,7 +32,7 @@ import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.integration.message.*;
import org.springframework.integration.mapping.*;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

2
spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventProducer.java
View File

@@ -23,7 +23,7 @@ import org.jivesoftware.smack.packet.Presence;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.core.MessageSource;
import org.springframework.integration.message.*;
import org.springframework.integration.mapping.*;
import org.springframework.integration.xmpp.XmppHeaders;
/**