Skip to content

Commit dc656d2

Browse files
author
nebhale
committed
[BATCH-63] Refactoring to accomodate the new <config/> element
1 parent aa76ec4 commit dc656d2

File tree

43 files changed

+772
-874
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+772
-874
lines changed

spring-batch-execution/.springBeans

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,27 @@
1616
<config>src/test/resources/beanRefContext.xml</config>
1717
<config>src/test/resources/org/springframework/batch/execution/bootstrap/support/job.xml</config>
1818
<config>src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml</config>
19-
<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryDb2.xml</config>
20-
<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryDerby.xml</config>
21-
<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryHsql.xml</config>
22-
<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryMissingDataSource.xml</config>
23-
<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryMySql.xml</config>
24-
<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryOk.xml</config>
25-
<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryOracle.xml</config>
26-
<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryPostgres.xml</config>
27-
<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerTaskletStepMissingTasklet.xml</config>
28-
<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerTaskletStepOk.xml</config>
29-
<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerTaskletStepRerunAlways.xml</config>
30-
<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerTaskletStepRerunIncomplete.xml</config>
31-
<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerTaskletStepRerunNever.xml</config>
32-
<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerStepOk.xml</config>
33-
<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerStepMissingItemReader.xml</config>
34-
<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerStepMissingItemWriter.xml</config>
35-
<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerStepMissingTransactionManager.xml</config>
36-
<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerStepRerunAlways.xml</config>
37-
<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerStepRerunIncomplete.xml</config>
38-
<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerStepRerunNever.xml</config>
39-
<config>src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerStepSpecificTransactionManager.xml</config>
19+
<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoDb2.xml</config>
20+
<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoDerby.xml</config>
21+
<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoHsql.xml</config>
22+
<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoMissingDataSource.xml</config>
23+
<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoMySql.xml</config>
24+
<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoOk.xml</config>
25+
<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoOracle.xml</config>
26+
<config>src/test/resources/org/springframework/batch/execution/configuration/JobRepoPostgres.xml</config>
27+
<config>src/test/resources/org/springframework/batch/execution/configuration/StepMissingItemReader.xml</config>
28+
<config>src/test/resources/org/springframework/batch/execution/configuration/StepMissingItemWriter.xml</config>
29+
<config>src/test/resources/org/springframework/batch/execution/configuration/StepMissingTransactionManager.xml</config>
30+
<config>src/test/resources/org/springframework/batch/execution/configuration/StepOk.xml</config>
31+
<config>src/test/resources/org/springframework/batch/execution/configuration/StepRerunAlways.xml</config>
32+
<config>src/test/resources/org/springframework/batch/execution/configuration/StepRerunIncomplete.xml</config>
33+
<config>src/test/resources/org/springframework/batch/execution/configuration/StepRerunNever.xml</config>
34+
<config>src/test/resources/org/springframework/batch/execution/configuration/StepSpecificTransactionManager.xml</config>
35+
<config>src/test/resources/org/springframework/batch/execution/configuration/TaskletStepMissingTasklet.xml</config>
36+
<config>src/test/resources/org/springframework/batch/execution/configuration/TaskletStepOk.xml</config>
37+
<config>src/test/resources/org/springframework/batch/execution/configuration/TaskletStepRerunAlways.xml</config>
38+
<config>src/test/resources/org/springframework/batch/execution/configuration/TaskletStepRerunIncomplete.xml</config>
39+
<config>src/test/resources/org/springframework/batch/execution/configuration/TaskletStepRerunNever.xml</config>
4040
</configs>
4141
<configSets>
4242
<configSet>

spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/AbstractStepEntry.java

Lines changed: 0 additions & 45 deletions
This file was deleted.

spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/BatchNamespaceHandler.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,18 @@
2020
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
2121

2222
/**
23-
* <code>NamespaceHandler</code> for the <code>batch-execution</code> namespace.
23+
* <code>NamespaceHandler</code> for the <code>batch</code> namespace.
2424
*
2525
* <p>
26-
* Provides a {@link BeanDefinitionParser} for the <code>&lt;batch:job&gt;</code> tag. A <code>job</code> tag can
27-
* include nested <code>chunked-step</code> and <code>tasklet-step</code> tags.
28-
*
29-
* <p>
30-
* Provides a {@link BeanDefinitionParser} for the <code>&lt;batch:job-repository&gt;</code> tag.
26+
* Provides a {@link BeanDefinitionParser} for the <code>&lt;batch:config&gt;</code> tag. A <code>config</code> tag
27+
* must include nested <code>job-repository</code> and <code>job</code> tags.
3128
*
3229
* @author Ben Hale
3330
*/
3431
public class BatchNamespaceHandler extends NamespaceHandlerSupport {
3532

36-
/**
37-
* Register the {@link BeanDefinitionParser BeanDefinitionParser} for the '<code>job</code>', tag.
38-
*/
3933
public void init() {
40-
registerBeanDefinitionParser("job", new JobBeanDefinitionParser());
41-
registerBeanDefinitionParser("job-repository", new JobRepositoryBeanDefinitionParser());
34+
registerBeanDefinitionParser("config", new ConfigBeanDefinitionParser());
4235
}
4336

4437
}

spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/ChunkStepEntry.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)