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 dfd0e28d0..dcb9d94c3 100644
--- a/spring-batch-integration/.settings/com.springsource.sts.config.flow.prefs
+++ b/spring-batch-integration/.settings/com.springsource.sts.config.flow.prefs
@@ -1,9 +1,10 @@
-#Mon Apr 19 14:39:29 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=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element type\="job">\n<structure end\="1102" endstart\="1096" start\="901" startend\="967"/>\n<bounds height\="118" width\="79" x\="15" y\="17"/>\n</element>\n<element type\="job">\n<structure end\="1473" endstart\="1467" start\="1107" startend\="1182"/>\n<bounds height\="118" width\="127" x\="106" y\="17"/>\n</element>\n</graph>
-//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=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element type\="job">\n<structure end\="1667" endstart\="1661" start\="1306" startend\="1372"/>\n<bounds height\="118" width\="79" x\="15" y\="17"/>\n</element>\n</graph>
-//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=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<graph>\r\n<element type\="job">\r\n<structure end\="1767" endstart\="1761" start\="1416" startend\="1482"/>\r\n<bounds height\="118" width\="75" x\="15" y\="17"/>\r\n</element>\r\n</graph>
-//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=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element type\="job">\n<structure end\="1269" endstart\="1263" start\="1067" startend\="1133"/>\n<bounds height\="118" width\="79" x\="15" y\="17"/>\n</element>\n</graph>
-//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=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<graph>\r\n<element type\="job">\r\n<structure end\="972" endstart\="966" start\="771" startend\="837"/>\r\n<bounds height\="118" width\="75" x\="15" y\="17"/>\r\n</element>\r\n</graph>
-//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=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element type\="job">\n<structure end\="1419" endstart\="1413" start\="1302" startend\="1368"/>\n<bounds height\="128" width\="79" x\="109" y\="19"/>\n</element>\n<element type\="step">\n<structure end\="1953" endstart\="1946" start\="1846" startend\="1916"/>\n<bounds height\="34" width\="74" x\="17" y\="19"/>\n</element>\n</graph>
-//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=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element type\="job">\n<structure end\="1421" endstart\="1415" start\="1302" startend\="1368"/>\n<bounds height\="128" width\="79" x\="109" y\="19"/>\n</element>\n<element type\="step">\n<structure end\="1962" endstart\="1955" start\="1855" startend\="1925"/>\n<bounds height\="34" width\="74" x\="17" y\="19"/>\n</element>\n</graph>
-eclipse.preferences.version=1
+#Fri May 14 17:06:42 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=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element type\="job">\n<structure end\="1102" endstart\="1096" start\="901" startend\="967"/>\n<bounds height\="118" width\="79" x\="15" y\="17"/>\n</element>\n<element type\="job">\n<structure end\="1473" endstart\="1467" start\="1107" startend\="1182"/>\n<bounds height\="118" width\="127" x\="106" y\="17"/>\n</element>\n</graph>
+//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=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element type\="job">\n<structure end\="1667" endstart\="1661" start\="1306" startend\="1372"/>\n<bounds height\="118" width\="79" x\="15" y\="17"/>\n</element>\n</graph>
+//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=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<graph>\r\n<element type\="job">\r\n<structure end\="1767" endstart\="1761" start\="1416" startend\="1482"/>\r\n<bounds height\="118" width\="75" x\="15" y\="17"/>\r\n</element>\r\n</graph>
+//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=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element type\="job">\n<structure end\="1269" endstart\="1263" start\="1067" startend\="1133"/>\n<bounds height\="118" width\="79" x\="15" y\="17"/>\n</element>\n</graph>
+//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=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<graph>\r\n<element type\="job">\r\n<structure end\="972" endstart\="966" start\="771" startend\="837"/>\r\n<bounds height\="118" width\="75" x\="15" y\="17"/>\r\n</element>\r\n</graph>
+//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=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element type\="job">\n<structure end\="2969" endstart\="2963" start\="2774" startend\="2841"/>\n<bounds height\="128" width\="131" x\="100" y\="19"/>\n</element>\n<element type\="step">\n<structure end\="3575" endstart\="3568" start\="3075" startend\="3144"/>\n<bounds height\="34" width\="65" x\="17" y\="19"/>\n</element>\n</graph>
+//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=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element type\="job">\n<structure end\="1419" endstart\="1413" start\="1302" startend\="1368"/>\n<bounds height\="128" width\="79" x\="109" y\="19"/>\n</element>\n<element type\="step">\n<structure end\="1953" endstart\="1946" start\="1846" startend\="1916"/>\n<bounds height\="34" width\="74" x\="17" y\="19"/>\n</element>\n</graph>
+//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=<?xml version\="1.0" encoding\="UTF-8"?>\n<graph>\n<element type\="job">\n<structure end\="1421" endstart\="1415" start\="1302" startend\="1368"/>\n<bounds height\="128" width\="79" x\="109" y\="19"/>\n</element>\n<element type\="step">\n<structure end\="1962" endstart\="1955" start\="1855" startend\="1925"/>\n<bounds height\="34" width\="74" x\="17" y\="19"/>\n</element>\n</graph>
+eclipse.preferences.version=1
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 7e36b99e4..37fa460b4 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
@@ -1,101 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:p="http://www.springframework.org/schema/p" xmlns:integration="http://www.springframework.org/schema/integration"
-	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.xsd
-        http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.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">
-
-	<import resource="classpath:/simple-job-launcher-context.xml" />
-
-	<integration:channel id="requests">
-		<integration:queue />
-	</integration:channel>
-	<integration:channel id="staging">
-		<integration:queue />
-	</integration:channel>
-	<integration:channel id="replies">
-		<integration:queue />
-	</integration:channel>
-
-	<integration:service-activator ref="stepExecutionRequestHandler"
-		input-channel="requests" output-channel="staging">
-		<integration:poller>
-			<integration:interval-trigger interval="10" />
-		</integration:poller>
-	</integration:service-activator>
-	<integration:aggregator ref="partitionHandler"
-		timeout="10000" input-channel="staging" output-channel="replies">
-		<integration:poller>
-			<integration:interval-trigger interval="10" />
-		</integration:poller>
-	</integration:aggregator>
-
-	<!-- This is the "remote" worker (which in this case is local) -->
-	<bean id="stepExecutionRequestHandler"
-		class="org.springframework.batch.integration.partition.StepExecutionRequestHandler"
-		p:jobExplorer-ref="jobExplorer" p:stepLocator-ref="stepLocator" />
-
-	<bean id="stepLocator"
-		class="org.springframework.batch.integration.partition.BeanFactoryStepLocator" />
-
-	<bean id="jobExplorer"
-		class="org.springframework.batch.core.explore.support.MapJobExplorerFactoryBean">
-		<property name="repositoryFactory" ref="&amp;jobRepository"/>
-	</bean>
-
-	<bean id="partitionHandler"
-		class="org.springframework.batch.integration.partition.MessageChannelPartitionHandler">
-		<property name="messagingGateway">
-			<bean
-				class="org.springframework.integration.gateway.SimpleMessagingGateway">
-				<property name="requestChannel" ref="requests" />
-				<property name="replyChannel" ref="replies" />
-				<property name="replyTimeout" value="10000" />
-			</bean>
-		</property>
-		<property name="stepName" value="step1" />
-		<property name="gridSize" value="2" />
-	</bean>
-
-	<bean id="job1" parent="simpleJob">
-		<property name="steps">
-			<bean name="step1:master"
-				class="org.springframework.batch.core.partition.support.PartitionStep">
-				<property name="partitionHandler" ref="partitionHandler" />
-				<property name="stepExecutionSplitter">
-					<bean
-						class="org.springframework.batch.core.partition.support.SimpleStepExecutionSplitter">
-						<property name="jobRepository" ref="jobRepository" />
-						<property name="stepName" value="step1" />
-						<property name="partitioner">
-							<bean class="org.springframework.batch.core.partition.support.SimplePartitioner"/>
-						</property>
-					</bean>
-				</property>
-				<property name="jobRepository" ref="jobRepository" />
-			</bean>
-		</property>
-	</bean>
-	<bean id="step1" parent="simpleStep">
-		<property name="itemReader">
-			<bean
-				class="org.springframework.batch.integration.partition.ExampleItemReader"
-				scope="step">
-				<!--
-					<property name="resource"
-					value="#{stepAttributes[jobParameters['resource']]}"/>
-				-->
-			</bean>
-		</property>
-		<property name="itemWriter">
-			<bean
-				class="org.springframework.batch.integration.partition.ExampleItemWriter" />
-		</property>
-	</bean>
-
-	<bean class="org.springframework.batch.core.scope.StepScope" />
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:integration="http://www.springframework.org/schema/integration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	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-1.0.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.xsd
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
+
+	<import resource="classpath:/simple-job-launcher-context.xml" />
+
+	<channel id="requests" xmlns="http://www.springframework.org/schema/integration">
+		<queue />
+	</channel>
+	<channel id="staging" xmlns="http://www.springframework.org/schema/integration">
+		<queue />
+	</channel>
+	<channel id="replies" xmlns="http://www.springframework.org/schema/integration">
+		<queue />
+	</channel>
+
+	<service-activator ref="stepExecutionRequestHandler" input-channel="requests" output-channel="staging"
+		xmlns="http://www.springframework.org/schema/integration">
+		<poller>
+			<interval-trigger interval="10" />
+		</poller>
+	</service-activator>
+	<aggregator ref="partitionHandler" timeout="10000" input-channel="staging" output-channel="replies"
+		xmlns="http://www.springframework.org/schema/integration">
+		<poller>
+			<interval-trigger interval="10" />
+		</poller>
+	</aggregator>
+
+	<!-- This is the "remote" worker (which in this case is local) -->
+	<bean id="stepExecutionRequestHandler" class="org.springframework.batch.integration.partition.StepExecutionRequestHandler"
+		p:jobExplorer-ref="jobExplorer" p:stepLocator-ref="stepLocator" />
+
+	<bean id="stepLocator" class="org.springframework.batch.integration.partition.BeanFactoryStepLocator" />
+
+	<bean id="jobExplorer" class="org.springframework.batch.core.explore.support.MapJobExplorerFactoryBean">
+		<property name="repositoryFactory" ref="&amp;jobRepository" />
+	</bean>
+
+	<bean id="partitionHandler" class="org.springframework.batch.integration.partition.MessageChannelPartitionHandler">
+		<property name="messagingGateway">
+			<bean class="org.springframework.integration.gateway.SimpleMessagingGateway">
+				<property name="requestChannel" ref="requests" />
+				<property name="replyChannel" ref="replies" />
+				<property name="replyTimeout" value="10000" />
+			</bean>
+		</property>
+		<property name="stepName" value="step1" />
+		<property name="gridSize" value="2" />
+	</bean>
+
+	<job id="job1" xmlns="http://www.springframework.org/schema/batch">
+		<step id="step1-master">
+			<partition handler="partitionHandler" partitioner="partitioner" step="step1" />
+		</step>
+	</job>
+
+	<bean id="partitioner" class="org.springframework.batch.core.partition.support.SimplePartitioner" />
+
+	<step id="step1" xmlns="http://www.springframework.org/schema/batch">
+		<tasklet>
+			<chunk commit-interval="10">
+				<reader>
+					<bean class="org.springframework.batch.integration.partition.ExampleItemReader" scope="step"
+						xmlns="http://www.springframework.org/schema/beans" />
+				</reader>
+				<writer>
+					<bean class="org.springframework.batch.integration.partition.ExampleItemWriter" xmlns="http://www.springframework.org/schema/beans" />
+				</writer>
+			</chunk>
+		</tasklet>
+	</step>
+
+</beans>