From 79c846509ce4e2a7aeceb7871495495bafbe270f Mon Sep 17 00:00:00 2001
From: trisberg <trisberg@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Sat, 1 Nov 2008 17:33:12 +0000
Subject: [PATCH] BATCH-63: added table-prefix and isolation-level-for-create
 for job-repository to xsd and parser

---
 .../xml/JobRepositoryParser.java              | 20 ++++++++++---------
 .../configuration/xml/spring-batch-2.0.xsd    | 20 ++++++++++++++++++-
 .../xml/JobRepositoryParserTests-context.xml  |  2 +-
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobRepositoryParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobRepositoryParser.java
index 62aa245b7..7573c6283 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobRepositoryParser.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobRepositoryParser.java
@@ -15,12 +15,11 @@
  */
 package org.springframework.batch.core.configuration.xml;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
+import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 
 /**
@@ -33,8 +32,6 @@ import org.w3c.dom.Element;
  */
 public class JobRepositoryParser extends AbstractSingleBeanDefinitionParser {
 
-	private final Log logger = LogFactory.getLog(getClass());
-
     protected String getBeanClassName(Element element) {
         return "org.springframework.batch.core.repository.support.JobRepositoryFactoryBean";
     }
@@ -49,15 +46,20 @@ public class JobRepositoryParser extends AbstractSingleBeanDefinitionParser {
 
         String transactionManager = element.getAttribute("transaction-manager");
 
-        if (logger.isDebugEnabled()) {
-            logger.debug("Using data-source: " + dataSource);
-            logger.debug("Using transaction-manager: " + transactionManager);
-        }
-
+        String isolationLevelForCreate = element.getAttribute("isolation-level-for-create");
+        
+        String tablePrefix = element.getAttribute("table-prefix");
+        
         RuntimeBeanReference ds = new RuntimeBeanReference(dataSource);
         builder.addPropertyValue("dataSource", ds);
         RuntimeBeanReference tx = new RuntimeBeanReference(transactionManager);
         builder.addPropertyValue("transactionManager", tx);
+        if (StringUtils.hasText(isolationLevelForCreate)) {
+            builder.addPropertyValue("isolationLevelForCreate", isolationLevelForCreate);
+        }
+        if (StringUtils.hasText(tablePrefix)) {
+            builder.addPropertyValue("tablePrefix", tablePrefix);
+        }
 
         builder.setRole(BeanDefinition.ROLE_SUPPORT);
 
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 686a42a5f..3c1e88ef7 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
@@ -188,7 +188,7 @@ The decider is a reference to a JobExecutionDecider that can produce a status to
 				<xsd:extension base="beans:identifiedType">
 					<xsd:attribute name="data-source" type="xsd:string" default="dataSource">
 						<xsd:annotation>
-							<xsd:documentation source="java:org.springframework.transaction.PlatformTransactionManager"><![CDATA[
+							<xsd:documentation source="java:javax.sql.DataSource"><![CDATA[
 							The bean name of the DataSource that is to be used. This attribute 
 							is not required, and only needs to be specified explicitly
 							if the bean name of the desired DataSource is not 'dataSource'.
@@ -214,6 +214,24 @@ The decider is a reference to a JobExecutionDecider that can produce a status to
 							</xsd:appinfo>
 						</xsd:annotation>
 					</xsd:attribute>
+					<xsd:attribute name="isolation-level-for-create" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+							The isolation level to use for creation of job execution entities.
+							The default is ISOLATION_SERIALIZABLE, which prevents accidental 
+							concurrent execution of the same job (ISOLATION_REPEATABLE_READ 
+							would work as well).
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="table-prefix" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+							The the table prefix to use for all the batch meta-data tables.
+							Defaults to "BATCH_".
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
 				</xsd:extension>
 			</xsd:complexContent>
 		</xsd:complexType>
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/JobRepositoryParserTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/JobRepositoryParserTests-context.xml
index 33a907cce..3de5e8421 100644
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/JobRepositoryParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/JobRepositoryParserTests-context.xml
@@ -12,6 +12,6 @@
 		<beans:property name="dataSource" ref="dataSource"/>
 	</beans:bean>
 
-	<job-repository id="jobRepo1"/>	
+	<job-repository id="jobRepo1"/>
 
 </beans:beans>
\ No newline at end of file