diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/SimpleJobExplorer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/SimpleJobExplorer.java
index 4c059e060..269224f02 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/SimpleJobExplorer.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/SimpleJobExplorer.java
@@ -126,7 +126,7 @@ public class SimpleJobExplorer implements JobExplorer {
 	private void getJobExecutionDependencies(JobExecution jobExecution){
 		
 		JobInstance jobInstance = jobInstanceDao.getJobInstance(jobExecution);
-		stepExecutionDao.getStepExecutions(jobExecution);
+		stepExecutionDao.addStepExecutions(jobExecution);
 		jobExecution.setJobInstance(jobInstance);
 	}
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java
index f4d12fd73..a4c4526af 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java
@@ -220,10 +220,9 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao implement
 		}
 	}
 
-	public List<StepExecution> getStepExecutions(JobExecution jobExecution) {
-		List<StepExecution> executions = getJdbcTemplate().query(getQuery(GET_STEP_EXECUTIONS),
-				new StepExecutionRowMapper(jobExecution), jobExecution.getId());
-		return executions;
+	public void addStepExecutions(JobExecution jobExecution) {
+		getJdbcTemplate().query(getQuery(GET_STEP_EXECUTIONS), new StepExecutionRowMapper(jobExecution),
+				jobExecution.getId());
 	}
 
 	private static class StepExecutionRowMapper implements ParameterizedRowMapper<StepExecution> {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapStepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapStepExecutionDao.java
index 354bf096c..0ef3d61b7 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapStepExecutionDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapStepExecutionDao.java
@@ -99,10 +99,10 @@ public class MapStepExecutionDao implements StepExecutionDao {
 		return executionsByStepExecutionId.get(stepExecutionId);
 	}
 
-	public List<StepExecution> getStepExecutions(JobExecution jobExecution) {
+	public void addStepExecutions(JobExecution jobExecution) {
 		Map<Long, StepExecution> executions = executionsByJobExecutionId.get(jobExecution.getId());
 		if (executions == null || executions.isEmpty()) {
-			return Collections.emptyList();
+			return;
 		}
 		List<StepExecution> result = new ArrayList<StepExecution>(executions.values());
 		Collections.sort(result, new Comparator<Entity>() {
@@ -117,6 +117,5 @@ public class MapStepExecutionDao implements StepExecutionDao {
 			copy.add(copy(exec));
 		}
 		jobExecution.addStepExecutions(copy);
-		return copy;
 	}
 }
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/StepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/StepExecutionDao.java
index c3b74852d..8a9ee047b 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/StepExecutionDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/StepExecutionDao.java
@@ -16,7 +16,6 @@
 
 package org.springframework.batch.core.repository.dao;
 
-import java.util.List;
 
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.StepExecution;
@@ -56,8 +55,7 @@ public interface StepExecutionDao {
 	 * Retrieve all the {@link StepExecution} for the parent {@link JobExecution}.
 	 * 
 	 * @param jobExecution the parent job execution
-	 * @return a list of {@link StepExecution}
 	 */
-	List<StepExecution> getStepExecutions(JobExecution jobExecution);
+	void addStepExecutions(JobExecution jobExecution);
 
 }
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java
index b4677fc62..c0a157e4d 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java
@@ -186,8 +186,8 @@ public class SimpleJobRepository implements JobRepository {
 		List<JobExecution> jobExecutions = jobExecutionDao.findJobExecutions(jobInstance);
 		List<StepExecution> stepExecutions = new ArrayList<StepExecution>(jobExecutions.size());
 		for (JobExecution jobExecution : jobExecutions) {
-			List<StepExecution> allStepExecutions = stepExecutionDao.getStepExecutions(jobExecution);
-			for (StepExecution stepExecution : allStepExecutions) {
+			stepExecutionDao.addStepExecutions(jobExecution);
+			for (StepExecution stepExecution : jobExecution.getStepExecutions()) {
 				if (stepName.equals(stepExecution.getStepName())) {
 					stepExecutions.add(stepExecution);
 				}
@@ -216,8 +216,8 @@ public class SimpleJobRepository implements JobRepository {
 		int count = 0;
 		List<JobExecution> jobExecutions = jobExecutionDao.findJobExecutions(jobInstance);
 		for (JobExecution jobExecution : jobExecutions) {
-			List<StepExecution> allStepExecutions = stepExecutionDao.getStepExecutions(jobExecution);
-			for (StepExecution stepExecution : allStepExecutions) {
+			stepExecutionDao.addStepExecutions(jobExecution);
+			for (StepExecution stepExecution : jobExecution.getStepExecutions()) {
 				if (stepName.equals(stepExecution.getStepName())) {
 					count++;
 				}
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/exlore/support/MapJobExplorerIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/exlore/support/MapJobExplorerIntegrationTests.java
index 0c0c4dd85..c38022115 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/exlore/support/MapJobExplorerIntegrationTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/exlore/support/MapJobExplorerIntegrationTests.java
@@ -46,6 +46,9 @@ public class MapJobExplorerIntegrationTests {
 
 	@Test
 	public void testRunningJobExecution() throws Exception {
+
+		MapJobRepositoryFactoryBean.clear();
+
 		SimpleJobLauncher jobLauncher = new SimpleJobLauncher();
 		MapJobRepositoryFactoryBean repositoryFactory = new MapJobRepositoryFactoryBean();
 		ResourcelessTransactionManager transactionManager = new ResourcelessTransactionManager();
@@ -55,6 +58,7 @@ public class MapJobExplorerIntegrationTests {
 		jobLauncher.setJobRepository(jobRepository);
 		jobLauncher.setTaskExecutor(new SimpleAsyncTaskExecutor());
 		jobLauncher.afterPropertiesSet();
+
 		SimpleJob job = new SimpleJob("job");
 		TaskletStep step = new TaskletStep("step");
 		step.setTasklet(new Tasklet() {
@@ -71,12 +75,16 @@ public class MapJobExplorerIntegrationTests {
 		job.addStep(step);
 		job.setJobRepository(jobRepository);
 		job.afterPropertiesSet();
+
 		jobLauncher.run(job, new JobParametersBuilder().addString("test", getClass().getName()).toJobParameters());
+
 		Thread.sleep(500L);
 		JobExplorer explorer = (JobExplorer) new MapJobExplorerFactoryBean().getObject();
 		Set<JobExecution> executions = explorer.findRunningJobExecutions("job");
 		assertEquals(1, executions.size());
 		assertEquals(1, executions.iterator().next().getStepExecutions().size());
+
 		block = false;
+
 	}
 }
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/exlore/support/SimpleJobExplorerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/exlore/support/SimpleJobExplorerTests.java
index a35747510..9441c9e13 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/exlore/support/SimpleJobExplorerTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/exlore/support/SimpleJobExplorerTests.java
@@ -18,6 +18,7 @@ package org.springframework.batch.core.exlore.support;
 
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 
@@ -69,7 +70,8 @@ public class SimpleJobExplorerTests extends TestCase {
 	public void testGetJobExecution() throws Exception {
 		expect(jobExecutionDao.getJobExecution(123L)).andReturn(jobExecution);
 		expect(jobInstanceDao.getJobInstance(jobExecution)).andReturn(jobInstance);
-		expect(stepExecutionDao.getStepExecutions(jobExecution)).andReturn(null);
+		stepExecutionDao.addStepExecutions(jobExecution);
+		expectLastCall();
 		replay(jobExecutionDao, jobInstanceDao, stepExecutionDao);
 		jobExplorer.getJobExecution(123L);
 		verify(jobExecutionDao, jobInstanceDao, stepExecutionDao);
@@ -87,7 +89,8 @@ public class SimpleJobExplorerTests extends TestCase {
 	public void testGetStepExecution() throws Exception {
 		expect(jobExecutionDao.getJobExecution(123L)).andReturn(jobExecution);
 		expect(stepExecutionDao.getStepExecution(jobExecution, 123L)).andReturn(null);
-		expect(stepExecutionDao.getStepExecutions(jobExecution)).andReturn(null);
+		stepExecutionDao.addStepExecutions(jobExecution);
+		expectLastCall();
 		replay(jobExecutionDao, stepExecutionDao);
 		jobExplorer.getStepExecution(jobExecution.getId(), 123L);
 		verify(jobExecutionDao, stepExecutionDao);
@@ -97,7 +100,8 @@ public class SimpleJobExplorerTests extends TestCase {
 	public void testFindRunningJobExecutions() throws Exception {
 		expect(jobExecutionDao.findRunningJobExecutions("job")).andReturn(Collections.singleton(jobExecution));
 		expect(jobInstanceDao.getJobInstance(jobExecution)).andReturn(jobInstance);
-		expect(stepExecutionDao.getStepExecutions(jobExecution)).andReturn(null);
+		stepExecutionDao.addStepExecutions(jobExecution);
+		expectLastCall();
 		replay(jobExecutionDao, jobInstanceDao, stepExecutionDao);
 		jobExplorer.findRunningJobExecutions("job");
 		verify(jobExecutionDao, jobInstanceDao, stepExecutionDao);
@@ -107,7 +111,8 @@ public class SimpleJobExplorerTests extends TestCase {
 	public void testFindJobExecutions() throws Exception {
 		expect(jobExecutionDao.findJobExecutions(jobInstance)).andReturn(Collections.singletonList(jobExecution));
 		expect(jobInstanceDao.getJobInstance(jobExecution)).andReturn(jobInstance);
-		expect(stepExecutionDao.getStepExecutions(jobExecution)).andReturn(null);
+		stepExecutionDao.addStepExecutions(jobExecution);
+		expectLastCall();
 		replay(jobExecutionDao, jobInstanceDao, stepExecutionDao);
 		jobExplorer.getJobExecutions(jobInstance);
 		verify(jobExecutionDao, jobInstanceDao, stepExecutionDao);
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractStepExecutionDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractStepExecutionDaoTests.java
index adbf9d258..aa14fce7b 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractStepExecutionDaoTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractStepExecutionDaoTests.java
@@ -21,9 +21,9 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
-import java.util.List;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -131,8 +131,9 @@ public abstract class AbstractStepExecutionDaoTests extends AbstractTransactiona
 		stepExecution.setRollbackCount(3);
 		dao.saveStepExecution(stepExecution);
 
-		List<StepExecution> retrieved = dao.getStepExecutions(jobExecution);
-		assertStepExecutionsAreEqual(stepExecution, retrieved.get(0));
+		dao.addStepExecutions(jobExecution);
+		Collection<StepExecution> retrieved = jobExecution.getStepExecutions();
+		assertStepExecutionsAreEqual(stepExecution, retrieved.iterator().next());
 	}
 
 	@Transactional
@@ -229,8 +230,9 @@ public abstract class AbstractStepExecutionDaoTests extends AbstractTransactiona
 
 	@Test
 	public void testGetStepExecutionsWhenNoneExist() throws Exception {
-		assertEquals("empty list is returned if no stepExecutions exist for given jobExecution", Collections
-				.emptyList(), dao.getStepExecutions(jobExecution));
+		int count = jobExecution.getStepExecutions().size();
+		dao.addStepExecutions(jobExecution);
+		assertEquals("Incorrect size of collection", count, jobExecution.getStepExecutions().size());
 	}
 
 	private void assertStepExecutionsAreEqual(StepExecution expected, StepExecution actual) {
diff --git a/spring-batch-samples/src/main/resources/jobs/iosample/jdbcCursor.xml b/spring-batch-samples/src/main/resources/jobs/iosample/jdbcCursor.xml
index 207fa4f91..630113c89 100644
--- a/spring-batch-samples/src/main/resources/jobs/iosample/jdbcCursor.xml
+++ b/spring-batch-samples/src/main/resources/jobs/iosample/jdbcCursor.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
-
-	<bean id="itemReader" class="org.springframework.batch.item.database.JdbcCursorItemReader">
-		<property name="dataSource" ref="dataSource"/>
-		<property name="sql" value="select ID, NAME, CREDIT from CUSTOMER"/>
-		<property name="rowMapper">
-			<bean class="org.springframework.batch.sample.domain.trade.internal.CustomerCreditRowMapper"/>
-		</property>
-	</bean>
-
-	<bean id="itemWriter" class="org.springframework.batch.item.database.JdbcBatchItemWriter">
-		<property name="assertUpdates" value="true" />
-		<property name="itemSqlParameterSourceProvider">
-			<bean class="org.springframework.batch.item.database.BeanPropertyItemSqlParameterSourceProvider" />
-		</property>
-		<property name="sql" value="UPDATE customer set credit = :credit where id = :id" />
-		<property name="dataSource" ref="dataSource" />
-	</bean>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<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"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation="
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+
+	<bean id="itemReader" class="org.springframework.batch.item.database.JdbcCursorItemReader">
+		<property name="dataSource" ref="dataSource"/>
+		<property name="sql" value="select ID, NAME, CREDIT from CUSTOMER"/>
+		<property name="rowMapper">
+			<bean class="org.springframework.batch.sample.domain.trade.internal.CustomerCreditRowMapper"/>
+		</property>
+	</bean>
+
+	<bean id="itemWriter" class="org.springframework.batch.item.database.JdbcBatchItemWriter">
+		<property name="assertUpdates" value="true" />
+		<property name="itemSqlParameterSourceProvider">
+			<bean class="org.springframework.batch.item.database.BeanPropertyItemSqlParameterSourceProvider" />
+		</property>
+		<property name="sql" value="UPDATE customer set credit = :credit where id = :id" />
+		<property name="dataSource" ref="dataSource" />
+	</bean>
+
+</beans>
diff --git a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
index f211eba31..8f8ace253 100644
--- a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/batch" 
-	xmlns:beans="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.0.xsd
-       		http://www.springframework.org/schema/batch
-       		http://www.springframework.org/schema/batch/spring-batch-2.0.xsd
-       		http://www.springframework.org/schema/aop
- 			http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
-
-	<job id="skipJob" incrementer="incrementer">
-		<step id="step1" ref="firstPass">
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/batch" 
+	xmlns:beans="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.0.xsd
+       		http://www.springframework.org/schema/batch
+       		http://www.springframework.org/schema/batch/spring-batch-2.0.xsd
+       		http://www.springframework.org/schema/aop
+ 			http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+
+	<job id="skipJob" incrementer="incrementer">
+		<step id="step1" ref="firstPass">
 			<end on="FAILED" status="FAILED"/>
 			<next on="COMPLETED WITH SKIPS" to="errorPrint1" />
 			<next on="*" to="step2" />
-		</step>
-
-		<step id="errorPrint1" next="step2" tasklet="errorLogTasklet"/>
-
-		<step id="step2" ref="secondPass" next="skipCheckingDecision"/>
-
-		<decision id="skipCheckingDecision" decider="skipCheckingDecider">
-			<next on="COMPLETED WITH SKIPS" to="errorPrint2" />
-			<end on="*"/>
-		</decision>
-		
-		<step id="errorPrint2" tasklet="errorLogTasklet"/>
-	</job>
-
+		</step>
+
+		<step id="errorPrint1" next="step2" tasklet="errorLogTasklet"/>
+
+		<step id="step2" ref="secondPass" next="skipCheckingDecision"/>
+
+		<decision id="skipCheckingDecision" decider="skipCheckingDecider">
+			<next on="COMPLETED WITH SKIPS" to="errorPrint2" />
+			<end on="*"/>
+		</decision>
+		
+		<step id="errorPrint2" tasklet="errorLogTasklet"/>
+	</job>
+
 	<step id="firstPass" >
 		<tasklet reader="fileItemReader" processor="tradeProcessor" writer="tradeWriter" 
 		         commit-interval="1" skip-limit="1">
@@ -41,7 +41,7 @@
 			<listener ref="promotionListener"/>
 		</listeners>
 	</step>
-	
+	
 	<step id="secondPass">
 		<tasklet reader="tradeSqlItemReader" processor="tradeProcessor" writer="itemTrackingWriter"
 				 commit-interval="2" skip-limit="1">
@@ -56,72 +56,72 @@
 		</listeners>
 	</step>
 
-	<beans:bean id="tradeProcessor" class="org.springframework.batch.sample.domain.trade.internal.TradeProcessor"/>
-	<beans:bean id="tradeWriter" class="org.springframework.batch.sample.domain.trade.internal.TradeWriter">
-		<beans:property name="dao" ref="tradeDao"/>
-	</beans:bean>
-	
-	<beans:bean id="skipCheckingListener" class="org.springframework.batch.sample.common.SkipCheckingListener"/>
-	
-	<beans:bean id="promotionListener" class="org.springframework.batch.core.listener.ExecutionContextPromotionListener">
-		<beans:property name="keys">
-			<beans:list>
-				<beans:value>stepName</beans:value>
-			</beans:list>
-		</beans:property>
-	</beans:bean>
-	
-	<beans:bean id="fileItemReader" class="org.springframework.batch.item.file.FlatFileItemReader" scope="step">
-		<beans:property name="resource" value="classpath:/data/skipJob/input/input#{jobParameters[run.id]}.txt" />
-		<beans:property name="lineMapper">
-			<beans:bean class="org.springframework.batch.item.file.mapping.DefaultLineMapper">
-				<beans:property name="lineTokenizer">
-					<beans:bean class="org.springframework.batch.item.file.transform.DelimitedLineTokenizer">
-						<beans:property name="names" value="ISIN, Quantity, Price, Customer" />
-					</beans:bean>
-				</beans:property>
-				<beans:property name="fieldSetMapper">
-					<beans:bean class="org.springframework.batch.sample.domain.trade.internal.TradeFieldSetMapper" />
-				</beans:property>
-			</beans:bean>
-		</beans:property>
-	</beans:bean>
-
-	<beans:bean class="org.springframework.batch.core.scope.StepScope" />
-
-	<beans:bean id="tradeDao" class="org.springframework.batch.sample.domain.trade.internal.JdbcTradeDao">
-		<beans:property name="dataSource" ref="dataSource"/>
-		<beans:property name="incrementer">
-			<beans:bean parent="incrementerParent">
-				<beans:property name="incrementerName" value="TRADE_SEQ" />
-			</beans:bean>
-		</beans:property>
-	</beans:bean>
-
-	<beans:bean id="tradeSqlItemReader" class="org.springframework.batch.item.database.JdbcCursorItemReader">
-		<beans:property name="dataSource" ref="dataSource" />
-		<beans:property name="sql" value="SELECT isin, quantity, price, customer from TRADE" />
-		<beans:property name="rowMapper">
-			<beans:bean class="org.springframework.batch.sample.domain.trade.internal.TradeRowMapper" />
-		</beans:property>
-	</beans:bean>
-
-	<beans:bean id="customerReportItemWriter" class="org.springframework.batch.sample.domain.trade.internal.FlatFileCustomerCreditDao">
-		<beans:property name="itemWriter">
-			<beans:bean id="customerFlatFileOutputSource" class="org.springframework.batch.item.file.FlatFileItemWriter">
-				<beans:property name="resource" value="target/test-outputs/20070122.testStream.CustomerReportStep.TEMP.txt" />
-				<beans:property name="lineAggregator">
-					<beans:bean class="org.springframework.batch.item.file.transform.PassThroughLineAggregator" />
-				</beans:property>
-			</beans:bean>
-		</beans:property>
-	</beans:bean>
-
-	<beans:bean id="errorLogTasklet" class="org.springframework.batch.sample.common.ErrorLogTasklet">
-		<beans:property name="dataSource" ref="dataSource"/>
-	</beans:bean>
-
-	<beans:bean id="skipCheckingDecider" class="org.springframework.batch.sample.common.SkipCheckingDecider"/>
-	
-	<beans:bean id="incrementer" class="org.springframework.batch.sample.common.InfiniteLoopIncrementer"/>
-</beans:beans>
+	<beans:bean id="tradeProcessor" class="org.springframework.batch.sample.domain.trade.internal.TradeProcessor"/>
+	<beans:bean id="tradeWriter" class="org.springframework.batch.sample.domain.trade.internal.TradeWriter">
+		<beans:property name="dao" ref="tradeDao"/>
+	</beans:bean>
+	
+	<beans:bean id="skipCheckingListener" class="org.springframework.batch.sample.common.SkipCheckingListener"/>
+	
+	<beans:bean id="promotionListener" class="org.springframework.batch.core.listener.ExecutionContextPromotionListener">
+		<beans:property name="keys">
+			<beans:list>
+				<beans:value>stepName</beans:value>
+			</beans:list>
+		</beans:property>
+	</beans:bean>
+	
+	<beans:bean id="fileItemReader" class="org.springframework.batch.item.file.FlatFileItemReader" scope="step">
+		<beans:property name="resource" value="classpath:/data/skipJob/input/input#{jobParameters[run.id]}.txt" />
+		<beans:property name="lineMapper">
+			<beans:bean class="org.springframework.batch.item.file.mapping.DefaultLineMapper">
+				<beans:property name="lineTokenizer">
+					<beans:bean class="org.springframework.batch.item.file.transform.DelimitedLineTokenizer">
+						<beans:property name="names" value="ISIN, Quantity, Price, Customer" />
+					</beans:bean>
+				</beans:property>
+				<beans:property name="fieldSetMapper">
+					<beans:bean class="org.springframework.batch.sample.domain.trade.internal.TradeFieldSetMapper" />
+				</beans:property>
+			</beans:bean>
+		</beans:property>
+	</beans:bean>
+
+	<beans:bean class="org.springframework.batch.core.scope.StepScope" />
+
+	<beans:bean id="tradeDao" class="org.springframework.batch.sample.domain.trade.internal.JdbcTradeDao">
+		<beans:property name="dataSource" ref="dataSource"/>
+		<beans:property name="incrementer">
+			<beans:bean parent="incrementerParent">
+				<beans:property name="incrementerName" value="TRADE_SEQ" />
+			</beans:bean>
+		</beans:property>
+	</beans:bean>
+
+	<beans:bean id="tradeSqlItemReader" class="org.springframework.batch.item.database.JdbcCursorItemReader">
+		<beans:property name="dataSource" ref="dataSource" />
+		<beans:property name="sql" value="SELECT isin, quantity, price, customer from TRADE" />
+		<beans:property name="rowMapper">
+			<beans:bean class="org.springframework.batch.sample.domain.trade.internal.TradeRowMapper" />
+		</beans:property>
+	</beans:bean>
+
+	<beans:bean id="customerReportItemWriter" class="org.springframework.batch.sample.domain.trade.internal.FlatFileCustomerCreditDao">
+		<beans:property name="itemWriter">
+			<beans:bean id="customerFlatFileOutputSource" class="org.springframework.batch.item.file.FlatFileItemWriter">
+				<beans:property name="resource" value="target/test-outputs/20070122.testStream.CustomerReportStep.TEMP.txt" />
+				<beans:property name="lineAggregator">
+					<beans:bean class="org.springframework.batch.item.file.transform.PassThroughLineAggregator" />
+				</beans:property>
+			</beans:bean>
+		</beans:property>
+	</beans:bean>
+
+	<beans:bean id="errorLogTasklet" class="org.springframework.batch.sample.common.ErrorLogTasklet">
+		<beans:property name="dataSource" ref="dataSource"/>
+	</beans:bean>
+
+	<beans:bean id="skipCheckingDecider" class="org.springframework.batch.sample.common.SkipCheckingDecider"/>
+	
+	<beans:bean id="incrementer" class="org.springframework.batch.sample.common.InfiniteLoopIncrementer"/>
+</beans:beans>
diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
index 073043698..d4855f52d 100644
--- a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
@@ -1,118 +1,118 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/batch" 
-	xmlns:beans="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.0.xsd
-       		http://www.springframework.org/schema/batch
-       		http://www.springframework.org/schema/batch/spring-batch-2.0.xsd
-       		http://www.springframework.org/schema/aop
- 			http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
-
-	<job id="tradeJob">
-		<step id="step1" next="step2">
-			<tasklet reader="fileItemReader" 
-			         processor="validatingProcessor" 
-			         writer="tradeWriter" 
-			         commit-interval="1"
-			         transaction-attribute="PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED">
-				<streams>
-					<stream ref="fileItemReader"/>
-				</streams>
-			</tasklet>
-		</step>
-		<step id="step2" next="step3">
-			<tasklet reader="tradeSqlItemReader" writer="customerWriter" commit-interval="1"/>
-		</step>
-		<step id="step3">
-			<tasklet reader="customerSqlItemReader" writer="creditWriter" commit-interval="1"/>
-		</step>
-	</job>
-
-	<beans:bean id="validatingProcessor" class="org.springframework.batch.item.validator.ValidatingItemProcessor">
-		<beans:constructor-arg ref="tradeValidator" />
-	</beans:bean>
-
-	<beans:bean id="tradeWriter" class="org.springframework.batch.sample.domain.trade.internal.TradeWriter">
-		<beans:property name="dao" ref="tradeDao"/>
-	</beans:bean>
-	
-	<beans:bean id="customerWriter" class="org.springframework.batch.sample.domain.trade.internal.CustomerUpdateWriter">
-		<beans:property name="dao" ref="customerDao"/>
-	</beans:bean>
-	
-	<beans:bean id="creditWriter" class="org.springframework.batch.sample.domain.trade.internal.CustomerCreditUpdateWriter">
-		<beans:property name="dao" ref="customerReportItemWriter"/>
-	</beans:bean>
-
-	<beans:bean id="tradeSqlItemReader" class="org.springframework.batch.item.database.JdbcCursorItemReader">
-		<beans:property name="dataSource" ref="dataSource" />
-		<beans:property name="sql" value="SELECT id, quantity, price, customer from TRADE" />
-		<beans:property name="rowMapper">
-			<beans:bean class="org.springframework.batch.sample.domain.trade.internal.TradeRowMapper" />
-		</beans:property>
-	</beans:bean>
-
-	<beans:bean id="customerSqlItemReader" class="org.springframework.batch.item.database.JdbcCursorItemReader">
-		<beans:property name="dataSource" ref="dataSource" />
-		<beans:property name="sql" value="SELECT id, name, credit FROM customer " />
-		<beans:property name="rowMapper">
-			<beans:bean class="org.springframework.batch.sample.domain.trade.internal.CustomerCreditRowMapper" />
-		</beans:property>
-	</beans:bean>
-
-	<beans:bean id="tradeDao" class="org.springframework.batch.sample.domain.trade.internal.JdbcTradeDao"
-		  p:dataSource-ref="dataSource">
-		<beans:property name="incrementer">
-			<beans:bean parent="incrementerParent">
-				<beans:property name="incrementerName" value="TRADE_SEQ" />
-			</beans:bean>
-		</beans:property>
-	</beans:bean>
-
-	<beans:bean id="customerDao" class="org.springframework.batch.sample.domain.trade.internal.JdbcCustomerDebitDao"
-		  p:dataSource-ref="dataSource" />
-
-	<beans:bean id="customerReportItemWriter" class="org.springframework.batch.sample.domain.trade.internal.FlatFileCustomerCreditDao">
-		<beans:property name="itemWriter">
-			<beans:bean class="org.springframework.batch.item.file.FlatFileItemWriter">
-				<beans:property name="resource" value="target/test-outputs/20070122.testStream.CustomerReportStep.TEMP.txt"/>
-				<beans:property name="lineAggregator">
-					<beans:bean class="org.springframework.batch.item.file.transform.PassThroughLineAggregator" />
-				</beans:property>
-			</beans:bean>
-		</beans:property>
-	</beans:bean>
-
-	<beans:bean id="fileItemReader" class="org.springframework.batch.item.file.FlatFileItemReader">
-		<beans:property name="resource" value="classpath:data/tradeJob/input/20070122.teststream.ImportTradeDataStep.txt" />
-		<beans:property name="lineMapper">
-			<beans:bean class="org.springframework.batch.item.file.mapping.DefaultLineMapper">
-				<beans:property name="lineTokenizer">
-					<beans:bean class="org.springframework.batch.item.file.transform.DelimitedLineTokenizer">
-						<beans:property name="names" value="ISIN, Quantity, Price, Customer" />
-					</beans:bean>
-				</beans:property>
-				<beans:property name="fieldSetMapper">
-					<beans:bean class="org.springframework.batch.sample.domain.trade.internal.TradeFieldSetMapper" />
-				</beans:property>
-			</beans:bean>
-		</beans:property>
-	</beans:bean>
-
-	<beans:bean id="tradeValidator" class="org.springframework.batch.item.validator.SpringValidator">
-		<beans:property name="validator">
-			<beans:bean class="org.springmodules.validation.valang.ValangValidator">
-				<beans:property name="valang">
-					<beans:value>
-						<![CDATA[{ isin : length(?) < 13 : 'ISIN too long' : 'isin_length' : 12}]]>
-					</beans:value>
-				</beans:property>
-			</beans:bean>
-		</beans:property>
-	</beans:bean>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/batch" 
+	xmlns:beans="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.0.xsd
+       		http://www.springframework.org/schema/batch
+       		http://www.springframework.org/schema/batch/spring-batch-2.0.xsd
+       		http://www.springframework.org/schema/aop
+ 			http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+
+	<job id="tradeJob">
+		<step id="step1" next="step2">
+			<tasklet reader="fileItemReader" 
+			         processor="validatingProcessor" 
+			         writer="tradeWriter" 
+			         commit-interval="1"
+			         transaction-attribute="PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED">
+				<streams>
+					<stream ref="fileItemReader"/>
+				</streams>
+			</tasklet>
+		</step>
+		<step id="step2" next="step3">
+			<tasklet reader="tradeSqlItemReader" writer="customerWriter" commit-interval="1"/>
+		</step>
+		<step id="step3">
+			<tasklet reader="customerSqlItemReader" writer="creditWriter" commit-interval="1"/>
+		</step>
+	</job>
+
+	<beans:bean id="validatingProcessor" class="org.springframework.batch.item.validator.ValidatingItemProcessor">
+		<beans:constructor-arg ref="tradeValidator" />
+	</beans:bean>
+
+	<beans:bean id="tradeWriter" class="org.springframework.batch.sample.domain.trade.internal.TradeWriter">
+		<beans:property name="dao" ref="tradeDao"/>
+	</beans:bean>
+	
+	<beans:bean id="customerWriter" class="org.springframework.batch.sample.domain.trade.internal.CustomerUpdateWriter">
+		<beans:property name="dao" ref="customerDao"/>
+	</beans:bean>
+	
+	<beans:bean id="creditWriter" class="org.springframework.batch.sample.domain.trade.internal.CustomerCreditUpdateWriter">
+		<beans:property name="dao" ref="customerReportItemWriter"/>
+	</beans:bean>
+
+	<beans:bean id="tradeSqlItemReader" class="org.springframework.batch.item.database.JdbcCursorItemReader">
+		<beans:property name="dataSource" ref="dataSource" />
+		<beans:property name="sql" value="SELECT id, quantity, price, customer from TRADE" />
+		<beans:property name="rowMapper">
+			<beans:bean class="org.springframework.batch.sample.domain.trade.internal.TradeRowMapper" />
+		</beans:property>
+	</beans:bean>
+
+	<beans:bean id="customerSqlItemReader" class="org.springframework.batch.item.database.JdbcCursorItemReader">
+		<beans:property name="dataSource" ref="dataSource" />
+		<beans:property name="sql" value="SELECT id, name, credit FROM customer " />
+		<beans:property name="rowMapper">
+			<beans:bean class="org.springframework.batch.sample.domain.trade.internal.CustomerCreditRowMapper" />
+		</beans:property>
+	</beans:bean>
+
+	<beans:bean id="tradeDao" class="org.springframework.batch.sample.domain.trade.internal.JdbcTradeDao"
+		  p:dataSource-ref="dataSource">
+		<beans:property name="incrementer">
+			<beans:bean parent="incrementerParent">
+				<beans:property name="incrementerName" value="TRADE_SEQ" />
+			</beans:bean>
+		</beans:property>
+	</beans:bean>
+
+	<beans:bean id="customerDao" class="org.springframework.batch.sample.domain.trade.internal.JdbcCustomerDebitDao"
+		  p:dataSource-ref="dataSource" />
+
+	<beans:bean id="customerReportItemWriter" class="org.springframework.batch.sample.domain.trade.internal.FlatFileCustomerCreditDao">
+		<beans:property name="itemWriter">
+			<beans:bean class="org.springframework.batch.item.file.FlatFileItemWriter">
+				<beans:property name="resource" value="target/test-outputs/20070122.testStream.CustomerReportStep.TEMP.txt"/>
+				<beans:property name="lineAggregator">
+					<beans:bean class="org.springframework.batch.item.file.transform.PassThroughLineAggregator" />
+				</beans:property>
+			</beans:bean>
+		</beans:property>
+	</beans:bean>
+
+	<beans:bean id="fileItemReader" class="org.springframework.batch.item.file.FlatFileItemReader">
+		<beans:property name="resource" value="classpath:data/tradeJob/input/20070122.teststream.ImportTradeDataStep.txt" />
+		<beans:property name="lineMapper">
+			<beans:bean class="org.springframework.batch.item.file.mapping.DefaultLineMapper">
+				<beans:property name="lineTokenizer">
+					<beans:bean class="org.springframework.batch.item.file.transform.DelimitedLineTokenizer">
+						<beans:property name="names" value="ISIN, Quantity, Price, Customer" />
+					</beans:bean>
+				</beans:property>
+				<beans:property name="fieldSetMapper">
+					<beans:bean class="org.springframework.batch.sample.domain.trade.internal.TradeFieldSetMapper" />
+				</beans:property>
+			</beans:bean>
+		</beans:property>
+	</beans:bean>
+
+	<beans:bean id="tradeValidator" class="org.springframework.batch.item.validator.SpringValidator">
+		<beans:property name="validator">
+			<beans:bean class="org.springmodules.validation.valang.ValangValidator">
+				<beans:property name="valang">
+					<beans:value>
+						<![CDATA[{ isin : length(?) < 13 : 'ISIN too long' : 'isin_length' : 12}]]>
+					</beans:value>
+				</beans:property>
+			</beans:bean>
+		</beans:property>
+	</beans:bean>
+
 </beans:beans>
\ No newline at end of file