From ffcbb68f2a7786b7c2974a16a33408b32a029412 Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Wed, 27 Feb 2008 10:15:34 +0000
Subject: [PATCH] Externalise commit interval for football job

---
 .../src/main/resources/batch.properties       |  2 --
 .../src/main/resources/jobs/footballJob.xml   |  8 ++++---
 .../src/main/resources/jobs/parallelJob.xml   | 24 +++++++++----------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/spring-batch-samples/src/main/resources/batch.properties b/spring-batch-samples/src/main/resources/batch.properties
index 024830388..926b89d14 100644
--- a/spring-batch-samples/src/main/resources/batch.properties
+++ b/spring-batch-samples/src/main/resources/batch.properties
@@ -16,8 +16,6 @@ batch.schema.script=schema-hsqldb.sql
 batch.business.schema.script=business-schema-hsqldb.sql
 batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.HsqlMaxValueIncrementer
 batch.lob.handler.class=org.springframework.jdbc.support.lob.DefaultLobHandler
-batch.football.job.commit.interval=2
-
 
 # Other platforms:
 # org.springframework.jdbc.support.incrementer.DB2SequenceMaxValueIncrementer
diff --git a/spring-batch-samples/src/main/resources/jobs/footballJob.xml b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
index 5bf0b75a9..d94281131 100644
--- a/spring-batch-samples/src/main/resources/jobs/footballJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
@@ -17,7 +17,8 @@
 		<property name="steps">
 			<list>
 				<bean id="playerload" parent="simpleStep">
-					<property name="commitInterval" value="1"/>
+					<property name="commitInterval" value="${job.commit.interval}" />
+					<property name="startLimit" value="100" />
 					<property name="itemReader"
 						ref="playerFileItemReader" />
 					<property name="itemWriter">
@@ -34,7 +35,6 @@
 					</property>
 				</bean>
 				<bean id="gameLoad" parent="simpleStep">
-					<property name="commitInterval" value="1" />
 					<property name="itemReader"
 						ref="gameFileItemReader" />
 					<property name="itemWriter">
@@ -44,9 +44,10 @@
 								ref="dataSource" />
 						</bean>
 					</property>
+					<property name="commitInterval" value="${job.commit.interval}" />
 				</bean>
 				<bean id="playerSummarization" parent="simpleStep">
-					<property name="commitInterval" value="1" />
+					<property name="commitInterval" value="${job.commit.interval}" />
 					<property name="itemReader"
 						ref="playerSummarizationSource" />
 					<property name="itemWriter">
@@ -136,6 +137,7 @@
 			<value>
 				games.file.name=games-small.csv
 				player.file.name=player-small.csv
+				job.commit.interval=2
 			</value>
 		</property>
 		<property name="systemPropertiesModeName"
diff --git a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
index 70b86174c..5c02503a8 100644
--- a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml
@@ -16,6 +16,9 @@
 		<property name="steps">
 			<list>
 				<bean id="staging" parent="simpleStep">
+					<property name="commitInterval" value="2" />
+					<property name="startLimit" value="100" />
+					<property name="allowStartIfComplete" value="false" />
 					<property name="itemReader">
 						<bean
 							class="org.springframework.batch.item.reader.ValidatingItemReader">
@@ -42,11 +45,17 @@
 							</property>
 						</bean>
 					</property>
-					<property name="commitInterval" value="2" />
-					<property name="startLimit" value="100" />
-					<property name="allowStartIfComplete" value="false" />
 				</bean>
 				<bean id="loading" parent="simpleStep">
+					<property name="stepOperations">
+						<bean
+							class="org.springframework.batch.repeat.support.TaskExecutorRepeatTemplate">
+							<property name="taskExecutor">
+								<bean
+									class="org.springframework.core.task.SimpleAsyncTaskExecutor" />
+							</property>
+						</bean>
+					</property>
 					<property name="itemReader">
 						<bean
 							class="org.springframework.batch.sample.item.reader.StagingItemReader"
@@ -64,15 +73,6 @@
 							<property name="dao" ref="tradeDao" />
 						</bean>
 					</property>
-					<property name="stepOperations">
-						<bean
-							class="org.springframework.batch.repeat.support.TaskExecutorRepeatTemplate">
-							<property name="taskExecutor">
-								<bean
-									class="org.springframework.core.task.SimpleAsyncTaskExecutor" />
-							</property>
-						</bean>
-					</property>
 				</bean>
 			</list>
 		</property>