From 11faa837afa4f41d240166d2717b0a7b4832e5cc Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Sat, 8 Nov 2008 09:29:26 +0000
Subject: [PATCH] Fix batch-test pom to match the correct parent

---
 .../batch/core/step/AbstractStep.java         | 12 ++--
 spring-batch-test/pom.xml                     | 60 ++++++++-----------
 2 files changed, 28 insertions(+), 44 deletions(-)

diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java
index a69bcd369..62a978ed4 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java
@@ -50,11 +50,6 @@ import org.springframework.util.Assert;
 public abstract class AbstractStep implements Step, InitializingBean,
 		BeanNameAware {
 
-	/**
-	 * Exit code for interrupted status.
-	 */
-	public static final String JOB_INTERRUPTED = "INTERRUPTED";
-
 	private static final Log logger = LogFactory.getLog(AbstractStep.class);
 
 	private String name;
@@ -154,7 +149,8 @@ public abstract class AbstractStep implements Step, InitializingBean,
 	 *            the current step context
 	 * @throws Exception
 	 */
-	protected abstract void doExecute(StepExecution stepExecution) throws Exception;
+	protected abstract void doExecute(StepExecution stepExecution)
+			throws Exception;
 
 	/**
 	 * Extension point for subclasses to provide callbacks to their
@@ -353,8 +349,8 @@ public abstract class AbstractStep implements Step, InitializingBean,
 		ExitStatus exitStatus;
 		if (ex instanceof JobInterruptedException
 				|| ex.getCause() instanceof JobInterruptedException) {
-			exitStatus = new ExitStatus(false, JOB_INTERRUPTED,
-					JobInterruptedException.class.getName());
+			exitStatus = ExitStatus.INTERRUPTED
+					.addExitDescription(JobInterruptedException.class.getName());
 		} else if (ex instanceof NoSuchJobException
 				|| ex.getCause() instanceof NoSuchJobException) {
 			exitStatus = new ExitStatus(false, ExitCodeMapper.NO_SUCH_JOB, ex
diff --git a/spring-batch-test/pom.xml b/spring-batch-test/pom.xml
index 957f6a4ad..f45025858 100755
--- a/spring-batch-test/pom.xml
+++ b/spring-batch-test/pom.xml
@@ -1,41 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
-		<artifactId>spring-batch</artifactId>
+		<artifactId>org.springframework.batch</artifactId>
 		<groupId>org.springframework.batch</groupId>
 		<version>2.0.0.CI-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.springframework.batch.test</artifactId>
-	<name>Test</name>
 	<version>2.0.0.CI-SNAPSHOT</version>
+	<name>Test</name>
 	<packaging>jar</packaging>
 	<description>Domain for batch job testing</description>
-	<profiles>
-		<profile>
-			<id>clover</id>
-			<activation />
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-clover-plugin</artifactId>
-					</plugin>
-				</plugins>
-			</build>
-			<reporting>
-				<plugins>
-					<plugin>
-						<artifactId>maven-clover-plugin</artifactId>
-					</plugin>
-				</plugins>
-			</reporting>
-		</profile>
-	</profiles>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.batch</groupId>
-			<artifactId>org.springframework.batch.core</artifactId>
+			<artifactId>org.springframework.batch.core
+			</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
@@ -44,27 +26,33 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
+			<artifactId>org.springframework.test
+			</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-jdbc</artifactId>
+			<artifactId>org.springframework.jdbc
+			</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>commons-dbcp</groupId>
-			<artifactId>commons-dbcp</artifactId>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.io
+			</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.dbcp
+			</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>commons-collections</groupId>
-			<artifactId>commons-collections</artifactId>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>com.springsource.org.hsqldb
+			</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.collections
+			</artifactId>
 		</dependency>
 	</dependencies>
 	<reporting>