From 64a4e53a99d05b023b44dd798467b254761dec76 Mon Sep 17 00:00:00 2001 From: robokaso Date: Wed, 12 Mar 2008 12:49:57 +0000 Subject: [PATCH] IN PROGRESS - issue BATCH-422: Provide ability to specify exception types as well as skip limit in DefaultStepFactoryBean http://jira.springframework.org/browse/BATCH-422 rollbackJob renamed to skipSample --- spring-batch-samples/.springBeans | 27 +++++++++---------- .../{rollbackJob.xml => skipSampleJob.xml} | 0 ...ts.java => SkipSampleFunctionalTests.java} | 2 +- ... => SkipSampleFunctionalTests-context.xml} | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) rename spring-batch-samples/src/main/resources/jobs/{rollbackJob.xml => skipSampleJob.xml} (100%) rename spring-batch-samples/src/test/java/org/springframework/batch/sample/{RollbackJobFunctionalTests.java => SkipSampleFunctionalTests.java} (90%) rename spring-batch-samples/src/test/resources/org/springframework/batch/sample/{RollbackJobFunctionalTests-context.xml => SkipSampleFunctionalTests-context.xml} (86%) diff --git a/spring-batch-samples/.springBeans b/spring-batch-samples/.springBeans index 7285cbd34..04c2ec5b5 100644 --- a/spring-batch-samples/.springBeans +++ b/spring-batch-samples/.springBeans @@ -1,11 +1,10 @@ 1 - + - src/main/resources/jobs/fixedLengthImportJob.xml src/main/resources/jobs/multilineJob.xml @@ -29,7 +28,6 @@ src/main/resources/beanRefContext.xml src/main/resources/jobs/delegatingJob.xml src/main/resources/jobs/parallelJob.xml - src/main/resources/jobs/rollbackJob.xml src/main/resources/jobs/retrySample.xml src/main/resources/jobs/simpleJob.xml src/main/resources/simple-job-launcher-context.xml @@ -38,6 +36,7 @@ src/main/resources/adhoc-job-launcher-context.xml src/main/resources/alt-data-source-context.xml src/main/resources/quartz-job-launcher-context.xml + src/main/resources/jobs/skipSampleJob.xml @@ -244,17 +243,6 @@ src/main/resources/simple-job-launcher-context.xml - - - true - false - - src/main/resources/data-source-context.xml - src/main/resources/jobs/rollbackJob.xml - src/main/resources/jobs/tradeJobIo.xml - src/main/resources/simple-job-launcher-context.xml - - true @@ -284,5 +272,16 @@ src/main/resources/simple-job-launcher-context.xml + + + true + false + + src/main/resources/data-source-context.xml + src/main/resources/jobs/skipSampleJob.xml + src/main/resources/simple-job-launcher-context.xml + src/main/resources/data-source-context-init.xml + + diff --git a/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml similarity index 100% rename from spring-batch-samples/src/main/resources/jobs/rollbackJob.xml rename to spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RollbackJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java similarity index 90% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/RollbackJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java index c4e1b7b12..ced5ef126 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RollbackJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java @@ -10,7 +10,7 @@ import org.springframework.jdbc.core.JdbcTemplate; * * @author Robert Kasanicky */ -public class RollbackJobFunctionalTests extends AbstractValidatingBatchLauncherTests { +public class SkipSampleFunctionalTests extends AbstractValidatingBatchLauncherTests { int before = -1; diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/RollbackJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/SkipSampleFunctionalTests-context.xml similarity index 86% rename from spring-batch-samples/src/test/resources/org/springframework/batch/sample/RollbackJobFunctionalTests-context.xml rename to spring-batch-samples/src/test/resources/org/springframework/batch/sample/SkipSampleFunctionalTests-context.xml index d517e4008..9bc6e791c 100644 --- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/RollbackJobFunctionalTests-context.xml +++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/SkipSampleFunctionalTests-context.xml @@ -5,6 +5,6 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> - +