BATCHADM-155: Updated to support Spring Batch 2.2.0

spring-batch-admin-parent/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.batch</groupId>
 	<artifactId>spring-batch-admin-parent</artifactId>
-	<version>1.2.2.BUILD-SNAPSHOT</version>
+	<version>1.3.0.BUILD-SNAPSHOT</version>
 	<name>Spring Batch Admin Parent</name>
 	<description>A set of services (Java, JSON) and a UI (webapp) for managing and launching Spring Batch jobs.</description>
 	<url>http://www.springsource.org/spring-batch-admin</url>
@@ -25,12 +25,18 @@
 			<name>Dave Syer</name>
 			<email>dsyer@vmware.com</email>
 		</developer>
+		<developer>
+			<id>mminella</id>
+			<name>Michael Minella</name>
+			<email>mminella@vmware.com</email>
+		</developer>
 	</developers>
 	<properties>
-		<maven.test.failure.ignore>true</maven.test.failure.ignore>
-		<spring.batch.version>2.1.7.RELEASE</spring.batch.version>
-		<spring.framework.version>3.0.5.RELEASE</spring.framework.version>
-		<spring.integration.version>2.0.3.RELEASE</spring.integration.version>
+		<maven.test.failure.ignore>false</maven.test.failure.ignore>
+		<spring.batch.version>2.2.0.RC1</spring.batch.version>
+		<spring.framework.version>3.2.1.RELEASE</spring.framework.version>
+		<spring.integration.version>2.2.3.RELEASE</spring.integration.version>
+		<spring.retry.version>1.0.2.RELEASE</spring.retry.version>
 	</properties>
 	<profiles>
 		<profile>
@@ -163,7 +169,7 @@
 	<build>
 		<pluginManagement>
 			<plugins>
-				<!--This plugin's configuration is used to store Eclipse m2e settings 
+				<!--This plugin's configuration is used to store Eclipse m2e settings
 					only. It has no influence on the Maven build itself. -->
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
@@ -268,8 +274,8 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
+					<source>1.6</source>
+					<target>1.6</target>
 				</configuration>
 			</plugin>
 			<plugin>

spring-batch-integration/pom.xml

@@ -7,22 +7,25 @@
 	<parent>
 		<groupId>org.springframework.batch</groupId>
 		<artifactId>spring-batch-admin-parent</artifactId>
-		<version>1.2.2.BUILD-SNAPSHOT</version>
+		<version>1.3.0.BUILD-SNAPSHOT</version>
 		<relativePath>../spring-batch-admin-parent</relativePath>
 	</parent>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.batch</groupId>
 			<artifactId>spring-batch-core</artifactId>
-			<version>${spring.batch.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.batch</groupId>
 			<artifactId>spring-batch-test</artifactId>
-			<version>${spring.batch.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.retry</groupId>
+			<artifactId>spring-retry</artifactId>
+			<version>${spring.retry.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-jms_1.1_spec</artifactId>
@@ -103,7 +106,6 @@
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-core</artifactId>
-			<version>${spring.integration.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -115,7 +117,6 @@
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-jms</artifactId>
-			<version>${spring.integration.version}</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>

spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkProcessorChunkHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2007 the original author or authors.
+ * Copyright 2006-2013 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.
@@ -26,19 +26,20 @@ import org.springframework.batch.core.step.item.FaultTolerantChunkProcessor;
 import org.springframework.batch.core.step.skip.NonSkippableReadException;
 import org.springframework.batch.core.step.skip.SkipLimitExceededException;
 import org.springframework.batch.core.step.skip.SkipListenerFailedException;
-import org.springframework.batch.retry.RetryException;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.integration.annotation.MessageEndpoint;
 import org.springframework.integration.annotation.ServiceActivator;
+import org.springframework.retry.RetryException;
 import org.springframework.util.Assert;
 
 /**
  * A {@link ChunkHandler} based on a {@link ChunkProcessor}. Knows how to distinguish between a processor that is fault
  * tolerant, and one that is not. If the processor is fault tolerant then exceptions can be propagated on the assumption
  * that there will be a roll back and the request will be re-delivered.
- * 
+ *
  * @author Dave Syer
- * 
+ * @author Michael Minella
+ *
  * @param <S> the type of the items in the chunk to be handled
  */
 @MessageEndpoint
@@ -50,7 +51,7 @@ public class ChunkProcessorChunkHandler<S> implements ChunkHandler<S>, Initializ
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
 	 */
 	public void afterPropertiesSet() throws Exception {
@@ -59,7 +60,7 @@ public class ChunkProcessorChunkHandler<S> implements ChunkHandler<S>, Initializ
 
 	/**
 	 * Public setter for the {@link ChunkProcessor}.
-	 * 
+	 *
 	 * @param chunkProcessor the chunkProcessor to set
 	 */
 	public void setChunkProcessor(ChunkProcessor<S> chunkProcessor) {
@@ -67,7 +68,7 @@ public class ChunkProcessorChunkHandler<S> implements ChunkHandler<S>, Initializ
 	}
 
 	/**
-	 * 
+	 *
 	 * @see ChunkHandler#handleChunk(ChunkRequest)
 	 */
 	@ServiceActivator

spring-batch-integration/src/test/java/org/springframework/batch/integration/JobRepositorySupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2007 the original author or authors.
+ * Copyright 2006-2013 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.
@@ -15,6 +15,8 @@
  */
 package org.springframework.batch.integration;
 
+import java.util.Collection;
+
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobInstance;
 import org.springframework.batch.core.JobParameters;
@@ -35,7 +37,7 @@ public class JobRepositorySupport implements JobRepository {
 	 */
 	public JobExecution createJobExecution(String jobName, JobParameters jobParameters)
 			throws JobExecutionAlreadyRunningException, JobRestartException, JobInstanceAlreadyCompleteException {
-		return new JobExecution(new JobInstance(0L, jobParameters, jobName));
+		return new JobExecution(new JobInstance(0L, jobName), jobParameters);
 	}
 
 	/* (non-Javadoc)
@@ -69,7 +71,7 @@ public class JobRepositorySupport implements JobRepository {
 	 */
 	public void updateExecutionContext(StepExecution stepExecution) {
 	}
-	
+
 	public void updateExecutionContext(JobExecution jobExecution) {
 	}
 
@@ -90,5 +92,11 @@ public class JobRepositorySupport implements JobRepository {
 		return null;
 	}
 
-
+	public void addAll(Collection<StepExecution> stepExecutions) {
+		if(stepExecutions != null) {
+			for (StepExecution stepExecution : stepExecutions) {
+				add(stepExecution);
+			}
+		}
+	}
 }

spring-batch-integration/src/test/java/org/springframework/batch/integration/async/PollingAsyncItemProcessorMessagingGatewayTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2007 the original author or authors.
+ * Copyright 2006-2013 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.
@@ -54,6 +54,7 @@ public class PollingAsyncItemProcessorMessagingGatewayTests {
 	public MethodRule rule = new MethodRule() {
 		public Statement apply(final Statement base, FrameworkMethod method, Object target) {
 			return new Statement() {
+				@Override
 				public void evaluate() throws Throwable {
 					StepScopeTestUtils.doInStepScope(stepExecution, new Callable<Void>() {
 						public Void call() throws Exception {
@@ -103,7 +104,7 @@ public class PollingAsyncItemProcessorMessagingGatewayTests {
 	public static class Doubler {
 
 		@ServiceActivator
-		public String cat(String value, @Header(value="stepExecution.jobExecution.jobInstance.jobParameters.getLong('factor')", required=false) Integer input) {
+		public String cat(String value, @Header(value="stepExecution.jobExecution.jobParameters.getLong('factor')", required=false) Integer input) {
 			long factor = input==null ? 1 : input;
 			for (int i=1; i<factor; i++) {
 				value += value;

spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java

@@ -27,7 +27,7 @@ import org.springframework.batch.core.repository.dao.MapJobExecutionDao;
 import org.springframework.batch.core.repository.dao.MapJobInstanceDao;
 import org.springframework.batch.core.repository.dao.MapStepExecutionDao;
 import org.springframework.batch.core.repository.support.SimpleJobRepository;
-import org.springframework.batch.core.step.item.SimpleStepFactoryBean;
+import org.springframework.batch.core.step.factory.SimpleStepFactoryBean;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.support.ListItemReader;
 import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
@@ -167,7 +167,7 @@ public class ChunkMessageItemWriterIntegrationTests {
 		// Set up context with two messages (chunks) in the backlog
 		stepExecution.getExecutionContext().putInt(ChunkMessageChannelItemWriter.EXPECTED, 3);
 		stepExecution.getExecutionContext().putInt(ChunkMessageChannelItemWriter.ACTUAL, 2);
-		
+
 		// Speed up the eventual failure
 		writer.setMaxWaitTimeouts(2);
 
@@ -191,10 +191,10 @@ public class ChunkMessageItemWriterIntegrationTests {
 	 * @param string
 	 * @return
 	 */
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({"unchecked", "rawtypes"})
 	private GenericMessage<ChunkRequest> getSimpleMessage(String string, Long jobId) {
-		StepContribution stepContribution = new JobExecution(new JobInstance(0L, new JobParameters(), "job"), 1L)
-				.createStepExecution("step").createStepContribution();
+		StepContribution stepContribution = new JobExecution(new JobInstance(0L, "job"), new JobParameters())
+		.createStepExecution("step").createStepContribution();
 		ChunkRequest chunk = new ChunkRequest(0, StringUtils.commaDelimitedListToSet(string), jobId, stepContribution);
 		GenericMessage<ChunkRequest> message = new GenericMessage<ChunkRequest>(chunk);
 		return message;
@@ -240,7 +240,7 @@ public class ChunkMessageItemWriterIntegrationTests {
 		// Set up expectation of three messages (chunks) in the backlog
 		stepExecution.getExecutionContext().putInt(ChunkMessageChannelItemWriter.EXPECTED, 6);
 		stepExecution.getExecutionContext().putInt(ChunkMessageChannelItemWriter.ACTUAL, 3);
-		
+
 		writer.setMaxWaitTimeouts(2);
 
 		/*
@@ -262,7 +262,7 @@ public class ChunkMessageItemWriterIntegrationTests {
 	/**
 	 * This one is flakey - we try to force it to wait until after the step to
 	 * finish processing just by waiting for long enough.
-	 * 
+	 *
 	 * @throws Exception
 	 */
 	@Test
@@ -308,7 +308,7 @@ public class ChunkMessageItemWriterIntegrationTests {
 	}
 
 	private StepExecution getStepExecution(Step step) throws JobExecutionAlreadyRunningException, JobRestartException,
-			JobInstanceAlreadyCompleteException {
+	JobInstanceAlreadyCompleteException {
 		SimpleJob job = new SimpleJob();
 		job.setName("job");
 		JobExecution jobExecution = jobRepository.createJobExecution(job.getName(), new JobParametersBuilder().addLong(

spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJdbcIntegrationTests.java

@@ -18,6 +18,7 @@ import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.integration.Message;
 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;
 
@@ -30,23 +31,20 @@ public class RemoteChunkFaultTolerantStepJdbcIntegrationTests {
 
 	@Autowired
 	private Job job;
-	
+
 	@Autowired
 	private PollableChannel replies;
-	
-	// @Autowired
-	// private DataSource dataSource;
-	
+
 	@Before
 	public void drain() {
 		Message<?> message = replies.receive(100L);
 		while (message!=null) {
-			// System.err.println(message);
 			message = replies.receive(100L);
 		}
 	}
 
 	@Test
+	@DirtiesContext
 	public void testFailedStep() throws Exception {
 		JobExecution jobExecution = jobLauncher.run(job, new JobParameters(Collections.singletonMap("item.three",
 				new JobParameter("unsupported"))));
@@ -58,6 +56,7 @@ public class RemoteChunkFaultTolerantStepJdbcIntegrationTests {
 	}
 
 	@Test
+	@DirtiesContext
 	public void testFailedStepOnError() throws Exception {
 		JobExecution jobExecution = jobLauncher.run(job, new JobParameters(Collections.singletonMap("item.three",
 				new JobParameter("error"))));
@@ -69,6 +68,7 @@ public class RemoteChunkFaultTolerantStepJdbcIntegrationTests {
 	}
 
 	@Test
+	@DirtiesContext
 	public void testSunnyDayFaultTolerant() throws Exception {
 		JobExecution jobExecution = jobLauncher.run(job, new JobParameters(Collections.singletonMap("item.three",
 				new JobParameter("3"))));
@@ -79,6 +79,7 @@ public class RemoteChunkFaultTolerantStepJdbcIntegrationTests {
 	}
 
 	@Test
+	@DirtiesContext
 	public void testSkipsInWriter() throws Exception {
 		JobExecution jobExecution = jobLauncher.run(job, new JobParametersBuilder().addString("item.three", "fail")
 				.addLong("run.id", 1L).toJobParameters());

spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerTests.java

@@ -19,7 +19,7 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
 
 @ContextConfiguration(locations = { "/job-execution-context.xml" })
 public class JobLaunchingMessageHandlerTests extends AbstractJUnit4SpringContextTests {
-	
+
 	JobLaunchRequestHandler messageHandler;
 
 	StubJobLauncher jobLauncher;
@@ -29,28 +29,28 @@ public class JobLaunchingMessageHandlerTests extends AbstractJUnit4SpringContext
 		jobLauncher = new StubJobLauncher();
 		messageHandler = new JobLaunchingMessageHandler(jobLauncher);
 	}
-	
+
 	@Test
 	public void testSimpleDelivery() throws Exception{
 		messageHandler.launch(new JobLaunchRequest(new JobSupport("testjob"), null));
-		
+
 		assertEquals("Wrong job count", 1, jobLauncher.jobs.size());
 		assertEquals("Wrong job name", jobLauncher.jobs.get(0).getName(), "testjob");
-		
+
 	}
 
 	private static class StubJobLauncher implements JobLauncher {
 
 		List<Job> jobs = new ArrayList<Job>();
-		
+
 		List<JobParameters> parameters = new ArrayList<JobParameters>();
 
 		AtomicLong jobId = new AtomicLong();
-		
+
 		public JobExecution run(Job job, JobParameters jobParameters){
 			jobs.add(job);
 			parameters.add(jobParameters);
-			return new JobExecution(new JobInstance(jobId.getAndIncrement(), jobParameters, job.getName()));
+			return new JobExecution(new JobInstance(jobId.getAndIncrement(), job.getName()), jobParameters);
 		}
 
 	}

spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/SimpleRecoverer.java

@@ -5,11 +5,11 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.retry.interceptor.MethodInvocationRecoverer;
+import org.springframework.retry.interceptor.MethodInvocationRecoverer;
 
 /**
  * @author Dave Syer
- * 
+ *
  */
 public final class SimpleRecoverer implements MethodInvocationRecoverer<String> {
 

spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/TransactionalPollingIntegrationTests.java

@@ -86,11 +86,16 @@ public class TransactionalPollingIntegrationTests implements ApplicationContextA
 	@Test
 	@DirtiesContext
 	public void testSunnyDay() throws Exception {
-		list = TransactionAwareProxyFactory.createTransactionalList(Arrays.asList(StringUtils
-				.commaDelimitedListToStringArray("a,b,c,d,e,f,g,h,j,k")));
-		expected = Arrays.asList(StringUtils.commaDelimitedListToStringArray("a,b,c,d"));
-		waitForResults(bus, 4, 60);
-		assertEquals(expected, processed);
+		try {
+			list = TransactionAwareProxyFactory.createTransactionalList(Arrays.asList(StringUtils
+					.commaDelimitedListToStringArray("a,b,c,d,e,f,g,h,j,k")));
+			expected = Arrays.asList(StringUtils.commaDelimitedListToStringArray("a,b,c,d"));
+			waitForResults(bus, 4, 60);
+			assertEquals(expected, processed);
+		} catch (Throwable t) {
+			System.out.println(t.getMessage());
+			t.printStackTrace();
+		}
 	}
 
 	@Test

spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepIntegrationTests-context.xml

@@ -3,13 +3,13 @@
 	xmlns:beans="http://www.springframework.org/schema/beans" xmlns:integration="http://www.springframework.org/schema/integration"
 	xmlns:batch="http://www.springframework.org/schema/batch" xmlns:context="http://www.springframework.org/schema/context"
 	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
+	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+		http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms.xsd
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.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">
+		http://www.springframework.org/schema/integration/jms http://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<job id="job" xmlns="http://www.springframework.org/schema/batch">
 		<step id="step">
@@ -84,11 +84,11 @@
 		<property name="jobRepository" ref="jobRepository" />
 	</bean>
 
-	<bean id="retryAdvice" class="org.springframework.batch.retry.interceptor.RetryOperationsInterceptor">
+	<bean id="retryAdvice" class="org.springframework.retry.interceptor.RetryOperationsInterceptor">
 		<property name="retryOperations">
-			<bean class="org.springframework.batch.retry.support.RetryTemplate">
+			<bean class="org.springframework.retry.support.RetryTemplate">
 				<property name="retryPolicy">
-					<bean class="org.springframework.batch.retry.policy.SimpleRetryPolicy">
+					<bean class="org.springframework.retry.policy.SimpleRetryPolicy">
 						<constructor-arg value="10" />
 						<constructor-arg>
 							<map>

spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJdbcIntegrationTests-context.xml

@@ -5,13 +5,13 @@
 	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:int-jdbc="http://www.springframework.org/schema/integration/jdbc"
 	xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
+		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.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/integration/jms http://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
 		http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<job id="job" xmlns="http://www.springframework.org/schema/batch">
 		<step id="step">
@@ -57,11 +57,11 @@
 		<property name="receiveTimeout" value="1000" />
 	</bean>
 
-	<bean id="retryAdvice" class="org.springframework.batch.retry.interceptor.RetryOperationsInterceptor">
+	<bean id="retryAdvice" class="org.springframework.retry.interceptor.RetryOperationsInterceptor">
 		<property name="retryOperations">
-			<bean class="org.springframework.batch.retry.support.RetryTemplate">
+			<bean class="org.springframework.retry.support.RetryTemplate">
 				<property name="retryPolicy">
-					<bean class="org.springframework.batch.retry.policy.SimpleRetryPolicy">
+					<bean class="org.springframework.retry.policy.SimpleRetryPolicy">
 						<constructor-arg value="10" />
 						<constructor-arg>
 							<map key-type="java.lang.Class" value-type="java.lang.Boolean">

spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests-context.xml

@@ -3,13 +3,13 @@
 	xmlns:integration="http://www.springframework.org/schema/integration" xmlns:batch="http://www.springframework.org/schema/batch"
 	xmlns:context="http://www.springframework.org/schema/context" xmlns:int-jms="http://www.springframework.org/schema/integration/jms"
 	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
+	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+		http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms.xsd
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.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">
+		http://www.springframework.org/schema/integration/jms http://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<import resource="classpath:/jms-context.xml" />
 

spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkStepIntegrationTests-context.xml

@@ -4,10 +4,10 @@
 	xmlns:batch="http://www.springframework.org/schema/batch" xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:task="http://www.springframework.org/schema/task"
 	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.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">
+		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<job id="job" xmlns="http://www.springframework.org/schema/batch">
 		<step id="step">

spring-batch-integration/src/test/resources/org/springframework/batch/integration/file/FileToMessagesJobIntegrationTests-context.xml

@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:integration="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:batch="http://www.springframework.org/schema/batch"
 	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.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/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd">
 
 	<import resource="classpath:/simple-job-launcher-context.xml" />
 

spring-batch-integration/src/test/resources/org/springframework/batch/integration/retry/RetryRepeatTransactionalPollingIntegrationTests-context.xml

@@ -5,12 +5,11 @@
 	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
 	xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-		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.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
 
 	<integration:annotation-config />
 
@@ -72,11 +71,11 @@
 		class="org.springframework.batch.integration.retry.SimpleRecoverer" />
 
 	<bean id="retryAdvice"
-		class="org.springframework.batch.retry.interceptor.StatefulRetryOperationsInterceptor">
+		class="org.springframework.retry.interceptor.StatefulRetryOperationsInterceptor">
 		<property name="retryOperations">
-			<bean class="org.springframework.batch.retry.support.RetryTemplate">
+			<bean class="org.springframework.retry.support.RetryTemplate">
 				<property name="retryPolicy">
-					<bean class="org.springframework.batch.retry.policy.SimpleRetryPolicy">
+					<bean class="org.springframework.retry.policy.SimpleRetryPolicy">
 						<property name="maxAttempts" value="2" />
 					</bean>
 				</property>

spring-batch-integration/src/test/resources/org/springframework/batch/integration/retry/RetryTransactionalPollingIntegrationTests-context.xml

@@ -3,13 +3,13 @@
 	xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop"
 	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:task="http://www.springframework.org/schema/task" xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
 		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-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/task http://www.springframework.org/schema/task/spring-task.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<integration:annotation-config />
 
@@ -37,11 +37,11 @@
 
 	<bean id="recoverer" class="org.springframework.batch.integration.retry.SimpleRecoverer" />
 
-	<bean id="retryAdvice" class="org.springframework.batch.retry.interceptor.StatefulRetryOperationsInterceptor">
+	<bean id="retryAdvice" class="org.springframework.retry.interceptor.StatefulRetryOperationsInterceptor">
 		<property name="retryOperations">
-			<bean class="org.springframework.batch.retry.support.RetryTemplate">
+			<bean class="org.springframework.retry.support.RetryTemplate">
 				<property name="retryPolicy">
-					<bean class="org.springframework.batch.retry.policy.SimpleRetryPolicy">
+					<bean class="org.springframework.retry.policy.SimpleRetryPolicy">
 						<property name="maxAttempts" value="2" />
 					</bean>
 				</property>

spring-batch-integration/src/test/resources/org/springframework/batch/integration/retry/TransactionalPollingIntegrationTests-context.xml

@@ -5,12 +5,11 @@
 	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
 	xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-		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.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
 
 	<integration:annotation-config />
 

spring-batch-integration/src/test/resources/simple-job-launcher-context.xml

@@ -2,9 +2,9 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop"
 	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
 
 	<bean id="jobLauncher" class="org.springframework.batch.core.launch.support.SimpleJobLauncher">
 		<property name="jobRepository" ref="jobRepository" />