From d3396a3fa72a5353728d385668ed803177fca677 Mon Sep 17 00:00:00 2001
From: trisberg <trisberg@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Tue, 10 Feb 2009 04:52:03 +0000
Subject: [PATCH] BATCH-1013: split the <step> elements name attribute into id
 and ref attributes

---
 .../configuration/xml/DelegatingStep.java     | 64 +++++++++++++++++++
 .../configuration/xml/InlineStepParser.java   | 47 +++++++++-----
 .../configuration/xml/spring-batch-2.0.xsd    |  3 +-
 .../xml/BranchStepJobParserTests.java         |  4 +-
 .../xml/DefaultFailureJobParserTests.java     |  8 +--
 .../xml/DefaultSuccessJobParserTests.java     |  8 +--
 ...TransitionDefaultStatusJobParserTests.java |  4 +-
 .../xml/EndTransitionJobParserTests.java      |  8 +--
 ...TransitionDefaultStatusJobParserTests.java |  4 +-
 .../xml/FailTransitionJobParserTests.java     | 12 ++--
 ...fferentResultsFailFirstJobParserTests.java |  8 +--
 ...ferentResultsFailSecondJobParserTests.java | 12 ++--
 .../configuration/xml/StepParserTests.java    |  5 +-
 .../xml/StopIncompleteJobParserTests.java     |  8 +--
 .../configuration/xml/StopJobParserTests.java |  8 +--
 .../xml/BranchStepJobParserTests-context.xml  | 12 ++--
 .../xml/DecisionJobParserTests-context.xml    |  8 +--
 .../DefaultFailureJobParserTests-context.xml  |  4 +-
 .../DefaultSuccessJobParserTests-context.xml  |  4 +-
 ...licateTransitionJobParserTests-context.xml |  2 +-
 ...ionDefaultStatusJobParserTests-context.xml |  2 +-
 .../EndTransitionJobParserTests-context.xml   |  4 +-
 ...ionDefaultStatusJobParserTests-context.xml |  2 +-
 .../FailTransitionJobParserTests-context.xml  |  4 +-
 ...obExecutionListenerParserTests-context.xml |  4 +-
 ...teDefaultFailureJobParserTests-context.xml |  4 +-
 .../NextAttributeJobParserTests-context.xml   |  4 +-
 ...uteMultipleFinalJobParserTests-context.xml |  8 +--
 .../xml/OneStepJobParserTests-context.xml     |  2 +-
 .../xml/RepositoryJobParserTests-context.xml  |  2 +-
 ...ResultsFailFirstJobParserTests-context.xml |  4 +-
 ...esultsFailSecondJobParserTests-context.xml |  8 +--
 .../xml/SplitJobParserTests-context.xml       | 10 +--
 ...tepParserBadRetryListenerTests-context.xml |  2 +-
 ...StepParserBadStepListenerTests-context.xml |  2 +-
 .../xml/StepParserBeanNameTests-context.xml   | 19 +-----
 ...epParserTaskletAttributesTests-context.xml |  2 +-
 ...BasicProcessTaskJobParserTests-context.xml |  2 +-
 ...erantProcessTaskJobParserTests-context.xml |  2 +-
 ...epWithSimpleTaskJobParserTests-context.xml |  4 +-
 .../StopIncompleteJobParserTests-context.xml  |  6 +-
 .../xml/StopJobParserTests-context.xml        |  6 +-
 .../xml/TwoStepJobParserTests-context.xml     |  6 +-
 .../src/main/resources/jobs/adhocLoopJob.xml  |  2 +-
 .../jobs/beanWrapperMapperSampleJob.xml       |  4 +-
 .../jobs/compositeItemWriterSampleJob.xml     |  2 +-
 .../main/resources/jobs/customerFilterJob.xml |  2 +-
 .../src/main/resources/jobs/delegatingJob.xml |  2 +-
 .../src/main/resources/jobs/footballJob.xml   |  6 +-
 .../resources/jobs/headerFooterSample.xml     |  2 +-
 .../src/main/resources/jobs/hibernateJob.xml  |  2 +-
 .../src/main/resources/jobs/ioSampleJob.xml   |  2 +-
 .../resources/jobs/iosample/multiLine.xml     |  2 +-
 .../jobs/iosample/multiRecordType.xml         |  2 +-
 .../main/resources/jobs/loopFlowSample.xml    |  4 +-
 .../src/main/resources/jobs/multilineJob.xml  |  2 +-
 .../main/resources/jobs/multilineOrderJob.xml |  2 +-
 .../src/main/resources/jobs/parallelJob.xml   |  4 +-
 .../src/main/resources/jobs/restartSample.xml |  2 +-
 .../src/main/resources/jobs/retrySample.xml   |  2 +-
 .../src/main/resources/jobs/skipSampleJob.xml |  8 +--
 .../src/main/resources/jobs/tradeJob.xml      |  6 +-
 .../src/test/resources/jobs/sampleFlowJob.xml | 22 +++++--
 63 files changed, 251 insertions(+), 171 deletions(-)
 create mode 100644 spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/DelegatingStep.java

diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/DelegatingStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/DelegatingStep.java
new file mode 100644
index 000000000..02e52af42
--- /dev/null
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/DelegatingStep.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2006-2009 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.batch.core.configuration.xml;
+
+import org.springframework.batch.core.JobInterruptedException;
+import org.springframework.batch.core.Step;
+import org.springframework.batch.core.StepExecution;
+
+/**
+ * Class used for delegating from a <step> definition to an individual bean
+ * defining the actual step. This is needed to maintain the id from the <step>
+ * element for any flow references.
+ * 
+ * @author Thomas Risberg
+ * @since 2.0
+ */
+public class DelegatingStep implements Step {
+	
+	String name;
+	Step delegate;
+	
+	/**
+	 * Constructor taking the step name and the delegate as parameters.
+	 * 
+	 * @param name the name to be used for the step
+	 * @param delegate the step definition to delegate to
+	 */
+	public DelegatingStep(String name, Step delegate) {
+		this.name = name;
+		this.delegate = delegate;
+	}
+
+	public void execute(StepExecution stepExecution)
+			throws JobInterruptedException {
+		delegate.execute(stepExecution);
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public int getStartLimit() {
+		return delegate.getStartLimit();
+	}
+
+	public boolean isAllowStartIfComplete() {
+		return delegate.isAllowStartIfComplete();
+	}
+
+}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/InlineStepParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/InlineStepParser.java
index 4ada422a8..4d25143e4 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/InlineStepParser.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/InlineStepParser.java
@@ -54,28 +54,43 @@ public class InlineStepParser extends AbstractStepParser {
 
 		BeanDefinitionBuilder stateBuilder = 
 			BeanDefinitionBuilder.genericBeanDefinition("org.springframework.batch.core.job.flow.support.state.StepState");
-		String stepRef = element.getAttribute("name");
+		String stepId = element.getAttribute("id");
+		String stepRef = element.getAttribute("ref");
 		String taskletRef = element.getAttribute("tasklet");
 
-		if (!StringUtils.hasText(stepRef)) {
-			parserContext.getReaderContext().error("The name attribute can't be empty for <" + element.getNodeName() + ">", element);
-		}
-		
 		@SuppressWarnings("unchecked")
-		List<Element> processTaskElements = (List<Element>) DomUtils.getChildElementsByTagName(element, "tasklet");
-		if (StringUtils.hasText(taskletRef)) {
+		List<Element> listOfTaskElements = (List<Element>) DomUtils.getChildElementsByTagName(element, "tasklet");
+		if (StringUtils.hasText(stepRef)) {
+			if (StringUtils.hasText(taskletRef)) {
+				parserContext.getReaderContext().error("The 'tasklet' attribute can't be combined with the 'ref=\""+ stepRef +"\"' attribute specification for <" + element.getNodeName() + ">", element);
+			}
+			if (listOfTaskElements.size() > 0) {
+				parserContext.getReaderContext().error("The <" + listOfTaskElements.get(0).getNodeName() +
+						"> element can't be combined with the 'ref=\""+ stepRef +"\"' attribute specification for <" + element.getNodeName() + ">", element);
+			}
+			BeanDefinitionBuilder stepBuilder = 
+				BeanDefinitionBuilder.genericBeanDefinition("org.springframework.batch.core.configuration.xml.DelegatingStep");
+			stepBuilder.addConstructorArgValue(stepId);
+			stepBuilder.addConstructorArgReference(stepRef);
+			AbstractBeanDefinition bd = stepBuilder.getBeanDefinition();
+	        bd.setSource(parserContext.extractSource(element));
+			parserContext.getRegistry().registerBeanDefinition(stepId, bd);
+			stateBuilder.addConstructorArgReference(stepId);
+		}
+		else if (StringUtils.hasText(taskletRef)) {
+			if (listOfTaskElements.size() > 0) {
+				parserContext.getReaderContext().error("The <" + listOfTaskElements.get(0).getNodeName() +
+						"> element can't be combined with the 'tasklet=\""+ taskletRef +"\"' attribute specification for <" + element.getNodeName() + ">", element);
+			}
 			AbstractBeanDefinition bd = parseTaskletRef(element, taskletRef, parserContext, jobRepositoryRef);
-			parserContext.registerBeanComponent(new BeanComponentDefinition(bd, stepRef));
-			stateBuilder.addConstructorArgReference(stepRef);
+			parserContext.registerBeanComponent(new BeanComponentDefinition(bd, stepId));
+			stateBuilder.addConstructorArgReference(stepId);
 		}
-		else if (processTaskElements.size() > 0) {
-			Element taskElement = processTaskElements.get(0);
+		else if (listOfTaskElements.size() > 0) {
+			Element taskElement = listOfTaskElements.get(0);
 			AbstractBeanDefinition bd = parseTaskletElement(element, taskElement, parserContext, jobRepositoryRef);
-			parserContext.registerBeanComponent(new BeanComponentDefinition(bd, stepRef));
-			stateBuilder.addConstructorArgReference(stepRef);
-		}
-		else if (StringUtils.hasText(stepRef)) {
-				stateBuilder.addConstructorArgReference(stepRef);
+			parserContext.registerBeanComponent(new BeanComponentDefinition(bd, stepId));
+			stateBuilder.addConstructorArgReference(stepId);
 		}
 		else {
 			parserContext.getReaderContext().error("Incomplete configuration detected while creating step with name " + stepRef, element);
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd b/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd
index 30bfd842f..4075b222d 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd
@@ -148,7 +148,8 @@
 					<xsd:complexType>
 						<xsd:complexContent>
 							<xsd:extension base="stepType">
-								<xsd:attribute name="name" type="xsd:string" use="required" >
+								<xsd:attribute name="id" type="xsd:ID" use="required" />
+								<xsd:attribute name="ref" type="xsd:string" use="optional" >
 									<xsd:annotation>
 										<xsd:documentation>
 										The step name attribute defines the name for the step. It can be used as 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/BranchStepJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/BranchStepJobParserTests.java
index 448607d31..8f9c37684 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/BranchStepJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/BranchStepJobParserTests.java
@@ -67,7 +67,7 @@ public class BranchStepJobParserTests {
 		for (StepExecution stepExecution : jobExecution.getStepExecutions()) {
 			names.add(stepExecution.getStepName());
 		}
-		assertTrue(names.contains("step3"));
-		assertFalse(names.contains("step2"));
+		assertTrue(names.contains("s3"));
+		assertFalse(names.contains("s2"));
 	}
 }
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultFailureJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultFailureJobParserTests.java
index f19fb04a1..574f48741 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultFailureJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultFailureJobParserTests.java
@@ -41,17 +41,17 @@ public class DefaultFailureJobParserTests extends AbstractJobParserTests {
 		JobExecution jobExecution = createJobExecution();
 		job.execute(jobExecution);
 		assertEquals(2, stepNamesList.size());
-		assertTrue(stepNamesList.contains("step1"));
-		assertTrue(stepNamesList.contains("failingStep"));
+		assertTrue(stepNamesList.contains("s1"));
+		assertTrue(stepNamesList.contains("fail"));
 
 		assertEquals(BatchStatus.FAILED, jobExecution.getStatus());
 		assertEquals(ExitStatus.FAILED, jobExecution.getExitStatus());
 
-		StepExecution stepExecution1 = getStepExecution(jobExecution, "step1");
+		StepExecution stepExecution1 = getStepExecution(jobExecution, "s1");
 		assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus());
 		assertEquals(ExitStatus.COMPLETED, stepExecution1.getExitStatus());
 
-		StepExecution stepExecution2 = getStepExecution(jobExecution, "failingStep");
+		StepExecution stepExecution2 = getStepExecution(jobExecution, "fail");
 		assertEquals(BatchStatus.FAILED, stepExecution2.getStatus());
 		assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution2.getExitStatus().getExitCode());
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultSuccessJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultSuccessJobParserTests.java
index ef8487768..f633ee7db 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultSuccessJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DefaultSuccessJobParserTests.java
@@ -41,17 +41,17 @@ public class DefaultSuccessJobParserTests extends AbstractJobParserTests {
 		JobExecution jobExecution = createJobExecution();
 		job.execute(jobExecution);
 		assertEquals(2, stepNamesList.size());
-		assertTrue(stepNamesList.contains("step1"));
-		assertTrue(stepNamesList.contains("step2"));
+		assertTrue(stepNamesList.contains("s1"));
+		assertTrue(stepNamesList.contains("s2"));
 
 		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
 		assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
 
-		StepExecution stepExecution1 = getStepExecution(jobExecution, "step1");
+		StepExecution stepExecution1 = getStepExecution(jobExecution, "s1");
 		assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus());
 		assertEquals(ExitStatus.COMPLETED, stepExecution1.getExitStatus());
 
-		StepExecution stepExecution2 = getStepExecution(jobExecution, "step2");
+		StepExecution stepExecution2 = getStepExecution(jobExecution, "s2");
 		assertEquals(BatchStatus.COMPLETED, stepExecution2.getStatus());
 		assertEquals(ExitStatus.COMPLETED, stepExecution2.getExitStatus());
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests.java
index 33d7b1425..6eab69b15 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests.java
@@ -41,12 +41,12 @@ public class EndTransitionDefaultStatusJobParserTests extends AbstractJobParserT
 		JobExecution jobExecution = createJobExecution();
 		job.execute(jobExecution);
 		assertEquals(1, stepNamesList.size());
-		assertTrue(stepNamesList.contains("failingStep"));
+		assertTrue(stepNamesList.contains("fail"));
 
 		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
 		assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
 
-		StepExecution stepExecution1 = getStepExecution(jobExecution, "failingStep");
+		StepExecution stepExecution1 = getStepExecution(jobExecution, "fail");
 		assertEquals(BatchStatus.FAILED, stepExecution1.getStatus());
 		assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution1.getExitStatus().getExitCode());
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests.java
index c1a2b881c..4ca7874fa 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests.java
@@ -46,17 +46,17 @@ public class EndTransitionJobParserTests extends AbstractJobParserTests {
 		JobExecution jobExecution = createJobExecution();
 		job.execute(jobExecution);
 		assertEquals(2, stepNamesList.size());
-		assertTrue(stepNamesList.contains("step1"));
-		assertTrue(stepNamesList.contains("failingStep"));
+		assertTrue(stepNamesList.contains("s1"));
+		assertTrue(stepNamesList.contains("fail"));
 
 		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
 		assertEquals("EARLY TERMINATION (FAIL)", jobExecution.getExitStatus().getExitCode());
 
-		StepExecution stepExecution1 = getStepExecution(jobExecution, "step1");
+		StepExecution stepExecution1 = getStepExecution(jobExecution, "s1");
 		assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus());
 		assertEquals(ExitStatus.COMPLETED, stepExecution1.getExitStatus());
 
-		StepExecution stepExecution2 = getStepExecution(jobExecution, "failingStep");
+		StepExecution stepExecution2 = getStepExecution(jobExecution, "fail");
 		assertEquals(BatchStatus.FAILED, stepExecution2.getStatus());
 		assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution2.getExitStatus().getExitCode());
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests.java
index 80d7c9444..0971c0517 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests.java
@@ -41,12 +41,12 @@ public class FailTransitionDefaultStatusJobParserTests extends AbstractJobParser
 		JobExecution jobExecution = createJobExecution();
 		job.execute(jobExecution);
 		assertEquals(1, stepNamesList.size());
-		assertTrue(stepNamesList.contains("step1"));
+		assertTrue(stepNamesList.contains("s1"));
 
 		assertEquals(BatchStatus.FAILED, jobExecution.getStatus());
 		assertEquals(ExitStatus.FAILED, jobExecution.getExitStatus());
 
-		StepExecution stepExecution1 = getStepExecution(jobExecution, "step1");
+		StepExecution stepExecution1 = getStepExecution(jobExecution, "s1");
 		assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus());
 		assertEquals(ExitStatus.COMPLETED, stepExecution1.getExitStatus());
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests.java
index 1383c7611..c5108d5a4 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests.java
@@ -44,17 +44,17 @@ public class FailTransitionJobParserTests extends AbstractJobParserTests {
 		JobExecution jobExecution = createJobExecution();
 		job.execute(jobExecution);
 		assertEquals(2, stepNamesList.size());
-		assertTrue(stepNamesList.contains("step1"));
-		assertTrue(stepNamesList.contains("failingStep"));
+		assertTrue(stepNamesList.contains("s1"));
+		assertTrue(stepNamesList.contains("fail"));
 
 		assertEquals(BatchStatus.FAILED, jobExecution.getStatus());
 		assertEquals("EARLY TERMINATION (FAIL)", jobExecution.getExitStatus().getExitCode());
 
-		StepExecution stepExecution1 = getStepExecution(jobExecution, "step1");
+		StepExecution stepExecution1 = getStepExecution(jobExecution, "s1");
 		assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus());
 		assertEquals(ExitStatus.COMPLETED, stepExecution1.getExitStatus());
 
-		StepExecution stepExecution2 = getStepExecution(jobExecution, "failingStep");
+		StepExecution stepExecution2 = getStepExecution(jobExecution, "fail");
 		assertEquals(BatchStatus.FAILED, stepExecution2.getStatus());
 		assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution2.getExitStatus().getExitCode());
 
@@ -65,12 +65,12 @@ public class FailTransitionJobParserTests extends AbstractJobParserTests {
 		jobExecution = createJobExecution();
 		job.execute(jobExecution);
 		assertEquals(1, stepNamesList.size()); // step1 is not executed
-		assertTrue(stepNamesList.contains("failingStep"));
+		assertTrue(stepNamesList.contains("fail"));
 
 		assertEquals(BatchStatus.FAILED, jobExecution.getStatus());
 		assertEquals("EARLY TERMINATION (FAIL)", jobExecution.getExitStatus().getExitCode());
 
-		StepExecution stepExecution3 = getStepExecution(jobExecution, "failingStep");
+		StepExecution stepExecution3 = getStepExecution(jobExecution, "fail");
 		assertEquals(BatchStatus.FAILED, stepExecution3.getStatus());
 		assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution3.getExitStatus().getExitCode());
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailFirstJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailFirstJobParserTests.java
index 2b81fa0b1..c1b18de63 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailFirstJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailFirstJobParserTests.java
@@ -41,17 +41,17 @@ public class SplitDifferentResultsFailFirstJobParserTests extends AbstractJobPar
 		JobExecution jobExecution = createJobExecution();
 		job.execute(jobExecution);
 		assertEquals(2, stepNamesList.size());
-		assertTrue(stepNamesList.contains("step1"));
-		assertTrue(stepNamesList.contains("failingStep"));
+		assertTrue(stepNamesList.contains("s1"));
+		assertTrue(stepNamesList.contains("fail"));
 
 		assertEquals(BatchStatus.FAILED, jobExecution.getStatus());
 		assertEquals(ExitStatus.FAILED, jobExecution.getExitStatus());
 
-		StepExecution stepExecution1 = getStepExecution(jobExecution, "step1");
+		StepExecution stepExecution1 = getStepExecution(jobExecution, "s1");
 		assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus());
 		assertEquals(ExitStatus.COMPLETED, stepExecution1.getExitStatus());
 
-		StepExecution stepExecution2 = getStepExecution(jobExecution, "failingStep");
+		StepExecution stepExecution2 = getStepExecution(jobExecution, "fail");
 		assertEquals(BatchStatus.FAILED, stepExecution2.getStatus());
 		assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution2.getExitStatus().getExitCode());
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailSecondJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailSecondJobParserTests.java
index 87cbe8152..3c88e182b 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailSecondJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailSecondJobParserTests.java
@@ -41,22 +41,22 @@ public class SplitDifferentResultsFailSecondJobParserTests extends AbstractJobPa
 		JobExecution jobExecution = createJobExecution();
 		job.execute(jobExecution);
 		assertEquals(3, stepNamesList.size());
-		assertTrue(stepNamesList.contains("step1"));
-		assertTrue(stepNamesList.contains("failingStep"));
-		assertTrue(stepNamesList.contains("step3"));
+		assertTrue(stepNamesList.contains("s1"));
+		assertTrue(stepNamesList.contains("fail"));
+		assertTrue(stepNamesList.contains("s3"));
 
 		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
 		assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
 
-		StepExecution stepExecution1 = getStepExecution(jobExecution, "step1");
+		StepExecution stepExecution1 = getStepExecution(jobExecution, "s1");
 		assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus());
 		assertEquals(ExitStatus.COMPLETED, stepExecution1.getExitStatus());
 
-		StepExecution stepExecution2 = getStepExecution(jobExecution, "failingStep");
+		StepExecution stepExecution2 = getStepExecution(jobExecution, "fail");
 		assertEquals(BatchStatus.FAILED, stepExecution2.getStatus());
 		assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution2.getExitStatus().getExitCode());
 
-		StepExecution stepExecution3 = getStepExecution(jobExecution, "step3");
+		StepExecution stepExecution3 = getStepExecution(jobExecution, "s3");
 		assertEquals(BatchStatus.COMPLETED, stepExecution3.getStatus());
 		assertEquals(ExitStatus.COMPLETED, stepExecution3.getExitStatus());
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java
index dfdc68138..1a16743d6 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java
@@ -53,8 +53,9 @@ public class StepParserTests {
 		ConfigurableApplicationContext ctx = 
 			new ClassPathXmlApplicationContext("org/springframework/batch/core/configuration/xml/StepParserBeanNameTests-context.xml");
 		Map<String, Object> beans = ctx.getBeansOfType(Step.class);
-		assertTrue("'step1' bean not found", beans.containsKey("step1"));
-		assertTrue("'step2' bean not found", beans.containsKey("step2"));
+		assertTrue("'s1' bean not found", beans.containsKey("s1"));
+		Step s1 = (Step)ctx.getBean("s1");
+		assertEquals("wrong name", "s1", s1.getName());
 	}
 
 	@Test
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopIncompleteJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopIncompleteJobParserTests.java
index 0b33319dc..202591aab 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopIncompleteJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopIncompleteJobParserTests.java
@@ -45,12 +45,12 @@ public class StopIncompleteJobParserTests extends AbstractJobParserTests {
 		JobExecution jobExecution = createJobExecution();
 		job.execute(jobExecution);
 		assertEquals(1, stepNamesList.size());
-		assertTrue(stepNamesList.contains("failingStep"));
+		assertTrue(stepNamesList.contains("fail"));
 
 		assertEquals(BatchStatus.STOPPED, jobExecution.getStatus());
 		assertEquals(ExitStatus.FAILED.getExitCode(), jobExecution.getExitStatus().getExitCode());
 
-		StepExecution stepExecution1 = getStepExecution(jobExecution, "failingStep");
+		StepExecution stepExecution1 = getStepExecution(jobExecution, "fail");
 		assertEquals(BatchStatus.INCOMPLETE, stepExecution1.getStatus());
 		assertEquals(ExitStatus.FAILED.getExitCode(), stepExecution1.getExitStatus().getExitCode());
 
@@ -61,12 +61,12 @@ public class StopIncompleteJobParserTests extends AbstractJobParserTests {
 		jobExecution = createJobExecution();
 		job.execute(jobExecution);
 		assertEquals(1, stepNamesList.size()); // step1 is not executed
-		assertTrue(stepNamesList.contains("step2"));
+		assertTrue(stepNamesList.contains("s2"));
 
 		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
 		assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
 
-		StepExecution stepExecution2 = getStepExecution(jobExecution, "step2");
+		StepExecution stepExecution2 = getStepExecution(jobExecution, "s2");
 		assertEquals(BatchStatus.COMPLETED, stepExecution2.getStatus());
 		assertEquals(ExitStatus.COMPLETED, stepExecution2.getExitStatus());
 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopJobParserTests.java
index 92c0ef7a0..39601d82e 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopJobParserTests.java
@@ -45,12 +45,12 @@ public class StopJobParserTests extends AbstractJobParserTests {
 		JobExecution jobExecution = createJobExecution();
 		job.execute(jobExecution);
 		assertEquals(1, stepNamesList.size());
-		assertTrue(stepNamesList.contains("step1"));
+		assertTrue(stepNamesList.contains("s1"));
 
 		assertEquals(BatchStatus.STOPPED, jobExecution.getStatus());
 		assertEquals(ExitStatus.FAILED.getExitCode(), jobExecution.getExitStatus().getExitCode());
 
-		StepExecution stepExecution1 = getStepExecution(jobExecution, "step1");
+		StepExecution stepExecution1 = getStepExecution(jobExecution, "s1");
 		assertEquals(BatchStatus.COMPLETED, stepExecution1.getStatus());
 		assertEquals(ExitStatus.COMPLETED, stepExecution1.getExitStatus());
 
@@ -61,12 +61,12 @@ public class StopJobParserTests extends AbstractJobParserTests {
 		jobExecution = createJobExecution();
 		job.execute(jobExecution);
 		assertEquals(1, stepNamesList.size()); // step1 is not executed
-		assertTrue(stepNamesList.contains("step2"));
+		assertTrue(stepNamesList.contains("s2"));
 
 		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
 		assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus());
 
-		StepExecution stepExecution2 = getStepExecution(jobExecution, "step2");
+		StepExecution stepExecution2 = getStepExecution(jobExecution, "s2");
 		assertEquals(BatchStatus.COMPLETED, stepExecution2.getStatus());
 		assertEquals(ExitStatus.COMPLETED, stepExecution2.getExitStatus());
 
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/BranchStepJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/BranchStepJobParserTests-context.xml
index b041d470d..3baab01b4 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/BranchStepJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/BranchStepJobParserTests-context.xml
@@ -7,12 +7,12 @@
 	<beans:import resource="common-context.xml" />
 	
 	<job id="job">
-		<step name="step1">
-			<next on="FAILED" to="step2" />
-			<next on="*" to="step3" />
+		<step id="s1" ref="step1">
+			<next on="FAILED" to="s2" />
+			<next on="*" to="s3" />
 		</step>
-		<step name="step2" />
-		<step name="step3" />
+		<step id="s2" ref="step2"/>
+		<step id="s3" ref="step3"/>
 	</job>
-
+	
 </beans:beans>
\ No newline at end of file
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/DecisionJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/DecisionJobParserTests-context.xml
index 4bb1dc5c1..857913c0b 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/DecisionJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/DecisionJobParserTests-context.xml
@@ -10,11 +10,11 @@
 	
 	<job id="job">
 		<decision id="decision" decider="decider">
-			<next on="FOO" to="step1"/>
-			<next on="*" to="step2"/>
+			<next on="FOO" to="s1"/>
+			<next on="*" to="s2"/>
 		</decision>
-		<step name="step1" />
-		<step name="step2" />
+		<step id="s1" ref="step1" />
+		<step id="s2" ref="step2" />
 	</job>
 
 </beans:beans>
\ No newline at end of file
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/DefaultFailureJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/DefaultFailureJobParserTests-context.xml
index 4eb7fdecc..854e457fc 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/DefaultFailureJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/DefaultFailureJobParserTests-context.xml
@@ -9,8 +9,8 @@
 	<beans:import resource="common-context.xml" />
 	
 	<job id="job">
-		<step name="step1" next="failingStep"/>
-		<step name="failingStep" />
+		<step id="s1" ref="step1" next="fail"/>
+		<step id="fail" ref="failingStep"/>
 	</job>
 
 </beans:beans>
\ No newline at end of file
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/DefaultSuccessJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/DefaultSuccessJobParserTests-context.xml
index 71da3fab4..c2698e5a3 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/DefaultSuccessJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/DefaultSuccessJobParserTests-context.xml
@@ -9,8 +9,8 @@
 	<beans:import resource="common-context.xml" />
 	
 	<job id="job">
-		<step name="step1" next="step2"/>
-		<step name="step2" />
+		<step id="s1" ref="step1" next="s2"/>
+		<step id="s2" ref="step2"/>
 	</job>
 
 </beans:beans>
\ No newline at end of file
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/DuplicateTransitionJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/DuplicateTransitionJobParserTests-context.xml
index 5b2717b05..22f1e8416 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/DuplicateTransitionJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/DuplicateTransitionJobParserTests-context.xml
@@ -9,7 +9,7 @@
 	<beans:import resource="common-context.xml" />
 	
 	<job id="job">
-		<step name="step1">
+		<step id="s1" ref="step1">
 			<end on="COMPLETED"/>
 			<fail on="COMPLETED"/>
 		</step>
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests-context.xml
index 83e6ca1d7..d37037482 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionDefaultStatusJobParserTests-context.xml
@@ -9,7 +9,7 @@
 	<beans:import resource="common-context.xml" />
 	
 	<job id="job">
-		<step name="failingStep">
+		<step id="fail" ref="failingStep">
 			<end on="*" />
 		</step>
 	</job>
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests-context.xml
index 18bb5f0bf..43b73538a 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/EndTransitionJobParserTests-context.xml
@@ -9,8 +9,8 @@
 	<beans:import resource="common-context.xml" />
 	
 	<job id="job">
-		<step name="step1" next="failingStep"/>
-		<step name="failingStep">
+		<step id="s1" ref="step1" next="fail"/>
+		<step id="fail" ref="failingStep">
 			<end on="*" status="EARLY TERMINATION (FAIL)"/>
 		</step>
 	</job>
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests-context.xml
index 441f6df04..916e5545c 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/FailTransitionDefaultStatusJobParserTests-context.xml
@@ -9,7 +9,7 @@
 	<beans:import resource="common-context.xml" />
 	
 	<job id="job">
-		<step name="step1">
+		<step id="s1" ref="step1">
 			<fail on="*" />
 		</step>
 	</job>
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests-context.xml
index b0b06df67..a163d4432 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/FailTransitionJobParserTests-context.xml
@@ -9,8 +9,8 @@
 	<beans:import resource="common-context.xml" />
 	
 	<job id="job">
-		<step name="step1" next="failingStep"/>
-		<step name="failingStep">
+		<step id="s1" ref="step1" next="fail"/>
+		<step id="fail" ref="failingStep">
 			<fail on="FAILED" status="EARLY TERMINATION (FAIL)"/>
 		</step>
 	</job>
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/JobExecutionListenerParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/JobExecutionListenerParserTests-context.xml
index 005494f21..0d759ae09 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/JobExecutionListenerParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/JobExecutionListenerParserTests-context.xml
@@ -7,7 +7,7 @@
 	<beans:import resource="common-context.xml" />
 	
 	<job id="job" incrementer="testIncrementer" job-repository="jobRepository">
-		<step name="step1" tasklet="tasklet"/>
+		<step id="s1" ref="step1"/>
 		<listeners>
 			<listener after-method="afterJob" ref="testListener"/>
 			<listener after-method="afterJob" class="org.springframework.batch.core.configuration.xml.TestJobListener"/>
@@ -15,8 +15,6 @@
 		</listeners>
 	</job>
 
-	<beans:bean id="tasklet" class="org.springframework.batch.core.configuration.xml.TestTasklet"/>
-
 	<beans:bean id="testListener" class="org.springframework.batch.core.configuration.xml.TestJobListener" />
 	
 	<beans:bean id="testIncrementer" class="org.springframework.batch.core.configuration.xml.TestIncrementer" />
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/NextAttributeDefaultFailureJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/NextAttributeDefaultFailureJobParserTests-context.xml
index 2a6dea23f..bb3a2c74d 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/NextAttributeDefaultFailureJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/NextAttributeDefaultFailureJobParserTests-context.xml
@@ -9,8 +9,8 @@
 	<beans:import resource="common-context.xml" />
 	
 	<job id="job">
-		<step name="failingStep" next="step2"/>
-		<step name="step2" />
+		<step id="fail" ref="failingStep" next="s2"/>
+		<step id="s2" ref="step2"/>
 	</job>
 
 </beans:beans>
\ No newline at end of file
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/NextAttributeJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/NextAttributeJobParserTests-context.xml
index 691305b79..924ddf420 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/NextAttributeJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/NextAttributeJobParserTests-context.xml
@@ -7,8 +7,8 @@
 	<beans:import resource="common-context.xml" />
 	
 	<job id="job">
-		<step name="step1" next="step2"/>
-		<step name="step2" />
+		<step id="s1" ref="step1" next="s2"/>
+		<step id="s2" ref="step2"/>
 	</job>
 
 </beans:beans>
\ No newline at end of file
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/NextAttributeMultipleFinalJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/NextAttributeMultipleFinalJobParserTests-context.xml
index a448bcee8..6087e27cb 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/NextAttributeMultipleFinalJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/NextAttributeMultipleFinalJobParserTests-context.xml
@@ -7,11 +7,11 @@
 	<beans:import resource="common-context.xml" />
 	
 	<job id="job">
-		<step name="step1" next="step3">
-			<next on="COMPLETED WITH SKIPS" to="step2" />
+		<step id="s1" ref="step1" next="s3">
+			<next on="COMPLETED WITH SKIPS" to="s2" />
 		</step>
-		<step name="step2" />
-		<step name="step3" />
+		<step id="s2" ref="step2"/>
+		<step id="s3" ref="step3"/>
 	</job>
 
 </beans:beans>
\ No newline at end of file
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/OneStepJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/OneStepJobParserTests-context.xml
index 652a71df4..b690906f5 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/OneStepJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/OneStepJobParserTests-context.xml
@@ -7,7 +7,7 @@
 	<beans:import resource="common-context.xml" />
 	
 	<job id="job">
-		<step name="step1" />
+		<step id="s1" ref="step1" />
 	</job>
 
 </beans:beans>
\ No newline at end of file
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/RepositoryJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/RepositoryJobParserTests-context.xml
index 089465c13..c805fbed6 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/RepositoryJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/RepositoryJobParserTests-context.xml
@@ -21,7 +21,7 @@
 	</beans:bean>
 
 	<job id="job" job-repository="thisRepository">
-		<step name="step1" />
+		<step id="s1" ref="step1" />
 	</job>
 
 </beans:beans>
\ No newline at end of file
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailFirstJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailFirstJobParserTests-context.xml
index 5c5714311..6da34435b 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailFirstJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailFirstJobParserTests-context.xml
@@ -11,10 +11,10 @@
 	<job id="job">
 		<split id="split1">
 			<flow>
-				<step name="failingStep"/>
+				<step id="fail" ref="failingStep"/>
 			</flow>
 			<flow>
-				<step name="step1"/>
+				<step id="s1" ref="step1"/>
 			</flow>
 		</split>
 	</job>
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailSecondJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailSecondJobParserTests-context.xml
index 968404df1..69316beff 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailSecondJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/SplitDifferentResultsFailSecondJobParserTests-context.xml
@@ -10,17 +10,17 @@
 	
 	<job id="job">
 		<split id="split1">
-			<next on="FAILED" to="step3"/>
+			<next on="FAILED" to="s3"/>
 			<fail on="COMPLETED" />
 
 			<flow>
-				<step name="step1"/>
+				<step id="s1" ref="step1"/>
 			</flow>
 			<flow>
-				<step name="failingStep"/>
+				<step id="fail" ref="failingStep"/>
 			</flow>
 		</split>
-		<step name="step3"/>
+		<step id="s3" ref="step3"/>
 	</job>
 
 </beans:beans>
\ No newline at end of file
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/SplitJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/SplitJobParserTests-context.xml
index 6bf996787..ea2f3f5ea 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/SplitJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/SplitJobParserTests-context.xml
@@ -7,16 +7,16 @@
 	<beans:import resource="common-context.xml" />
 
 	<job id="job">
-		<split id="split" next="step4">
+		<split id="split" next="s4">
 			<flow>
-				<step name="step1" next="step2"/>
-				<step name="step2" />
+				<step id="s1" ref="step1" next="s2"/>
+				<step id="s2" ref="step2" />
 			</flow>
 			<flow>
-				<step name="step3" />
+				<step id="s3" ref="step3" />
 			</flow>
 		</split>
-		<step name="step4" />
+		<step id="s4" ref="step4" />
 	</job>
 
 </beans:beans>
\ No newline at end of file
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBadRetryListenerTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBadRetryListenerTests-context.xml
index f8972126c..fd09e41e2 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBadRetryListenerTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBadRetryListenerTests-context.xml
@@ -7,7 +7,7 @@
 	<beans:import resource="common-context.xml" />
 	
 	<job id="job">
-		<step name="step">
+		<step id="step">
 			<tasklet reader="reader" processor="processor" writer="writer"
 					commit-interval="10" skip-limit="20" 
 					retry-limit="3" cache-capacity="100"
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBadStepListenerTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBadStepListenerTests-context.xml
index cae1ad809..90d7b66e9 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBadStepListenerTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBadStepListenerTests-context.xml
@@ -7,7 +7,7 @@
 	<beans:import resource="common-context.xml" />
 	
 	<job id="job">
-		<step name="ft-step" tasklet="tasklet">
+		<step id="ft-step" tasklet="tasklet">
 			<listeners>
 				<listener ref="listener" class="org.springframework.batch.core.configuration.xml.TestListener"/>
 			</listeners>
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBeanNameTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBeanNameTests-context.xml
index a5df2be5a..517066416 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBeanNameTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBeanNameTests-context.xml
@@ -4,23 +4,10 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.0.xsd
 	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
+	<beans:import resource="common-context.xml" />
+
 	<job id="job">
-		<step name="step1" next="step2">
-			<tasklet reader="reader" writer="writer" commit-interval="10"/>
-		</step>
-		<step name="step2" tasklet="tasklet"/>
+		<step id="s1" ref="step2"/>
 	</job>
 
-	<beans:bean id="tasklet" class="org.springframework.batch.core.configuration.xml.TestTasklet"/>
-
-	<beans:bean id="reader" class="org.springframework.batch.core.configuration.xml.TestReader"/>
-	
-	<beans:bean id="writer" class="org.springframework.batch.core.configuration.xml.TestWriter"/>
-
-	<beans:bean id="transactionManager" class="org.springframework.batch.support.transaction.ResourcelessTransactionManager" />
-
-	<beans:bean id="jobRepository" class="org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean">
-		<beans:property name="transactionManager" ref="transactionManager" />
-	</beans:bean>
-
 </beans:beans>
\ No newline at end of file
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserTaskletAttributesTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserTaskletAttributesTests-context.xml
index 9c8c57839..bdeb12d2e 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserTaskletAttributesTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserTaskletAttributesTests-context.xml
@@ -5,7 +5,7 @@
 	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<job id="job">
-		<step name="step">
+		<step id="step">
 			<tasklet reader="reader" processor="processor" writer="writer"
 					start-limit="25" allow-start-if-complete="true"
 					commit-interval="10" skip-limit="20" 
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithBasicProcessTaskJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithBasicProcessTaskJobParserTests-context.xml
index 56ae98cfc..4ac8af32c 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithBasicProcessTaskJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithBasicProcessTaskJobParserTests-context.xml
@@ -7,7 +7,7 @@
 	<beans:import resource="common-context.xml" />
 	
 	<job id="job">
-		<step name="ft-step">
+		<step id="ft-step">
 			<tasklet reader="reader" processor="processor" writer="writer"
 					commit-interval="10">
 				<streams>
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests-context.xml
index c84ca113d..30019d02f 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests-context.xml
@@ -7,7 +7,7 @@
 	<beans:import resource="common-context.xml" />
 	
 	<job id="job">
-		<step name="step">
+		<step id="step">
 			<tasklet reader="reader" processor="processor" writer="writer"
 					commit-interval="10" skip-limit="20" 
 					retry-limit="3" cache-capacity="100"
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithSimpleTaskJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithSimpleTaskJobParserTests-context.xml
index 71ab090a3..96dd2fd8e 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithSimpleTaskJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithSimpleTaskJobParserTests-context.xml
@@ -7,10 +7,10 @@
 	<beans:import resource="common-context.xml" />
 	
 	<job id="job">
-		<step name="step1" tasklet="tasklet">
+		<step id="step1" tasklet="tasklet">
 			<next on="*" to="step2" />
 		</step>
-		<step name="step2" tasklet="tasklet">
+		<step id="step2" tasklet="tasklet">
 			<listeners>
 				<listener ref="listener"/>
 			</listeners>
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopIncompleteJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopIncompleteJobParserTests-context.xml
index 9ccbb8328..216784a07 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopIncompleteJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopIncompleteJobParserTests-context.xml
@@ -9,10 +9,10 @@
 	<beans:bean id="decider" class="org.springframework.batch.core.configuration.xml.StopJobParserTests$TestDecider"/>
 
 	<job id="job">
-		<step name="failingStep">
-			<pause on="FAILED" to="step2"/>
+		<step id="fail" ref="failingStep">
+			<pause on="FAILED" to="s2"/>
 		</step>
-		<step name="step2"/>
+		<step id="s2" ref="step2"/>
 	</job>
 
 </beans:beans>
\ No newline at end of file
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopJobParserTests-context.xml
index 208cd833a..6a8027ce0 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StopJobParserTests-context.xml
@@ -9,14 +9,14 @@
 	<beans:bean id="decider" class="org.springframework.batch.core.configuration.xml.StopJobParserTests$TestDecider"/>
 
 	<job id="job">
-		<step name="step1">
+		<step id="s1" ref="step1">
 			<pause on="COMPLETED" to="decision"/>
 		</step>
 		<decision id="decision" decider="decider">
-			<next on="FOO" to="step2"/>
+			<next on="FOO" to="s2"/>
 			<end on="*" status="FAILED"/>
 		</decision>
-		<step name="step2" />
+		<step id="s2" ref="step2"/>
 	</job>
 
 </beans:beans>
\ No newline at end of file
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/TwoStepJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/TwoStepJobParserTests-context.xml
index 6b3811ed7..354a8293d 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/TwoStepJobParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/TwoStepJobParserTests-context.xml
@@ -7,10 +7,10 @@
 	<beans:import resource="common-context.xml" />
 	
 	<job id="job">
-		<step name="step1">
-			<next on="*" to="step2" />
+		<step id="s1" ref="step1">
+			<next on="*" to="s2" />
 		</step>
-		<step name="step2" />
+		<step id="s2" ref="step2" />
 	</job>
 
 </beans:beans>
\ No newline at end of file
diff --git a/spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml b/spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml
index ab8fe3c04..042d58bde 100644
--- a/spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml
@@ -14,7 +14,7 @@
 		multiple environments. -->
 
 	<job id="loopJob" incrementer="jobParametersIncrementer">
-		<step name="step1">
+		<step id="step1">
 			<tasklet reader="reader" writer="writer" commit-interval="3"/>
 		</step>
 	</job>
diff --git a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
index d81e43ee2..d5f526ee0 100644
--- a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml
@@ -9,10 +9,10 @@
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
 
 	<job id="beanWrapperMapperJob">
-		<step name="step1" next="step2">
+		<step id="step1" next="step2">
 			<tasklet reader="tradeFileItemReader" processor="processor" writer="tradeWriter" commit-interval="1"></tasklet>
 		</step>
-		<step name="step2">
+		<step id="step2">
 			<tasklet reader="personFileItemReader" writer="personWriter" commit-interval="1"></tasklet>
 		</step>
 	</job>
diff --git a/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml
index 65f1b3ffc..3d40ae9d3 100644
--- a/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml
@@ -16,7 +16,7 @@
 	</beans:description>
 
 	<job id="compositeItemWriterJob">
-		<step name="step1">
+		<step id="step1">
 			<tasklet reader="fileItemReader" processor="processor" writer="compositeWriter" commit-interval="1">
 				<streams>
 					<stream ref="fileItemReader"/>
diff --git a/spring-batch-samples/src/main/resources/jobs/customerFilterJob.xml b/spring-batch-samples/src/main/resources/jobs/customerFilterJob.xml
index 927a72185..6ba952958 100644
--- a/spring-batch-samples/src/main/resources/jobs/customerFilterJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/customerFilterJob.xml
@@ -8,7 +8,7 @@
 		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.0.xsd">
 
 	<job id="customerFilterJob">
-		<step name="uploadCustomer">
+		<step id="uploadCustomer">
 			<tasklet reader="customerFileUploadReader" 
 			         processor="customerUpdateProcessor" 
 			         writer="customerUpdateWriter" 
diff --git a/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml b/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml
index 579c0e351..89e0ffb86 100644
--- a/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml
@@ -18,7 +18,7 @@
 	</beans:description>
 
 	<job id="delegateJob">
-		<step name="step1">
+		<step id="step1">
 			<tasklet reader="reader" writer="writer" commit-interval="1"/>
 		</step>
 	</job>
diff --git a/spring-batch-samples/src/main/resources/jobs/footballJob.xml b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
index 55e544a67..e537304b9 100644
--- a/spring-batch-samples/src/main/resources/jobs/footballJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
@@ -12,15 +12,15 @@
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
 
 	<job id="footballJob">
-		<step name="playerload" next="gameLoad">
+		<step id="playerload" next="gameLoad">
 			<tasklet reader="playerFileItemReader" writer="playerWriter" 
 			               commit-interval="${job.commit.interval}" />
 		</step>
-		<step name="gameLoad" next="playerSummarization">
+		<step id="gameLoad" next="playerSummarization">
 			<tasklet reader="gameFileItemReader" writer="gameWriter" 
 			               commit-interval="${job.commit.interval}" />
 		</step>
-		<step name="playerSummarization">
+		<step id="playerSummarization">
 			<tasklet reader="playerSummarizationSource" writer="summaryWriter" 
 			               commit-interval="${job.commit.interval}" />
 		</step>
diff --git a/spring-batch-samples/src/main/resources/jobs/headerFooterSample.xml b/spring-batch-samples/src/main/resources/jobs/headerFooterSample.xml
index 1ad084f6e..47ea26bf0 100644
--- a/spring-batch-samples/src/main/resources/jobs/headerFooterSample.xml
+++ b/spring-batch-samples/src/main/resources/jobs/headerFooterSample.xml
@@ -13,7 +13,7 @@
 	</beans:description>
 
 	<job id="headerFooterSample">
-		<step name="step1">
+		<step id="step1">
 			<tasklet reader="reader" writer="writer" commit-interval="3">
 				<streams>
 					<stream ref="reader"/>
diff --git a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
index 657cd623d..ce1794258 100644
--- a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml
@@ -11,7 +11,7 @@
 	<beans:description>Example for Hibernate integration.</beans:description>
 
 	<job id="hibernateJob" restartable="false">
-		<step name="step1">
+		<step id="step1">
 			<tasklet reader="hibernateItemReader" 
 			         processor="creditIncreaseProcessor" 
 			         writer="hibernateCreditWriter" 
diff --git a/spring-batch-samples/src/main/resources/jobs/ioSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/ioSampleJob.xml
index 93555dae3..2224154ab 100644
--- a/spring-batch-samples/src/main/resources/jobs/ioSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/ioSampleJob.xml
@@ -14,7 +14,7 @@
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
 
 	<job id="ioSampleJob">
-		<step name="step1">
+		<step id="step1">
 			<tasklet reader="itemReader" processor="itemProcessor" writer="itemWriter" commit-interval="2"/>
 		</step>
 	</job>
diff --git a/spring-batch-samples/src/main/resources/jobs/iosample/multiLine.xml b/spring-batch-samples/src/main/resources/jobs/iosample/multiLine.xml
index 955bc6c68..6a96ca97d 100644
--- a/spring-batch-samples/src/main/resources/jobs/iosample/multiLine.xml
+++ b/spring-batch-samples/src/main/resources/jobs/iosample/multiLine.xml
@@ -14,7 +14,7 @@
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
 		
 	<batch:job id="ioSampleJob">
-		<batch:step name="step1">
+		<batch:step id="step1">
 			<batch:tasklet reader="itemReader" writer="itemWriter" commit-interval="2"/>
 		</batch:step>
 	</batch:job>
diff --git a/spring-batch-samples/src/main/resources/jobs/iosample/multiRecordType.xml b/spring-batch-samples/src/main/resources/jobs/iosample/multiRecordType.xml
index c06a2b019..77abc6f86 100644
--- a/spring-batch-samples/src/main/resources/jobs/iosample/multiRecordType.xml
+++ b/spring-batch-samples/src/main/resources/jobs/iosample/multiRecordType.xml
@@ -14,7 +14,7 @@
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
 		
 	<batch:job id="ioSampleJob">
-		<batch:step name="step1">
+		<batch:step id="step1">
 			<batch:tasklet reader="itemReader" writer="itemWriter" commit-interval="2"/>
 		</batch:step>
 	</batch:job>
diff --git a/spring-batch-samples/src/main/resources/jobs/loopFlowSample.xml b/spring-batch-samples/src/main/resources/jobs/loopFlowSample.xml
index 48088d620..e740f7fba 100644
--- a/spring-batch-samples/src/main/resources/jobs/loopFlowSample.xml
+++ b/spring-batch-samples/src/main/resources/jobs/loopFlowSample.xml
@@ -12,13 +12,13 @@
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
 
 	<job id="loopFlowSample">
-		<step name="step1" next="step2">
+		<step id="step1" next="step2">
 			<tasklet reader="itemGenerator" writer="itemWriter" commit-interval="1"/>
 			<listeners>
 				<listener ref="resettingListener"/>
 			</listeners>
 		</step>
-		<step name="step2" next="limitDecision">
+		<step id="step2" next="limitDecision">
 			<tasklet reader="itemGenerator" writer="itemWriter" 
 			         commit-interval="1" allow-start-if-complete="true"/>
 			<listeners>
diff --git a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
index 965f7d3e8..0b4a9ec55 100644
--- a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml
@@ -11,7 +11,7 @@
  		http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<job id="multilineJob">
-		<step name="step1">
+		<step id="step1">
 			<tasklet reader="reader" writer="writer" commit-interval="1">
 				<streams>
 					<stream ref="fileItemReader"/>
diff --git a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
index 33be0d601..67e641655 100644
--- a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml
@@ -13,7 +13,7 @@
 	<beans:import resource="multilineOrderIo.xml" />
 
 	<job id="multilineOrderJob">
-		<step name="step1">
+		<step id="step1">
 			<tasklet reader="reader" processor="processor" writer="fileItemWriter" commit-interval="">
 				<streams>
 					<stream ref="fileItemWriter"/>
diff --git a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
index 3d5f1d6f3..008f794df 100644
--- a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
@@ -12,13 +12,13 @@
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
 
 	<job id="parallelJob">
-		<step name="staging" next="loading">
+		<step id="staging" next="loading">
 			<tasklet reader="fileItemReader" 
 			         processor="validatingProcessor" 
 			         writer="stagingItemWriter" 
 			         commit-interval="2"/>
 		</step>
-		<step name="loading">
+		<step id="loading">
 			<tasklet reader="stagingReader" 
 			         processor="stagingProcessor" 
 			         writer="tradeWriter" 
diff --git a/spring-batch-samples/src/main/resources/jobs/restartSample.xml b/spring-batch-samples/src/main/resources/jobs/restartSample.xml
index 6a701c7ac..7e6b9d7f0 100644
--- a/spring-batch-samples/src/main/resources/jobs/restartSample.xml
+++ b/spring-batch-samples/src/main/resources/jobs/restartSample.xml
@@ -12,7 +12,7 @@
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
 
 	<job id="restartSampleJob" restartable="true">
-		<step name="step1">
+		<step id="step1">
 			<tasklet reader="itemReader" processor="processor" writer="tradeWriter" commit-interval="2">
 				<streams>
 					<stream ref="fileItemReader"/>
diff --git a/spring-batch-samples/src/main/resources/jobs/retrySample.xml b/spring-batch-samples/src/main/resources/jobs/retrySample.xml
index dbb70e699..c1d8fc3b9 100644
--- a/spring-batch-samples/src/main/resources/jobs/retrySample.xml
+++ b/spring-batch-samples/src/main/resources/jobs/retrySample.xml
@@ -12,7 +12,7 @@
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
 
 	<job id="retrySample">
-		<step name="step1">
+		<step id="step1">
 			<tasklet reader="itemGenerator" 
 			         writer="itemWriter" 
 			         commit-interval="1"
diff --git a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
index 39ad3574c..981c50742 100644
--- a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
@@ -13,7 +13,7 @@
  			http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<job id="skipJob" incrementer="incrementer">
-		<step name="step1">
+		<step id="step1">
 			<tasklet reader="fileItemReader" processor="tradeProcessor" writer="tradeWriter" 
 			         commit-interval="1" skip-limit="1">
 			</tasklet>
@@ -28,9 +28,9 @@
 			</listeners>
 		</step>
 
-		<step name="errorPrint1" next="step2" tasklet="errorLogTasklet"/>
+		<step id="errorPrint1" next="step2" tasklet="errorLogTasklet"/>
 
-		<step name="step2" next="skipCheckingDecision">
+		<step id="step2" next="skipCheckingDecision">
 			<tasklet reader="tradeSqlItemReader" processor="tradeProcessor" writer="itemTrackingWriter"
 					 commit-interval="2" skip-limit="1">
 				<skippable-exception-classes>
@@ -49,7 +49,7 @@
 			<end on="*"/>
 		</decision>
 		
-		<step name="errorPrint2" tasklet="errorLogTasklet"/>
+		<step id="errorPrint2" tasklet="errorLogTasklet"/>
 	</job>
 
 	
diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
index b763087b7..037ed3fa1 100644
--- a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml
@@ -13,7 +13,7 @@
  			http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
 	<job id="tradeJob">
-		<step name="step1" next="step2">
+		<step id="step1" next="step2">
 			<tasklet reader="fileItemReader" 
 			         processor="validatingProcessor" 
 			         writer="tradeWriter" 
@@ -24,10 +24,10 @@
 				</streams>
 			</tasklet>
 		</step>
-		<step name="step2" next="step3">
+		<step id="step2" next="step3">
 			<tasklet reader="tradeSqlItemReader" writer="customerWriter" commit-interval="1"/>
 		</step>
-		<step name="step3">
+		<step id="step3">
 			<tasklet reader="customerSqlItemReader" writer="creditWriter" commit-interval="1"/>
 		</step>
 	</job>
diff --git a/spring-batch-test/src/test/resources/jobs/sampleFlowJob.xml b/spring-batch-test/src/test/resources/jobs/sampleFlowJob.xml
index 255920c88..385a2066e 100644
--- a/spring-batch-test/src/test/resources/jobs/sampleFlowJob.xml
+++ b/spring-batch-test/src/test/resources/jobs/sampleFlowJob.xml
@@ -12,11 +12,25 @@
        		http://www.springframework.org/schema/aop
  			http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
-	<beans:import resource="sample-steps.xml" />
-
 	<job id="sampleFlowJob">
-		<step name="step1" next="step2"/>
-		<step name="step2"/>
+		<step id="step1" ref="s1" next="step2"/>
+		<step id="step2" ref="s2"/>
 	</job>
 
+	<beans:bean id="s1" parent="taskletStep">
+		<beans:property name="tasklet">
+			<beans:bean class="org.springframework.batch.test.sample.SampleTasklet">
+				<beans:constructor-arg value="1" />
+			</beans:bean>
+		</beans:property>
+	</beans:bean>
+
+	<beans:bean id="s2" parent="taskletStep">
+		<beans:property name="tasklet">
+			<beans:bean class="org.springframework.batch.test.sample.SampleTasklet">
+				<beans:constructor-arg value="2" />
+			</beans:bean>
+		</beans:property>
+	</beans:bean>
+
 </beans:beans>
\ No newline at end of file