From d59ec04aa1fb58a73bd3217fb1b6b248cae60f06 Mon Sep 17 00:00:00 2001 From: dsyer Date: Sun, 9 Mar 2008 09:11:37 +0000 Subject: [PATCH] OPEN - issue BATCH-429: Combine the core and execution modules http://jira.springframework.org/browse/BATCH-429 Remove cycle from commandline runner (it didn't need an exception classifier) --- .../launch/support/CommandLineJobRunner.java | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java index 25d057533..ec3f0e816 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java @@ -24,9 +24,8 @@ import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.configuration.JobLocator; import org.springframework.batch.core.launch.JobLauncher; -import org.springframework.batch.core.runtime.ExitStatusExceptionClassifier; import org.springframework.batch.core.runtime.JobParametersFactory; -import org.springframework.batch.core.step.support.SimpleExitStatusExceptionClassifier; +import org.springframework.batch.repeat.ExitStatus; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.context.ApplicationContext; @@ -121,8 +120,6 @@ public class CommandLineJobRunner { private ExitCodeMapper exitCodeMapper = new SimpleJvmExitCodeMapper(); - private ExitStatusExceptionClassifier exceptionClassifier = new SimpleExitStatusExceptionClassifier(); - private JobLauncher launcher; private JobLocator jobLocator; @@ -141,16 +138,6 @@ public class CommandLineJobRunner { this.launcher = launcher; } - /** - * Injection setter for the {@link ExitStatusExceptionClassifier} - * - * @param exceptionClassifier - */ - public void setExceptionClassifier( - ExitStatusExceptionClassifier exceptionClassifier) { - this.exceptionClassifier = exceptionClassifier; - } - /** * Injection setter for the {@link JvmExitCodeMapper}. * @@ -211,8 +198,7 @@ public class CommandLineJobRunner { .getExitCode()); } catch (Throwable e) { logger.error("Job Terminated in error:", e); - return exitCodeMapper.getExitCode(exceptionClassifier - .classifyForExitCode(e).getExitCode()); + return exitCodeMapper.getExitCode(ExitStatus.FAILED.getExitCode()); } }