diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobLocator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobLocator.java index 43ca793e0..43858bee2 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobLocator.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobLocator.java @@ -33,7 +33,7 @@ public interface JobLocator { * unique * @return a {@link Job} identified by the given name * - * @throws NoSuchJobException if the required configuratio can + * @throws NoSuchJobException if the required configuration can * not be found. */ Job getJob(String name) throws NoSuchJobException; diff --git a/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml b/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml index 1a9196ad8..503829fc5 100644 --- a/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml +++ b/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml @@ -24,7 +24,7 @@ key="spring:service=batch,bean=notificationPublisher" value-ref="notificationPublisher" /> diff --git a/spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml b/spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml index 6f982b789..493d18bcf 100644 --- a/spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml @@ -10,8 +10,6 @@ - - diff --git a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml index 9a9a6fa62..dbbda53e9 100644 --- a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml @@ -9,8 +9,6 @@ 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"> - - diff --git a/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml index 072710e03..72886d725 100644 --- a/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml @@ -9,8 +9,6 @@ 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"> - - diff --git a/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml b/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml index a8d1372df..4589eaa3a 100644 --- a/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml @@ -15,8 +15,6 @@ integrated into a batch job. - - - - diff --git a/spring-batch-samples/src/main/resources/jobs/footballJob.xml b/spring-batch-samples/src/main/resources/jobs/footballJob.xml index 19e99c941..9f818ac83 100644 --- a/spring-batch-samples/src/main/resources/jobs/footballJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/footballJob.xml @@ -9,8 +9,6 @@ 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"> - - diff --git a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml index 7c44c7e7c..11a89d59b 100644 --- a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml @@ -11,8 +11,6 @@ Example for Hibernate integration. - - diff --git a/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml b/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml index cb0e6b536..b57e88d70 100644 --- a/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml @@ -11,8 +11,6 @@ Example for iBATIS integration. - - diff --git a/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml b/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml index efccddf72..571ceb3ac 100644 --- a/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml @@ -9,8 +9,6 @@ - - diff --git a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml index d092644f6..8c0980121 100644 --- a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml @@ -7,8 +7,6 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> - - diff --git a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml index f38b58aac..f55c27444 100644 --- a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml @@ -7,8 +7,6 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> - - diff --git a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml index 652b40230..f2be7841e 100644 --- a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml @@ -9,8 +9,6 @@ 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"> - - diff --git a/spring-batch-samples/src/main/resources/jobs/restartSample.xml b/spring-batch-samples/src/main/resources/jobs/restartSample.xml index 9fb61a640..0308f5c09 100644 --- a/spring-batch-samples/src/main/resources/jobs/restartSample.xml +++ b/spring-batch-samples/src/main/resources/jobs/restartSample.xml @@ -9,8 +9,6 @@ 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"> - - diff --git a/spring-batch-samples/src/main/resources/jobs/retrySample.xml b/spring-batch-samples/src/main/resources/jobs/retrySample.xml index 13f6240fd..f75d75a37 100644 --- a/spring-batch-samples/src/main/resources/jobs/retrySample.xml +++ b/spring-batch-samples/src/main/resources/jobs/retrySample.xml @@ -9,8 +9,6 @@ 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"> - - diff --git a/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml b/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml index 0ba32f536..0f6fb6b06 100644 --- a/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml @@ -8,8 +8,6 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> - - diff --git a/spring-batch-samples/src/main/resources/jobs/simpleJob.xml b/spring-batch-samples/src/main/resources/jobs/simpleJob.xml index a44a61eab..04ab3d459 100644 --- a/spring-batch-samples/src/main/resources/jobs/simpleJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/simpleJob.xml @@ -7,8 +7,6 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> - - diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml index 0171b6c4f..ba500f397 100644 --- a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml @@ -8,8 +8,6 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> - - diff --git a/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml b/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml index acc67ee8f..ef108d7dd 100644 --- a/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml @@ -11,8 +11,6 @@ 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"> - - diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java index 6349f4c99..43824216d 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java @@ -19,9 +19,8 @@ package org.springframework.batch.sample; import org.springframework.batch.core.domain.Job; import org.springframework.batch.core.domain.JobParameters; import org.springframework.batch.execution.launch.JobLauncher; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.test.AbstractDependencyInjectionSpringContextTests; +import org.springframework.util.ClassUtils; /** * Abstract unit test for running functional tests by getting context locations @@ -41,21 +40,20 @@ public abstract class AbstractBatchLauncherTests extends setDependencyCheck(false); } + /* + * (non-Javadoc) + * @see org.springframework.test.AbstractSingleSpringContextTests#getConfigLocations() + */ + protected String[] getConfigLocations() { + return new String[] { ClassUtils.addResourcePathToPackagePath(getClass(), ClassUtils.getShortName(getClass()) + + "-context.xml") }; + } + JobLauncher launcher; private Job job; private JobParameters jobParameters = new JobParameters(); - /* - * (non-Javadoc) - * - * @see org.springframework.test.AbstractSingleSpringContextTests#createApplicationContext(java.lang.String[]) - */ - protected ConfigurableApplicationContext createApplicationContext( - String[] locations) { - return new ClassPathXmlApplicationContext(locations); - } - public void setLauncher(JobLauncher bootstrap) { this.launcher = bootstrap; } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests.java index a05a5f130..d24d41bb6 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests.java @@ -19,10 +19,6 @@ package org.springframework.batch.sample; public class BeanWrapperMapperSampleJobFunctionalTests extends AbstractValidatingBatchLauncherTests { - protected String[] getConfigLocations() { - return new String[]{"jobs/beanWrapperMapperSampleJob.xml"}; - } - protected void validatePostConditions() { // nothing to check, the job writes no output } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests.java index 5a7811426..03c7b326c 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests.java @@ -33,11 +33,6 @@ public class CompositeProcessorSampleFunctionalTests extends AbstractValidatingB private int before; -// @Override - protected String[] getConfigLocations() { - return new String[]{"jobs/compositeProcessorSampleJob.xml"}; - } - /* (non-Javadoc) * @see org.springframework.batch.sample.AbstractLifecycleSpringContextTests#validatePreConditions() */ diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java index d926f92b8..437181abd 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java @@ -6,10 +6,6 @@ public class DelegatingJobFunctionalTests extends AbstractValidatingBatchLaunche private PersonService personService; - protected String[] getConfigLocations() { - return new String[] {"jobs/delegatingJob.xml"}; - } - protected void validatePostConditions() throws Exception { assertTrue(personService.getReturnedCount() > 0); assertEquals(personService.getReturnedCount(), personService.getReceivedCount()); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java index 9f44d4efd..09b3d430f 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java @@ -52,10 +52,6 @@ public class FixedLengthImportJobFunctionalTests extends AbstractValidatingBatch inputSource.setResource(fileLocator); } - protected String[] getConfigLocations() { - return new String[] {"jobs/fixedLengthImportJob.xml"}; - } - /** * Check that records have been correctly written to database * @throws Exception diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FootballJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FootballJobFunctionalTests.java index ddf223a81..c46d6a94c 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FootballJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FootballJobFunctionalTests.java @@ -14,10 +14,6 @@ public class FootballJobFunctionalTests extends this.jdbcTemplate = new JdbcTemplate(dataSource); } - protected String[] getConfigLocations() { - return new String[] { "jobs/footballJob.xml" }; - } - protected void validatePostConditions() throws Exception { int count = jdbcTemplate.queryForInt("SELECT COUNT(*) from PLAYER_SUMMARY"); assertTrue(count>0); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java index 7cf47231b..94edc747d 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java @@ -29,10 +29,6 @@ import org.springframework.batch.core.domain.JobParameters; */ public class GracefulShutdownFunctionalTests extends AbstractBatchLauncherTests { - protected String[] getConfigLocations(){ - return new String[] {"jobs/infiniteLoopJob.xml"}; - } - public void testLaunchJob() throws Exception { final JobParameters jobParameters = new JobParameters(); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java index 4409359ba..4a85e0df1 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java @@ -40,10 +40,6 @@ public class HibernateFailureJobFunctionalTests extends writer.setFailOnFlush(-1); } - protected String[] getConfigLocations() { - return new String[] { "jobs/hibernateJob.xml" }; - } - /* * (non-Javadoc) * diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateJobFunctionalTests.java index 3be80f6c8..517dfd517 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateJobFunctionalTests.java @@ -7,7 +7,4 @@ package org.springframework.batch.sample; */ public class HibernateJobFunctionalTests extends AbstractCustomerCreditIncreaseTests { - protected String[] getConfigLocations() { - return new String[] {"jobs/hibernateJob.xml"}; - } } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/IbatisJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/IbatisJobFunctionalTests.java index f4653e8ce..6c5831826 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/IbatisJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/IbatisJobFunctionalTests.java @@ -8,8 +8,4 @@ package org.springframework.batch.sample; */ public class IbatisJobFunctionalTests extends AbstractCustomerCreditIncreaseTests{ - protected String[] getConfigLocations() { - return new String[] {"jobs/ibatisJob.xml"}; - } - } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineJobFunctionalTests.java index 949a41718..f7f24846b 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineJobFunctionalTests.java @@ -30,10 +30,6 @@ public class MultilineJobFunctionalTests extends AbstractValidatingBatchLauncher private Resource output = new FileSystemResource("target/test-outputs/20070122.testStream.multilineStep.txt"); - protected String[] getConfigLocations() { - return new String[] { "jobs/multilineJob.xml" }; - } - protected void validatePostConditions() throws Exception { assertEquals(EXPECTED_RESULT, StringUtils.replace(IOUtils.toString(output.getInputStream()), System .getProperty("line.separator"), "")); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java index fb75c5248..c9cb0c38d 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java @@ -48,11 +48,6 @@ public class MultilineOrderJobFunctionalTests extends AbstractValidatingBatchLau private Resource fileOutputLocator = new FileSystemResource("target/test-outputs/20070122.teststream.multilineOrderStep.TEMP.txt"); -// @Override - protected String[] getConfigLocations() { - return new String[] {"jobs/multilineOrderJob.xml"}; - } - /** * Read the output file and compare it with expected string * @throws IOException diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/ParallelJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/ParallelJobFunctionalTests.java index 1ae515a7e..68e4b7509 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/ParallelJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/ParallelJobFunctionalTests.java @@ -15,10 +15,6 @@ public class ParallelJobFunctionalTests extends this.jdbcTemplate = new JdbcTemplate(dataSource); } - protected String[] getConfigLocations() { - return new String[] { "jobs/parallelJob.xml" }; - } - protected void validatePostConditions() throws Exception { int count; count = jdbcTemplate.queryForInt( diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java index 075651dca..2988a9773 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java @@ -28,8 +28,6 @@ import org.springframework.jdbc.core.JdbcOperations; */ public class RestartFunctionalTests extends AbstractBatchLauncherTests { - private static final String JOB_FILE = "jobs/restartSample.xml"; - //auto-injected attributes private JdbcOperations jdbcTemplate; @@ -42,10 +40,6 @@ public class RestartFunctionalTests extends AbstractBatchLauncherTests { this.jdbcTemplate = jdbcTemplate; } - protected String[] getConfigLocations(){ - return new String[]{JOB_FILE}; - } - /* (non-Javadoc) * @see org.springframework.test.AbstractSingleSpringContextTests#onTearDown() */ diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java index 9ebd8a4fd..61c68b53f 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java @@ -14,10 +14,6 @@ public class RetrySampleFunctionalTests extends AbstractValidatingBatchLauncherT private RetrySampleItemWriter itemProcessor; - protected String[] getConfigLocations() { - return new String[] {"jobs/retrySample.xml"}; - } - protected void validatePostConditions() throws Exception { //items processed = items read + 2 exceptions assertEquals(itemGenerator.getLimit()+2, itemProcessor.getCounter()); 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/RollbackJobFunctionalTests.java index 3f1bc5401..3b874c419 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/RollbackJobFunctionalTests.java @@ -19,10 +19,6 @@ public class RollbackJobFunctionalTests extends AbstractValidatingBatchLauncherT jdbcTemplate = new JdbcTemplate(dataSource); } - protected String[] getConfigLocations() { - return new String[] {"jobs/rollbackJob.xml"}; - } - protected void onSetUp() throws Exception { before = jdbcTemplate.queryForInt("SELECT COUNT(*) from TRADE"); } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/SimpleJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SimpleJobFunctionalTests.java index 2e2e0636e..93e30a546 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/SimpleJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SimpleJobFunctionalTests.java @@ -21,9 +21,5 @@ package org.springframework.batch.sample; * the test is reused, only the job config location is overridden */ public class SimpleJobFunctionalTests extends FixedLengthImportJobFunctionalTests { - - protected String[] getConfigLocations() { - return new String[]{"jobs/simpleJob.xml"}; - } } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java index f9f941da4..fe18c8aa3 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java @@ -52,10 +52,6 @@ public class TradeJobFunctionalTests extends AbstractValidatingBatchLauncherTest this.jdbcTemplate = jdbcTemplate; } - protected String[] getConfigLocations() { - return new String[] {"jobs/tradeJob.xml"}; - } - /* (non-Javadoc) * @see org.springframework.test.AbstractSingleSpringContextTests#onSetUp() */ diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/XmlStaxJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/XmlStaxJobFunctionalTests.java index 6ad96c9c2..71869d4f7 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/XmlStaxJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/XmlStaxJobFunctionalTests.java @@ -26,11 +26,6 @@ public class XmlStaxJobFunctionalTests extends AbstractValidatingBatchLauncherTe private static final String OUTPUT_FILE = "target/test-outputs/20070918.testStream.xmlFileStep.output.xml"; private static final String EXPECTED_OUTPUT_FILE = "src/main/resources/data/staxJob/output/expected-output.xml"; - -// @Override - protected String[] getConfigLocations() { - return new String[]{"jobs/xmlStaxJob.xml"}; - } /** * Output should be the same as input diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests-context.xml new file mode 100644 index 000000000..5da630ff5 --- /dev/null +++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests-context.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests-context.xml new file mode 100644 index 000000000..9e3cea936 --- /dev/null +++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests-context.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/DelegatingJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/DelegatingJobFunctionalTests-context.xml new file mode 100644 index 000000000..66a08c89e --- /dev/null +++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/DelegatingJobFunctionalTests-context.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests-context.xml new file mode 100644 index 000000000..989a84a89 --- /dev/null +++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests-context.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/FootballJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/FootballJobFunctionalTests-context.xml new file mode 100644 index 000000000..9f1c8369c --- /dev/null +++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/FootballJobFunctionalTests-context.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/GracefulShutdownFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/GracefulShutdownFunctionalTests-context.xml new file mode 100644 index 000000000..de56c8199 --- /dev/null +++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/GracefulShutdownFunctionalTests-context.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/HibernateFailureJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/HibernateFailureJobFunctionalTests-context.xml new file mode 100644 index 000000000..e42f76a40 --- /dev/null +++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/HibernateFailureJobFunctionalTests-context.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/HibernateJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/HibernateJobFunctionalTests-context.xml new file mode 100644 index 000000000..e42f76a40 --- /dev/null +++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/HibernateJobFunctionalTests-context.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/IbatisJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/IbatisJobFunctionalTests-context.xml new file mode 100644 index 000000000..b714a989f --- /dev/null +++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/IbatisJobFunctionalTests-context.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/MultilineJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/MultilineJobFunctionalTests-context.xml new file mode 100644 index 000000000..f1234e9f1 --- /dev/null +++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/MultilineJobFunctionalTests-context.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/MultilineOrderJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/MultilineOrderJobFunctionalTests-context.xml new file mode 100644 index 000000000..14eb7710c --- /dev/null +++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/MultilineOrderJobFunctionalTests-context.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/ParallelJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/ParallelJobFunctionalTests-context.xml new file mode 100644 index 000000000..2ce2daf9b --- /dev/null +++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/ParallelJobFunctionalTests-context.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/RestartFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/RestartFunctionalTests-context.xml new file mode 100644 index 000000000..0a7a8b1e5 --- /dev/null +++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/RestartFunctionalTests-context.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/RetrySampleFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/RetrySampleFunctionalTests-context.xml new file mode 100644 index 000000000..69785592c --- /dev/null +++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/RetrySampleFunctionalTests-context.xml @@ -0,0 +1,10 @@ + + + + + + + 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/RollbackJobFunctionalTests-context.xml new file mode 100644 index 000000000..6e624a1ef --- /dev/null +++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/RollbackJobFunctionalTests-context.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/SimpleJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/SimpleJobFunctionalTests-context.xml new file mode 100644 index 000000000..b04d2f299 --- /dev/null +++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/SimpleJobFunctionalTests-context.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/TradeJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/TradeJobFunctionalTests-context.xml new file mode 100644 index 000000000..e4dcda99c --- /dev/null +++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/TradeJobFunctionalTests-context.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/XmlStaxJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/XmlStaxJobFunctionalTests-context.xml new file mode 100644 index 000000000..b54650f44 --- /dev/null +++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/XmlStaxJobFunctionalTests-context.xml @@ -0,0 +1,10 @@ + + + + + + +