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

INT-1257, INT-1263 Moved MessageHistory, TrackableComponent, and MessageHistoryBeanPostProcessor to 'history' package.

Browse Source
This commit is contained in:
Mark Fisher
2010-08-25 20:56:50 +00:00
parent 9ed99eb10c
commit 0dc095a815
17 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java
View File

@@ -29,11 +29,11 @@ import org.springframework.core.convert.ConversionService;
import org.springframework.integration.Message;
import org.springframework.integration.MessageDeliveryException;
import org.springframework.integration.MessagingException;
import org.springframework.integration.context.TrackableComponent;
import org.springframework.integration.context.IntegrationObjectSupport;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageHistory;
import org.springframework.integration.history.MessageHistory;
import org.springframework.integration.history.TrackableComponent;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;

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

@@ -30,7 +30,7 @@ import org.springframework.beans.factory.xml.ParserContext;
*/
public class MessageHistoryParser extends AbstractSimpleBeanDefinitionParser {
private static final String POST_PROCESSOR_CLASSNAME = "org.springframework.integration.context.MessageHistoryBeanPostProcessor";
private static final String POST_PROCESSOR_CLASSNAME = "org.springframework.integration.history.MessageHistoryBeanPostProcessor";
@Override

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

@@ -18,9 +18,9 @@ package org.springframework.integration.endpoint;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageHistory;
import org.springframework.integration.core.MessageProducer;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.integration.history.MessageHistory;
import org.springframework.util.Assert;
/**

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

@@ -37,12 +37,12 @@ import org.springframework.expression.Expression;
import org.springframework.integration.Message;
import org.springframework.integration.annotation.Gateway;
import org.springframework.integration.context.BeanFactoryChannelResolver;
import org.springframework.integration.context.TrackableComponent;
import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.core.ChannelResolver;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.endpoint.AbstractEndpoint;
import org.springframework.integration.handler.ArgumentArrayMessageMapper;
import org.springframework.integration.history.TrackableComponent;
import org.springframework.integration.mapping.InboundMessageMapper;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;

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.context.TrackableComponent;
import org.springframework.integration.core.MessageHistory;
import org.springframework.integration.history.MessageHistory;
import org.springframework.integration.history.TrackableComponent;
import org.springframework.integration.mapping.InboundMessageMapper;
import org.springframework.integration.mapping.OutboundMessageMapper;
import org.springframework.util.Assert;

4
spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java
View File

@@ -23,10 +23,10 @@ import org.springframework.core.Ordered;
import org.springframework.integration.Message;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.MessagingException;
import org.springframework.integration.context.TrackableComponent;
import org.springframework.integration.context.IntegrationObjectSupport;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.core.MessageHistory;
import org.springframework.integration.history.MessageHistory;
import org.springframework.integration.history.TrackableComponent;
import org.springframework.util.Assert;
/**

3
spring-integration-core/src/main/java/org/springframework/integration/core/MessageHistory.java → spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.core;
package org.springframework.integration.history;
import java.util.ArrayList;
import java.util.Collection;
@@ -27,6 +27,7 @@ import java.util.Properties;
import org.springframework.integration.Message;
import org.springframework.integration.MessageHeaders;
import org.springframework.integration.context.NamedComponent;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.util.Assert;
/**

2
spring-integration-core/src/main/java/org/springframework/integration/context/MessageHistoryBeanPostProcessor.java → spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistoryBeanPostProcessor.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.context;
package org.springframework.integration.history;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanPostProcessor;

4
spring-integration-core/src/main/java/org/springframework/integration/context/TrackableComponent.java → spring-integration-core/src/main/java/org/springframework/integration/history/TrackableComponent.java
View File

@@ -14,7 +14,9 @@
* limitations under the License.
*/
package org.springframework.integration.context;
package org.springframework.integration.history;
import org.springframework.integration.context.NamedComponent;
/**
* @author Mark Fisher

1
spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java
View File

@@ -40,7 +40,6 @@ import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.config.ConsumerEndpointFactoryBean;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.core.MessageHistory;
/**
* @author Oleg Zhurakousky

3
spring-integration-core/src/test/java/org/springframework/integration/history/messageHistoryWithHistoryWriter.xml
View File

@@ -30,5 +30,6 @@
<int:channel id="endOfThePipeChannel"/>
<bean class="org.springframework.integration.context.MessageHistoryBeanPostProcessor"/>
<bean class="org.springframework.integration.history.MessageHistoryBeanPostProcessor"/>
</beans>

1
spring-integration-core/src/test/java/org/springframework/integration/history/messageHistoryWithHistoryWriterNamespace.xml
View File

@@ -31,4 +31,5 @@
<int:channel id="endOfThePipeChannel"/>
<int:message-history/>
</beans>

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

@@ -28,8 +28,8 @@ import javax.jms.Session;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.core.MessageHistory;
import org.springframework.integration.gateway.AbstractMessagingGateway;
import org.springframework.integration.history.MessageHistory;
import org.springframework.jms.listener.SessionAwareMessageListener;
import org.springframework.jms.support.converter.MessageConverter;
import org.springframework.jms.support.destination.DestinationResolver;

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

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

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

@@ -21,7 +21,7 @@ import javax.jms.JMSException;
import org.springframework.core.Ordered;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.core.MessageHistory;
import org.springframework.integration.history.MessageHistory;
import org.springframework.jms.core.JmsTemplate;
import org.springframework.jms.core.MessagePostProcessor;

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

@@ -38,10 +38,10 @@ import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.context.NamedComponent;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.core.MessageHistory;
import org.springframework.integration.core.PollableChannel;
import org.springframework.integration.core.StringMessage;
import org.springframework.integration.core.SubscribableChannel;
import org.springframework.integration.history.MessageHistory;
import org.springframework.integration.jms.DefaultJmsHeaderMapper;
/**

2
spring-integration-jms/src/test/java/org/springframework/integration/jms/config/MessageHistoryTests-context.xml
View File

@@ -40,6 +40,6 @@
<property name="cacheProducers" value="false"/>
</bean>
<bean class="org.springframework.integration.context.MessageHistoryBeanPostProcessor"/>
<bean class="org.springframework.integration.history.MessageHistoryBeanPostProcessor"/>
</beans>