From 85fa0c7d7a27e3aa2da549de4db2e506ebee2efb Mon Sep 17 00:00:00 2001 From: dhgarrette Date: Thu, 26 Mar 2009 13:01:59 +0000 Subject: [PATCH] BATCH-1181: Changed to --- .../configuration/xml/AbstractStepParser.java | 12 +++++----- ...letParser.java => ChunkElementParser.java} | 4 ++-- .../xml/StepParserStepFactoryBean.java | 4 ++-- .../configuration/xml/spring-batch-2.0.xsd | 4 ++-- ...ests.java => ChunkElementParserTests.java} | 22 +++++++++---------- ...entParentAttributeParserTests-context.xml} | 12 +++++----- ...tepParserBadRetryListenerTests-context.xml | 8 +++---- ...tIntervalCompletionPolicyTests-context.xml | 4 ++-- .../StepParserCommitIntervalTests-context.xml | 2 +- ...tepParserCompletionPolicyTests-context.xml | 2 +- ...ntervalOrCompletionPolicyTests-context.xml | 2 +- ...StepParserParentAttributeTests-context.xml | 8 +++---- ...epParserTaskletAttributesTests-context.xml | 8 +++---- ...BasicProcessTaskJobParserTests-context.xml | 6 ++--- ...erantProcessTaskJobParserTests-context.xml | 6 ++--- .../src/main/resources/jobs/adhocLoopJob.xml | 2 +- .../jobs/beanWrapperMapperSampleJob.xml | 7 +++--- .../jobs/compositeItemWriterSampleJob.xml | 6 ++--- .../main/resources/jobs/customerFilterJob.xml | 8 +++---- .../src/main/resources/jobs/delegatingJob.xml | 2 +- .../src/main/resources/jobs/footballJob.xml | 12 +++++----- .../resources/jobs/headerFooterSample.xml | 4 ++-- .../src/main/resources/jobs/hibernateJob.xml | 10 ++++----- .../src/main/resources/jobs/ioSampleJob.xml | 2 +- .../resources/jobs/iosample/multiLine.xml | 2 +- .../jobs/iosample/multiRecordType.xml | 2 +- .../main/resources/jobs/loopFlowSample.xml | 4 ++-- .../src/main/resources/jobs/multilineJob.xml | 4 ++-- .../main/resources/jobs/multilineOrderJob.xml | 4 ++-- .../src/main/resources/jobs/parallelJob.xml | 18 +++++++-------- .../src/main/resources/jobs/partitionJob.xml | 2 +- .../src/main/resources/jobs/restartSample.xml | 4 ++-- .../src/main/resources/jobs/retrySample.xml | 10 ++++----- .../src/main/resources/jobs/skipSampleJob.xml | 16 +++++++------- .../src/main/resources/jobs/tradeJob.xml | 10 ++++----- 35 files changed, 117 insertions(+), 116 deletions(-) rename spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/{ChunkTaskletParser.java => ChunkElementParser.java} (98%) rename spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/{ChunkTaskletParserTests.java => ChunkElementParserTests.java} (91%) rename spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/{ChunkTaskletParentAttributeParserTests-context.xml => ChunkElementParentAttributeParserTests-context.xml} (90%) diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractStepParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractStepParser.java index 37ce1f91a..6992664e4 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractStepParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractStepParser.java @@ -53,7 +53,7 @@ public abstract class AbstractStepParser { private static final String TASKLET_ELE = "tasklet"; - private static final String CHUNK_TASKLET_ELE = "chunk-tasklet"; + private static final String CHUNK_ELE = "chunk"; private static final String LISTENERS_ELE = "listeners"; @@ -63,7 +63,7 @@ public abstract class AbstractStepParser { private static final String JOB_REPO_ATTR = "job-repository"; - private static final ChunkTaskletParser chunkTaskletParser = new ChunkTaskletParser(); + private static final ChunkElementParser chunkTaskletParser = new ChunkElementParser(); private static final StepListenerParser stepListenerParser = new StepListenerParser(); @@ -109,11 +109,11 @@ public abstract class AbstractStepParser { String taskletRef = taskletElement.getAttribute(TASKLET_REF_ATTR); @SuppressWarnings("unchecked") List chunkTaskletElements = (List) DomUtils.getChildElementsByTagName(taskletElement, - CHUNK_TASKLET_ELE); + CHUNK_ELE); if (StringUtils.hasText(taskletRef)) { if (chunkTaskletElements.size() > 0) { parserContext.getReaderContext().error( - "The <" + CHUNK_TASKLET_ELE + "/> element can't be combined with the '" + TASKLET_REF_ATTR + "The <" + CHUNK_ELE + "/> element can't be combined with the '" + TASKLET_REF_ATTR + "=\"" + taskletRef + "\"' attribute specification for <" + taskletElement.getNodeName() + "/>", taskletElement); } @@ -124,12 +124,12 @@ public abstract class AbstractStepParser { } else if (chunkTaskletElements.size() > 1) { parserContext.getReaderContext().error( - "The '<" + CHUNK_TASKLET_ELE + "/>' element may not appear more than once in a single <" + "The '<" + CHUNK_ELE + "/>' element may not appear more than once in a single <" + taskletElement.getNodeName() + "/>.", taskletElement); } else if (!stepUnderspecified) { parserContext.getReaderContext().error( - "Step [" + taskletElement.getAttribute(ID_ATTR) + "] has neither a <" + CHUNK_TASKLET_ELE + "Step [" + taskletElement.getAttribute(ID_ATTR) + "] has neither a <" + CHUNK_ELE + "/> element nor a '" + TASKLET_REF_ATTR + "' attribute.", taskletElement); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ChunkTaskletParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ChunkElementParser.java similarity index 98% rename from spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ChunkTaskletParser.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ChunkElementParser.java index cfc68789b..9c012539b 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ChunkTaskletParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ChunkElementParser.java @@ -33,12 +33,12 @@ import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; /** - * Internal parser for the <chunk-tasklet/> element either inside a step. + * Internal parser for the <chunk/> element inside a step. * * @author Thomas Risberg * @since 2.0 */ -public class ChunkTaskletParser { +public class ChunkElementParser { private static final String ID_ATTR = "id"; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java index 53f5a7c01..9610467e8 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java @@ -137,7 +137,7 @@ class StepParserStepFactoryBean implements FactoryBean, BeanNameAware { public final Object getObject() throws Exception { if (hasChunkTaskletElement) { Assert.isNull(tasklet, "Step [" + name - + "] has both a element and a 'ref' attribute referencing a Tasklet."); + + "] has both a element and a 'ref' attribute referencing a Tasklet."); if (isFaultTolerant()) { FaultTolerantStepFactoryBean fb = new FaultTolerantStepFactoryBean(); @@ -159,7 +159,7 @@ class StepParserStepFactoryBean implements FactoryBean, BeanNameAware { } else { throw new IllegalStateException("Step [" + name - + "] has neither a element nor a 'ref' attribute referencing a Tasklet."); + + "] has neither a element nor a 'ref' attribute referencing a Tasklet."); } } diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd b/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd index ffeb3a30d..8fcfbeb31 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.0.xsd @@ -184,7 +184,7 @@ Defines a stage in job processing backed by a Step. The id attribute must be specified. The - step requires either a chunk-tasklet definition, + step requires either a chunk definition, a tasklet reference, or a reference to a (possibly abstract) parent step. @@ -265,7 +265,7 @@ - + diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/ChunkTaskletParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/ChunkElementParserTests.java similarity index 91% rename from spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/ChunkTaskletParserTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/ChunkElementParserTests.java index 7217fbd09..c0f230a67 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/ChunkTaskletParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/ChunkElementParserTests.java @@ -41,15 +41,15 @@ import org.springframework.test.util.ReflectionTestUtils; * @author Dan Garrette * @since 2.0 */ -public class ChunkTaskletParserTests { +public class ChunkElementParserTests { - private ConfigurableApplicationContext chunkTaskletParentAttributeParserTestsContext = new ClassPathXmlApplicationContext( - "org/springframework/batch/core/configuration/xml/ChunkTaskletParentAttributeParserTests-context.xml"); + private ConfigurableApplicationContext chunkElementParentAttributeParserTestsContext = new ClassPathXmlApplicationContext( + "org/springframework/batch/core/configuration/xml/ChunkElementParentAttributeParserTests-context.xml"); @Test public void testInheritSkippable() throws Exception { Collection> skippable = getExceptionClasses("s1", "skippable", - chunkTaskletParentAttributeParserTestsContext); + chunkElementParentAttributeParserTestsContext); assertEquals(2, skippable.size()); boolean e = false; boolean f = false; @@ -67,7 +67,7 @@ public class ChunkTaskletParserTests { @Test public void testInheritFatal() throws Exception { - Collection> fatal = getExceptionClasses("s1", "fatal", chunkTaskletParentAttributeParserTestsContext); + Collection> fatal = getExceptionClasses("s1", "fatal", chunkElementParentAttributeParserTestsContext); boolean a = false; boolean b = false; for (Class cls : fatal) { @@ -84,7 +84,7 @@ public class ChunkTaskletParserTests { @Test public void testInheritStreams() throws Exception { - Collection streams = getStreams("s1", chunkTaskletParentAttributeParserTestsContext); + Collection streams = getStreams("s1", chunkElementParentAttributeParserTestsContext); assertEquals(2, streams.size()); boolean c = false; for (ItemStream o : streams) { @@ -98,7 +98,7 @@ public class ChunkTaskletParserTests { @Test public void testInheritRetryListeners() throws Exception { Collection retryListeners = getRetryListeners("s1", - chunkTaskletParentAttributeParserTestsContext); + chunkElementParentAttributeParserTestsContext); assertEquals(2, retryListeners.size()); boolean g = false; boolean h = false; @@ -117,7 +117,7 @@ public class ChunkTaskletParserTests { @Test public void testInheritSkippable_NoMerge() throws Exception { Collection> skippable = getExceptionClasses("s2", "skippable", - chunkTaskletParentAttributeParserTestsContext); + chunkElementParentAttributeParserTestsContext); assertEquals(1, skippable.size()); boolean e = false; for (Class cls : skippable) { @@ -130,7 +130,7 @@ public class ChunkTaskletParserTests { @Test public void testInheritFatal_NoMerge() throws Exception { - Collection> fatal = getExceptionClasses("s2", "fatal", chunkTaskletParentAttributeParserTestsContext); + Collection> fatal = getExceptionClasses("s2", "fatal", chunkElementParentAttributeParserTestsContext); boolean a = false; boolean b = false; for (Class cls : fatal) { @@ -147,7 +147,7 @@ public class ChunkTaskletParserTests { @Test public void testInheritStreams_NoMerge() throws Exception { - Collection streams = getStreams("s2", chunkTaskletParentAttributeParserTestsContext); + Collection streams = getStreams("s2", chunkElementParentAttributeParserTestsContext); assertEquals(1, streams.size()); boolean c = false; for (ItemStream o : streams) { @@ -161,7 +161,7 @@ public class ChunkTaskletParserTests { @Test public void testInheritRetryListeners_NoMerge() throws Exception { Collection retryListeners = getRetryListeners("s2", - chunkTaskletParentAttributeParserTestsContext); + chunkElementParentAttributeParserTestsContext); assertEquals(1, retryListeners.size()); boolean h = false; for (RetryListener o : retryListeners) { diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/ChunkTaskletParentAttributeParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/ChunkElementParentAttributeParserTests-context.xml similarity index 90% rename from spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/ChunkTaskletParentAttributeParserTests-context.xml rename to spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/ChunkElementParentAttributeParserTests-context.xml index dd9ebde48..0e576029e 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/ChunkTaskletParentAttributeParserTests-context.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/ChunkElementParentAttributeParserTests-context.xml @@ -9,7 +9,7 @@ - + java.lang.NullPointerException @@ -22,13 +22,13 @@ - + - + java.lang.NullPointerException @@ -41,14 +41,14 @@ - + - + java.lang.ArithmeticException @@ -61,7 +61,7 @@ - + diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBadRetryListenerTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBadRetryListenerTests-context.xml index d01d76e19..d59f4e76f 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBadRetryListenerTests-context.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserBadRetryListenerTests-context.xml @@ -9,9 +9,9 @@ - + @@ -21,7 +21,7 @@ org.springframework.dao.DataIntegrityViolationException, - + org.springframework.dao.DataIntegrityViolationException diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserCommitIntervalCompletionPolicyTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserCommitIntervalCompletionPolicyTests-context.xml index edff1125e..aa6811819 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserCommitIntervalCompletionPolicyTests-context.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserCommitIntervalCompletionPolicyTests-context.xml @@ -9,8 +9,8 @@ - + diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserCommitIntervalTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserCommitIntervalTests-context.xml index 35694bace..bb14db468 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserCommitIntervalTests-context.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserCommitIntervalTests-context.xml @@ -9,7 +9,7 @@ - + diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserCompletionPolicyTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserCompletionPolicyTests-context.xml index 5a7ea02a4..ecf46cb23 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserCompletionPolicyTests-context.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserCompletionPolicyTests-context.xml @@ -9,7 +9,7 @@ - + diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserNoCommitIntervalOrCompletionPolicyTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserNoCommitIntervalOrCompletionPolicyTests-context.xml index edb75150c..af08c2e8e 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserNoCommitIntervalOrCompletionPolicyTests-context.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserNoCommitIntervalOrCompletionPolicyTests-context.xml @@ -9,7 +9,7 @@ - + diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserParentAttributeTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserParentAttributeTests-context.xml index 74449c173..91fde8769 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserParentAttributeTests-context.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserParentAttributeTests-context.xml @@ -9,7 +9,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserTaskletAttributesTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserTaskletAttributesTests-context.xml index d3427bb30..18cdf2947 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserTaskletAttributesTests-context.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepParserTaskletAttributesTests-context.xml @@ -7,9 +7,9 @@ - + @@ -22,7 +22,7 @@ org.springframework.dao.DataIntegrityViolationException - + org.springframework.dao.DataIntegrityViolationException diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithBasicProcessTaskJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithBasicProcessTaskJobParserTests-context.xml index fa09b704f..bc94c3e80 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithBasicProcessTaskJobParserTests-context.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithBasicProcessTaskJobParserTests-context.xml @@ -9,12 +9,12 @@ - + - + diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests-context.xml index f144ab264..22b7d3105 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests-context.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests-context.xml @@ -9,8 +9,8 @@ - + @@ -21,7 +21,7 @@ org.springframework.dao.DataIntegrityViolationException - + org.springframework.dao.DataIntegrityViolationException diff --git a/spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml b/spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml index d0905aaba..1168bfcec 100644 --- a/spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml @@ -16,7 +16,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml index 2c7b3545a..84aba357c 100644 --- a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml @@ -11,13 +11,14 @@ - + - + diff --git a/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml index 993db2071..c4aa5df69 100644 --- a/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml @@ -18,14 +18,14 @@ - + - + diff --git a/spring-batch-samples/src/main/resources/jobs/customerFilterJob.xml b/spring-batch-samples/src/main/resources/jobs/customerFilterJob.xml index f9dd68333..21c6aac56 100644 --- a/spring-batch-samples/src/main/resources/jobs/customerFilterJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/customerFilterJob.xml @@ -10,10 +10,10 @@ - + diff --git a/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml b/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml index bf91e5d5d..b858d08b8 100644 --- a/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml @@ -20,7 +20,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/jobs/footballJob.xml b/spring-batch-samples/src/main/resources/jobs/footballJob.xml index 5b389273a..666cea8da 100644 --- a/spring-batch-samples/src/main/resources/jobs/footballJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/footballJob.xml @@ -14,14 +14,14 @@ - + - + @@ -29,8 +29,8 @@ - + diff --git a/spring-batch-samples/src/main/resources/jobs/headerFooterSample.xml b/spring-batch-samples/src/main/resources/jobs/headerFooterSample.xml index f826a0ff8..cb4ff61ea 100644 --- a/spring-batch-samples/src/main/resources/jobs/headerFooterSample.xml +++ b/spring-batch-samples/src/main/resources/jobs/headerFooterSample.xml @@ -15,12 +15,12 @@ - + - + diff --git a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml index 1e2b4aca9..7776e0b8b 100644 --- a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml @@ -13,11 +13,11 @@ - + diff --git a/spring-batch-samples/src/main/resources/jobs/ioSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/ioSampleJob.xml index 862e54e2a..55bba13a6 100644 --- a/spring-batch-samples/src/main/resources/jobs/ioSampleJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/ioSampleJob.xml @@ -16,7 +16,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/jobs/iosample/multiLine.xml b/spring-batch-samples/src/main/resources/jobs/iosample/multiLine.xml index fbea07b00..26b0dc1aa 100644 --- a/spring-batch-samples/src/main/resources/jobs/iosample/multiLine.xml +++ b/spring-batch-samples/src/main/resources/jobs/iosample/multiLine.xml @@ -16,7 +16,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/jobs/iosample/multiRecordType.xml b/spring-batch-samples/src/main/resources/jobs/iosample/multiRecordType.xml index a9608a535..3d94903d2 100644 --- a/spring-batch-samples/src/main/resources/jobs/iosample/multiRecordType.xml +++ b/spring-batch-samples/src/main/resources/jobs/iosample/multiRecordType.xml @@ -16,7 +16,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/jobs/loopFlowSample.xml b/spring-batch-samples/src/main/resources/jobs/loopFlowSample.xml index 6a6cc9897..f0baad616 100644 --- a/spring-batch-samples/src/main/resources/jobs/loopFlowSample.xml +++ b/spring-batch-samples/src/main/resources/jobs/loopFlowSample.xml @@ -14,7 +14,7 @@ - + @@ -22,7 +22,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml index c602c1bbf..daa221bd8 100644 --- a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml @@ -13,11 +13,11 @@ - + - + diff --git a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml index 638f8396e..2be5fb4a8 100644 --- a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml @@ -15,12 +15,12 @@ - + - + diff --git a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml index 2685dd5cf..dba2f7073 100644 --- a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml @@ -14,19 +14,19 @@ - + - + diff --git a/spring-batch-samples/src/main/resources/jobs/partitionJob.xml b/spring-batch-samples/src/main/resources/jobs/partitionJob.xml index 9065db3f0..a91bcf92c 100644 --- a/spring-batch-samples/src/main/resources/jobs/partitionJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/partitionJob.xml @@ -38,7 +38,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/jobs/restartSample.xml b/spring-batch-samples/src/main/resources/jobs/restartSample.xml index 7edb570af..900b9ef63 100644 --- a/spring-batch-samples/src/main/resources/jobs/restartSample.xml +++ b/spring-batch-samples/src/main/resources/jobs/restartSample.xml @@ -11,11 +11,11 @@ - + - + diff --git a/spring-batch-samples/src/main/resources/jobs/retrySample.xml b/spring-batch-samples/src/main/resources/jobs/retrySample.xml index 50e51a6f4..147307d6d 100644 --- a/spring-batch-samples/src/main/resources/jobs/retrySample.xml +++ b/spring-batch-samples/src/main/resources/jobs/retrySample.xml @@ -14,14 +14,14 @@ - + java.lang.Exception - + diff --git a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml index 67b724e17..291249174 100644 --- a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml @@ -15,9 +15,9 @@ - - + + @@ -44,11 +44,11 @@ - + java.lang.RuntimeException - + @@ -56,12 +56,12 @@ - + org.springframework.batch.item.validator.ValidationException - + diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml index 5fbce155f..6fcea6021 100644 --- a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml @@ -12,23 +12,23 @@ - + - + - + - +