From 428a60f86ff64c78a6b49016c2e686b2a286539d Mon Sep 17 00:00:00 2001
From: lucasward <lucasward@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Mon, 3 Mar 2008 20:23:34 +0000
Subject: [PATCH] BATCH-407:Added repository factory to samples and created a
 factory for incrementers for that logic to obtain them could be unit tested. 
 Also renamed SimpelJobRepositoryFactoryBean to just JobRepositoryFactoryBean

---
 .../main/resources/data-source-context.xml    | 31 ++-----------------
 .../resources/simple-container-definition.xml | 29 ++---------------
 .../sample/dao/JdbcTradeWriterTests.java      |  2 +-
 3 files changed, 6 insertions(+), 56 deletions(-)

diff --git a/spring-batch-samples/src/main/resources/data-source-context.xml b/spring-batch-samples/src/main/resources/data-source-context.xml
index 949239771..317bb73a4 100644
--- a/spring-batch-samples/src/main/resources/data-source-context.xml
+++ b/spring-batch-samples/src/main/resources/data-source-context.xml
@@ -62,36 +62,9 @@
 	<bean id="lobHandler" class="${batch.lob.handler.class}"/>
 
 	<bean id="incrementerParent"
-		class="${batch.database.incrementer.class}" abstract="true">
+		class="${batch.database.incrementer.class}">
 		<property name="dataSource" ref="dataSource" />
-	</bean>
-
-	<bean id="jobIncrementer" parent="incrementerParent">
-		<property name="incrementerName" value="BATCH_JOB_SEQ" />
-	</bean>
-
-	<bean id="jobExecutionIncrementer" parent="incrementerParent">
-		<property name="incrementerName"
-			value="BATCH_JOB_EXECUTION_SEQ" />
-	</bean>
-
-	<bean id="stepIncrementer" parent="incrementerParent">
-		<property name="incrementerName" value="BATCH_STEP_SEQ" />
-	</bean>
-
-	<bean id="stepExecutionIncrementer" parent="incrementerParent">
-		<property name="incrementerName"
-			value="BATCH_STEP_EXECUTION_SEQ" />
-	</bean>
-
-	<bean id="partitionIncrementer" parent="incrementerParent">
-		<property name="incrementerName" value="BATCH_PARTITION_SEQ" />
-	</bean>
-
-	<bean id="partitionInstanceIncrementer"
-		parent="incrementerParent">
-		<property name="incrementerName"
-			value="BATCH_PARTITION_EXECUTION_SEQ" />
+		<property name="incrementerName" value="ID" />
 	</bean>
 
 	<!--import resource="alt-data-source-context.xml" /-->
diff --git a/spring-batch-samples/src/main/resources/simple-container-definition.xml b/spring-batch-samples/src/main/resources/simple-container-definition.xml
index 9aa9bcf43..907dcc569 100644
--- a/spring-batch-samples/src/main/resources/simple-container-definition.xml
+++ b/spring-batch-samples/src/main/resources/simple-container-definition.xml
@@ -38,33 +38,10 @@
 			<tx:method name="*" />
 		</tx:attributes>
 	</tx:advice>
-
+	
 	<bean id="jobRepository"
-		class="org.springframework.batch.execution.repository.SimpleJobRepository">
-		<constructor-arg ref="jobInstanceDao" />
-		<constructor-arg ref="jobExecutionDao" />
-		<constructor-arg ref="stepExecutionDao" />
-	</bean>
-
-	<bean id="jobInstanceDao" lazy-init="true"
-		class="org.springframework.batch.execution.repository.dao.JdbcJobInstanceDao">
-		<property name="jdbcTemplate" ref="jdbcTemplate" />
-		<property name="jobIncrementer" ref="jobIncrementer" />
-	</bean>
-
-	<bean id="jobExecutionDao" lazy-init="true"
-		class="org.springframework.batch.execution.repository.dao.JdbcJobExecutionDao">
-		<property name="jdbcTemplate" ref="jdbcTemplate" />
-		<property name="jobExecutionIncrementer"
-			ref="jobExecutionIncrementer" />
-	</bean>
-
-	<bean id="stepExecutionDao" lazy-init="true"
-		class="org.springframework.batch.execution.repository.dao.JdbcStepExecutionDao">
-		<property name="jdbcTemplate" ref="jdbcTemplate" />
-		<property name="stepExecutionIncrementer"
-			ref="stepExecutionIncrementer" />
-	</bean>
+		class="org.springframework.batch.execution.repository.JobRepositoryFactoryBean"
+		p:databaseType="hsql" p:dataSource-ref="dataSource" />
 
 	<bean id="mapJobInstanceDao" lazy-init="true"
 		class="org.springframework.batch.execution.repository.dao.MapJobInstanceDao" />
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java
index 41a9ecb68..130e71b98 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java
@@ -19,7 +19,7 @@ public class JdbcTradeWriterTests extends AbstractTransactionalDataSourceSpringC
 		
 		JdbcTradeDao writer = new JdbcTradeDao();
 		
-		AbstractDataFieldMaxValueIncrementer incrementer = (AbstractDataFieldMaxValueIncrementer)applicationContext.getBean("jobIncrementer");
+		AbstractDataFieldMaxValueIncrementer incrementer = (AbstractDataFieldMaxValueIncrementer)applicationContext.getBean("incrementerParent");
 		incrementer.setIncrementerName("TRADE_SEQ");
 		
 		writer.setIncrementer(incrementer);