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

INT-1129 moved MessageSource interface to 'core' package

Browse Source
This commit is contained in:
Mark Fisher
2010-07-28 15:16:15 +00:00
parent 81a91380a9
commit c69c29d2e1
19 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageBarrier.java
View File

@@ -19,8 +19,8 @@ import java.util.concurrent.ConcurrentMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageSource;
import org.springframework.integration.handler.AbstractMessageHandler;
import org.springframework.integration.message.MessageSource;
import org.springframework.integration.store.MessageGroup;
import org.springframework.integration.store.MessageGroupStore;
import org.springframework.integration.store.SimpleMessageStore;

2
spring-integration-core/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java
View File

@@ -26,8 +26,8 @@ import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.context.SmartLifecycle;
import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageSource;
import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
import org.springframework.integration.message.MessageSource;
import org.springframework.integration.scheduling.PollerMetadata;
import org.springframework.util.Assert;

4
spring-integration-core/src/main/java/org/springframework/integration/message/MessageSource.java → spring-integration-core/src/main/java/org/springframework/integration/core/MessageSource.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2008 the original author or authors.
* Copyright 2002-2010 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.message;
package org.springframework.integration.core;
import org.springframework.integration.Message;

2
spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java
View File

@@ -18,8 +18,8 @@ package org.springframework.integration.endpoint;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageSource;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.integration.message.MessageSource;
import org.springframework.util.Assert;
/**

1
spring-integration-core/src/main/java/org/springframework/integration/message/MethodInvokingMessageSource.java
View File

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.InitializingBean;
import org.springframework.integration.Message;
import org.springframework.integration.MessagingException;
import org.springframework.integration.core.GenericMessage;
import org.springframework.integration.core.MessageSource;
import org.springframework.integration.util.DefaultMethodInvoker;
import org.springframework.integration.util.MethodInvoker;
import org.springframework.integration.util.MethodValidator;

2
spring-integration-core/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java
View File

@@ -34,12 +34,12 @@ import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.core.ErrorMessage;
import org.springframework.integration.core.GenericMessage;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.core.MessageSource;
import org.springframework.integration.core.PollableChannel;
import org.springframework.integration.endpoint.EventDrivenConsumer;
import org.springframework.integration.endpoint.PollingConsumer;
import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
import org.springframework.integration.message.MessageSource;
import org.springframework.integration.message.StringMessage;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.integration.test.util.TestUtils.TestApplicationContext;

2
spring-integration-core/src/test/java/org/springframework/integration/channel/config/TestSource.java
View File

@@ -17,7 +17,7 @@
package org.springframework.integration.channel.config;
import org.springframework.integration.Message;
import org.springframework.integration.message.MessageSource;
import org.springframework.integration.core.MessageSource;
import org.springframework.integration.message.StringMessage;
/**

2
spring-integration-core/src/test/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java
View File

@@ -29,7 +29,7 @@ import org.aopalliance.intercept.MethodInvocation;
import org.junit.Test;
import org.springframework.integration.Message;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.message.MessageSource;
import org.springframework.integration.core.MessageSource;
import org.springframework.integration.message.StringMessage;
import org.springframework.integration.scheduling.PollerMetadata;
import org.springframework.integration.test.util.TestUtils;

2
spring-integration-core/src/test/java/org/springframework/integration/config/TestSource.java
View File

@@ -17,7 +17,7 @@
package org.springframework.integration.config;
import org.springframework.integration.Message;
import org.springframework.integration.message.MessageSource;
import org.springframework.integration.core.MessageSource;
import org.springframework.integration.message.StringMessage;
/**

2
spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java
View File

@@ -23,7 +23,7 @@ import org.springframework.integration.Message;
import org.springframework.integration.MessagingException;
import org.springframework.integration.aggregator.ResequencingMessageGroupProcessor;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.message.MessageSource;
import org.springframework.integration.core.MessageSource;
import org.springframework.util.Assert;
import java.io.File;

2
spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapter.java
View File

@@ -26,7 +26,7 @@ import javax.sql.DataSource;
import org.springframework.dao.DataAccessException;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.message.MessageSource;
import org.springframework.integration.core.MessageSource;
import org.springframework.jdbc.core.ColumnMapRowMapper;
import org.springframework.jdbc.core.JdbcOperations;
import org.springframework.jdbc.core.ResultSetExtractor;

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

@@ -24,7 +24,7 @@ import javax.jms.Destination;
import org.springframework.integration.Message;
import org.springframework.integration.MessagingException;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.message.MessageSource;
import org.springframework.integration.core.MessageSource;
import org.springframework.jms.core.JmsTemplate;
import org.springframework.jms.support.converter.MessageConverter;

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

@@ -22,9 +22,9 @@ import javax.management.ObjectName;
import org.springframework.integration.Message;
import org.springframework.integration.MessagingException;
import org.springframework.integration.core.MessageSource;
import org.springframework.integration.gateway.SimpleMessageMapper;
import org.springframework.integration.message.InboundMessageMapper;
import org.springframework.integration.message.MessageSource;
import org.springframework.jmx.support.ObjectNameManager;
import org.springframework.util.Assert;

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

@@ -26,7 +26,7 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.integration.Message;
import org.springframework.integration.MessagingException;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.message.MessageSource;
import org.springframework.integration.core.MessageSource;
import org.springframework.util.Assert;
/**

2
spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamReadingMessageSource.java
View File

@@ -23,7 +23,7 @@ import java.io.InputStream;
import org.springframework.integration.Message;
import org.springframework.integration.MessagingException;
import org.springframework.integration.core.GenericMessage;
import org.springframework.integration.message.MessageSource;
import org.springframework.integration.core.MessageSource;
/**
* A pollable source for receiving bytes from an {@link InputStream}.

2
spring-integration-stream/src/main/java/org/springframework/integration/stream/CharacterStreamReadingMessageSource.java
View File

@@ -23,7 +23,7 @@ import java.io.Reader;
import java.io.UnsupportedEncodingException;
import org.springframework.integration.MessagingException;
import org.springframework.integration.message.MessageSource;
import org.springframework.integration.core.MessageSource;
import org.springframework.integration.message.StringMessage;
import org.springframework.util.Assert;

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

@@ -33,8 +33,8 @@ import org.springframework.beans.DirectFieldAccessor;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageSource;
import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
import org.springframework.integration.message.MessageSource;
/**
* @author Mark Fisher

2
spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppMessageProducer.java
View File

@@ -20,7 +20,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.message.MessageSource;
import org.springframework.integration.core.MessageSource;
import org.springframework.integration.xmpp.XmppHeaders;
import java.util.Date;

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

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