diff --git a/spring-batch-admin-parent/pom.xml b/spring-batch-admin-parent/pom.xml index eaeff001f..9e4ac42d8 100644 --- a/spring-batch-admin-parent/pom.xml +++ b/spring-batch-admin-parent/pom.xml @@ -10,7 +10,7 @@ true 2.1.1.RELEASE 3.0.3.RELEASE - 1.0.3.RELEASE + 2.0.0.BUILD-SNAPSHOT diff --git a/spring-batch-integration/.settings/com.springsource.sts.config.flow.prefs b/spring-batch-integration/.settings/com.springsource.sts.config.flow.prefs index dcb9d94c3..9a2e6c199 100644 --- a/spring-batch-integration/.settings/com.springsource.sts.config.flow.prefs +++ b/spring-batch-integration/.settings/com.springsource.sts.config.flow.prefs @@ -1,10 +1,10 @@ -#Fri May 14 17:06:42 BST 2010 +#Fri Jul 30 14:07:10 BST 2010 //com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/ChunkStepIntegrationTests-context.xml=\n\n\n\n\n\n\n\n\n\n //com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepIntegrationTests-context.xml=\n\n\n\n\n\n -//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests-context.xml=\r\n\r\n\r\n\r\n\r\n\r\n -//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkStepIntegrationTests-context.xml=\n\n\n\n\n\n +//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests-context.xml=\n\n\n\n\n\n +//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkStepIntegrationTests-context.xml=\n\n\n\n\n\n //com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-integration/src/test/resources/org/springframework/batch/integration/file/FileToMessagesJobIntegrationTests-context.xml=\r\n\r\n\r\n\r\n\r\n\r\n -//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/VanillaIntegrationTests-context.xml=\n\n\n\n\n\n\n\n\n\n +//com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/VanillaIntegrationTests-context.xml=\n\n\n\n\n\n\n\n\n\n //com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-integration/src/test/resources/org/springframework/batch/integration/step/StepGatewayIntegrationTests-context.xml=\n\n\n\n\n\n\n\n\n\n //com.springsource.sts.config.flow.coordinates\:http\://www.springframework.org/schema/batch\:/spring-batch-integration/src/test/resources/org/springframework/batch/integration/tasklet/StepGatewayIntegrationTests-context.xml=\n\n\n\n\n\n\n\n\n\n eclipse.preferences.version=1 diff --git a/spring-batch-integration/pom.xml b/spring-batch-integration/pom.xml index 7f3dea682..530602ef0 100644 --- a/spring-batch-integration/pom.xml +++ b/spring-batch-integration/pom.xml @@ -75,12 +75,6 @@ ${spring.integration.version} test - - org.springframework.integration - spring-integration-adapter - ${spring.integration.version} - compile - org.springframework spring-context diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java index aee497eb4..57ad56348 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java @@ -34,7 +34,10 @@ import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemStream; import org.springframework.batch.item.ItemStreamException; import org.springframework.batch.item.ItemWriter; -import org.springframework.integration.gateway.MessagingGateway; +import org.springframework.integration.Message; +import org.springframework.integration.core.GenericMessage; +import org.springframework.integration.core.MessagingOperations; +import org.springframework.integration.core.PollableChannel; import org.springframework.util.Assert; public class ChunkMessageChannelItemWriter extends StepExecutionListenerSupport implements ItemWriter, @@ -48,7 +51,7 @@ public class ChunkMessageChannelItemWriter extends StepExecutionListenerSuppo private static final long DEFAULT_THROTTLE_LIMIT = 6; - private MessagingGateway messagingGateway; + private MessagingOperations messagingGateway; private LocalState localState = new LocalState(); @@ -58,6 +61,8 @@ public class ChunkMessageChannelItemWriter extends StepExecutionListenerSuppo private int maxWaitTimeouts = DEFAULT_MAX_WAIT_TIMEOUTS; + private PollableChannel replyChannel; + /** * The maximum number of times to wait at the end of a step for a non-null result from the remote workers. This is a * multiplier on the receive timeout set separately on the gateway. The ideal value is a compromise between allowing @@ -78,10 +83,14 @@ public class ChunkMessageChannelItemWriter extends StepExecutionListenerSuppo this.throttleLimit = throttleLimit; } - public void setMessagingGateway(MessagingGateway messagingGateway) { + public void setMessagingOperations(MessagingOperations messagingGateway) { this.messagingGateway = messagingGateway; } + public void setReplyChannel(PollableChannel replyChannel) { + this.replyChannel = replyChannel; + } + public void write(List items) throws Exception { // Block until expecting <= throttle limit @@ -94,7 +103,7 @@ public class ChunkMessageChannelItemWriter extends StepExecutionListenerSuppo logger.debug("Dispatching chunk: " + items); ChunkRequest request = new ChunkRequest(items, localState.getJobId(), localState .createStepContribution()); - messagingGateway.send(request); + messagingGateway.send(new GenericMessage>(request)); localState.incrementExpected(); } @@ -192,8 +201,9 @@ public class ChunkMessageChannelItemWriter extends StepExecutionListenerSuppo * and we shouldn't be) */ private void getNextResult() throws AsynchronousFailureException { - ChunkResponse payload = (ChunkResponse) messagingGateway.receive(); - if (payload != null) { + Message message = messagingGateway.receive(replyChannel); + if (message != null) { + ChunkResponse payload = message.getPayload(); if (logger.isDebugEnabled()) { logger.debug("Found result: " + payload); } diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/JmsRedeliveredExtractor.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/JmsRedeliveredExtractor.java index c2bc0ee29..40ed26245 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/JmsRedeliveredExtractor.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/JmsRedeliveredExtractor.java @@ -18,6 +18,7 @@ package org.springframework.batch.integration.chunk; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.integration.annotation.Header; +import org.springframework.integration.jms.JmsHeaders; /** * @author Dave Syer @@ -27,7 +28,7 @@ public class JmsRedeliveredExtractor { private static final Log logger = LogFactory.getLog(JmsRedeliveredExtractor.class); - public ChunkResponse extract(ChunkResponse input, @Header("springintegration_jms_redelivered") boolean redelivered) { + public ChunkResponse extract(ChunkResponse input, @Header(JmsHeaders.REDELIVERED) boolean redelivered) { logger.debug("Extracted redelivered flag for response, value="+redelivered); return new ChunkResponse(input, redelivered); } diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/MessageSourcePollerInterceptor.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/MessageSourcePollerInterceptor.java index 5847e0370..bed03939e 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/MessageSourcePollerInterceptor.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/MessageSourcePollerInterceptor.java @@ -3,13 +3,14 @@ package org.springframework.batch.integration.chunk; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; +import org.springframework.integration.Message; import org.springframework.integration.channel.ChannelInterceptor; import org.springframework.integration.channel.interceptor.ChannelInterceptorAdapter; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; -import org.springframework.integration.message.MessageSource; +import org.springframework.integration.core.MessageSource; import org.springframework.util.Assert; + /** * A {@link ChannelInterceptor} that turns a pollable channel into a "pass-thru channel": if a client calls * receive() on the channel it will delegate to a {@link MessageSource} to pull the message directly from diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java index b5ce67a11..2bf87e8c3 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java @@ -9,12 +9,13 @@ import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.partition.PartitionHandler; import org.springframework.batch.core.partition.StepExecutionSplitter; import org.springframework.batch.core.repository.JobRepository; +import org.springframework.integration.Message; import org.springframework.integration.annotation.Aggregator; import org.springframework.integration.annotation.MessageEndpoint; -import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; -import org.springframework.integration.gateway.MessagingGateway; -import org.springframework.integration.message.MessageBuilder; +import org.springframework.integration.core.MessagingOperations; +import org.springframework.integration.core.PollableChannel; import org.springframework.util.Assert; /** @@ -38,13 +39,15 @@ public class MessageChannelPartitionHandler implements PartitionHandler { private int gridSize = 1; - private MessagingGateway messagingGateway; + private MessagingOperations messagingGateway; private String stepName; + private PollableChannel replyChannel; + public void afterPropertiesSet() throws Exception { Assert.notNull(stepName, "A step name must be provided for the remote workers."); - Assert.state(messagingGateway != null, "The MessagingGateway must be set"); + Assert.state(messagingGateway != null, "The MessagingOperations must be set"); } /** @@ -60,12 +63,16 @@ public class MessageChannelPartitionHandler implements PartitionHandler { * The timeout for the repoy should be set sufficiently long that the remote * steps have time to complete. * - * @param messagingGateway the {@link MessagingGateway} to set + * @param messagingGateway the {@link MessagingOperations} to set */ - public void setMessagingGateway(MessagingGateway messagingGateway) { + public void setMessagingOperations(MessagingOperations messagingGateway) { this.messagingGateway = messagingGateway; } + public void setReplyChannel(PollableChannel replyChannel) { + this.replyChannel = replyChannel; + } + /** * Passed to the {@link StepExecutionSplitter} in the * {@link #handle(StepExecutionSplitter, StepExecution)} method, instructing @@ -97,18 +104,18 @@ public class MessageChannelPartitionHandler implements PartitionHandler { * @param messages the messages to be aggregated * @return the list as it was passed in */ - @Aggregator(sendPartialResultsOnTimeout = true) + @Aggregator(sendPartialResultsOnExpiry = true) public List aggregate(List messages) { return messages; } /** * Sends {@link StepExecutionRequest} objects to the request channel of the - * {@link MessagingGateway}, and then receives the result back as a list of + * {@link MessagingOperations}, and then receives the result back as a list of * {@link StepExecution} on a reply channel. Use the * {@link #aggregate(List)} method as an aggregator of the individual remote * replies. The receive timeout needs to be set realistically in the - * {@link MessagingGateway} and the aggregator, so that there is a + * {@link MessagingOperations} and the aggregator, so that there is a * good chance of all work being done. * * @see PartitionHandler#handle(StepExecutionSplitter, StepExecution) @@ -123,8 +130,8 @@ public class MessageChannelPartitionHandler implements PartitionHandler { .getJobExecutionId(), stepExecution.getId()))); } - @SuppressWarnings("unchecked") - Collection result = (Collection) messagingGateway.receive(); + Message> message = messagingGateway.receive(replyChannel); + Collection result = message.getPayload(); return result; } diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/SmokeTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/SmokeTests.java index df2a38b4f..1d752e01c 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/SmokeTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/SmokeTests.java @@ -6,13 +6,12 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.integration.Message; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; -import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.core.Message; +import org.springframework.integration.core.GenericMessage; import org.springframework.integration.core.MessageChannel; -import org.springframework.integration.message.GenericMessage; +import org.springframework.integration.core.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -22,14 +21,12 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; public class SmokeTests { @Autowired - @Qualifier("smokein") private MessageChannel smokein; @Autowired - @Qualifier("smokeout") private PollableChannel smokeout; - // This has to be static because the MessageBus registers the handler + // This has to be static because Spring Integration registers the handler // more than once (every time a test instance is created), but only one of // them will get the message. private volatile static int count = 0; diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java index ac56036ba..08d9ae397 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java @@ -33,11 +33,11 @@ import org.springframework.batch.item.support.ListItemReader; import org.springframework.batch.support.transaction.ResourcelessTransactionManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; +import org.springframework.integration.core.GenericMessage; import org.springframework.integration.core.MessageChannel; -import org.springframework.integration.gateway.SimpleMessagingGateway; -import org.springframework.integration.message.GenericMessage; +import org.springframework.integration.core.MessagingTemplate; +import org.springframework.integration.core.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.StringUtils; @@ -73,12 +73,12 @@ public class ChunkMessageItemWriterIntegrationTests { factory.setItemWriter(writer); factory.setCommitInterval(4); - SimpleMessagingGateway gateway = new SimpleMessagingGateway(); - writer.setMessagingGateway(gateway); + MessagingTemplate gateway = new MessagingTemplate(); + writer.setMessagingOperations(gateway); - gateway.setRequestChannel(requests); - gateway.setReplyChannel(replies); - gateway.setReplyTimeout(100); + gateway.setDefaultChannel(requests); + writer.setReplyChannel(replies); + gateway.setReceiveTimeout(100); TestItemWriter.count = 0; diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/MessageSourcePollerInterceptorTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/MessageSourcePollerInterceptorTests.java index a7cecf92d..47a4fb06a 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/MessageSourcePollerInterceptorTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/MessageSourcePollerInterceptorTests.java @@ -4,10 +4,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; -import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.MessageSource; +import org.springframework.integration.core.GenericMessage; +import org.springframework.integration.core.MessageSource; public class MessageSourcePollerInterceptorTests { diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests.java index 4940e75d3..4f2172301 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests.java @@ -2,8 +2,10 @@ package org.springframework.batch.integration.chunk; import static org.junit.Assert.assertEquals; +import java.io.File; import java.util.Collections; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.batch.core.BatchStatus; @@ -17,10 +19,16 @@ import org.springframework.batch.core.launch.JobLauncher; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.util.FileSystemUtils; @ContextConfiguration @RunWith(SpringJUnit4ClassRunner.class) public class RemoteChunkFaultTolerantStepJmsIntegrationTests { + + @BeforeClass + public static void clear() { + FileSystemUtils.deleteRecursively(new File("activemq-data")); + } @Autowired private JobLauncher jobLauncher; diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/FileToMessagesJobIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/FileToMessagesJobIntegrationTests.java index 6e339b967..0b87f3140 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/FileToMessagesJobIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/FileToMessagesJobIntegrationTests.java @@ -27,12 +27,9 @@ import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.core.launch.JobLauncher; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.channel.SubscribableChannel; -import org.springframework.integration.core.Message; -import org.springframework.integration.message.MessageDeliveryException; -import org.springframework.integration.message.MessageHandler; -import org.springframework.integration.message.MessageHandlingException; -import org.springframework.integration.message.MessageRejectedException; +import org.springframework.integration.Message; +import org.springframework.integration.core.MessageHandler; +import org.springframework.integration.core.SubscribableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -56,8 +53,7 @@ public class FileToMessagesJobIntegrationTests implements MessageHandler { int count = 0; - public void handleMessage(Message message) throws MessageRejectedException, MessageHandlingException, - MessageDeliveryException { + public void handleMessage(Message message) { count++; } diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests.java index cce974b37..6e8cd1401 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests.java @@ -25,12 +25,12 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.io.Resource; +import org.springframework.integration.Message; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.Splitter; -import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.core.Message; +import org.springframework.integration.core.GenericMessage; import org.springframework.integration.core.MessageChannel; -import org.springframework.integration.message.GenericMessage; +import org.springframework.integration.core.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests.java index a33389006..57e1e8a02 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests.java @@ -16,12 +16,12 @@ import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.integration.JobSupport; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; +import org.springframework.integration.MessagingException; +import org.springframework.integration.core.GenericMessage; import org.springframework.integration.core.MessageChannel; -import org.springframework.integration.core.MessageHeaders; -import org.springframework.integration.core.MessagingException; -import org.springframework.integration.message.GenericMessage; +import org.springframework.integration.core.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests-context.xml index b8fb0a312..8a9a945fa 100644 --- a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests-context.xml +++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests-context.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/integration - http://www.springframework.org/schema/integration/spring-integration-1.0.xsd + http://www.springframework.org/schema/integration/spring-integration-2.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd http://www.springframework.org/schema/tx diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepIntegrationTests-context.xml index b9f0184cb..be52ff722 100644 --- a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepIntegrationTests-context.xml +++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepIntegrationTests-context.xml @@ -5,8 +5,8 @@ xmlns:aop="http://www.springframework.org/schema/aop" xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms-3.0.xsd - http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd - http://www.springframework.org/schema/integration/jms http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd + http://www.springframework.org/schema/integration/jms http://www.springframework.org/schema/integration/jms/spring-integration-jms-2.0.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> @@ -42,18 +42,28 @@ - + + - - - - + + + + + + + + + + + + + - + diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests-context.xml index 233291203..f36ba1d1d 100644 --- a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests-context.xml +++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests-context.xml @@ -5,8 +5,8 @@ xmlns:jms="http://www.springframework.org/schema/jms" xmlns:aop="http://www.springframework.org/schema/aop" xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms-3.0.xsd - http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd - http://www.springframework.org/schema/integration/jms http://www.springframework.org/schema/integration/jms/spring-integration-jms-1.0.xsd + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd + http://www.springframework.org/schema/integration/jms http://www.springframework.org/schema/integration/jms/spring-integration-jms-2.0.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> @@ -44,25 +44,38 @@ - + + - - - - + + + - - - - - + + + + + + + + + + + + + + + + + @@ -76,29 +89,29 @@ - + - + - - - + + + - - - - + + + + - + - - - + + + - - - + + + \ No newline at end of file diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkStepIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkStepIntegrationTests-context.xml index 7eb5d9d60..99f9c539d 100644 --- a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkStepIntegrationTests-context.xml +++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkStepIntegrationTests-context.xml @@ -1,10 +1,9 @@ - - - - - + - - + + + + - - + + + + diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests-context.xml index 60535b6aa..e088c1c28 100644 --- a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests-context.xml +++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests-context.xml @@ -9,7 +9,7 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd http://www.springframework.org/schema/integration - http://www.springframework.org/schema/integration/spring-integration-1.0.xsd + http://www.springframework.org/schema/integration/spring-integration-2.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd"> diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/VanillaIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/VanillaIntegrationTests-context.xml index 37fa460b4..2cb14174c 100644 --- a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/VanillaIntegrationTests-context.xml +++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/partition/VanillaIntegrationTests-context.xml @@ -43,13 +43,13 @@ - - - - - + + + + +