From 4732c118b0d0892a59b2a434f34e236c9b5a4e5f Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Wed, 4 Nov 2009 08:47:20 +0000
Subject: [PATCH] RESOLVED - issue BATCH-1419: Change
 is-reader-transactional-queue to reader-transactional in <chunk/>
 http://jira.springframework.org/browse/BATCH-1419

---
 .../batch/core/configuration/xml/ChunkElementParser.java        | 2 +-
 .../batch/core/configuration/xml/spring-batch-2.1.xsd           | 2 +-
 .../xml/StepWithFaultTolerantProcessTaskJobParserTests.java     | 2 +-
 .../xml/StepParserBadRetryListenerTests-context.xml             | 2 +-
 .../xml/StepParserTaskletAttributesTests-context.xml            | 2 +-
 .../StepWithFaultTolerantProcessTaskJobParserTests-context.xml  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ChunkElementParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ChunkElementParser.java
index d0f054e1c..8280c5b63 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ChunkElementParser.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ChunkElementParser.java
@@ -113,7 +113,7 @@ public class ChunkElementParser {
 			propertyValues.addPropertyValue("cacheCapacity", cacheCapacity);
 		}
 
-		String isReaderTransactionalQueue = element.getAttribute("is-reader-transactional-queue");
+		String isReaderTransactionalQueue = element.getAttribute("reader-transactional-queue");
 		if (StringUtils.hasText(isReaderTransactionalQueue)) {
 			propertyValues.addPropertyValue("isReaderTransactionalQueue", isReaderTransactionalQueue);
 		}
diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.1.xsd b/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.1.xsd
index e0fc3a75a..8f643784e 100644
--- a/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.1.xsd
+++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch-2.1.xsd
@@ -601,7 +601,7 @@
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="is-reader-transactional-queue" type="xsd:string" use="optional">
+		<xsd:attribute name="reader-transactional-queue" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 				Whether the reader is a transactional queue. If it is then items read should not be cached 
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests.java
index a6dafdec6..18c45db7d 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepWithFaultTolerantProcessTaskJobParserTests.java
@@ -96,7 +96,7 @@ public class StepWithFaultTolerantProcessTaskJobParserTests {
 				"isolation"));
 		assertEquals("wrong transaction-attribute:", 10, ReflectionTestUtils.getField(factory, "transactionTimeout"));
 		Object txq = ReflectionTestUtils.getField(factory, "isReaderTransactionalQueue");
-		assertEquals("wrong is-reader-transactional-queue:", true, txq);
+		assertEquals("wrong reader-transactional-queue:", true, txq);
 		Object te = ReflectionTestUtils.getField(factory, "taskExecutor");
 		assertEquals("wrong task-executor:", ConcurrentTaskExecutor.class, te.getClass());
 		Object listeners = ReflectionTestUtils.getField(factory, "listeners");
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 b91c4c87b..6a63e1f47 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
@@ -10,7 +10,7 @@
 		<step id="step">
 			<tasklet task-executor="taskExecutor">
 				<chunk reader="reader" processor="processor" writer="writer" commit-interval="10" skip-limit="20"
-						retry-limit="3" cache-capacity="100" is-reader-transactional-queue="true">
+						retry-limit="3" cache-capacity="100" reader-transactional-queue="true">
 					<retry-listeners>
 						<listener ref="retryListener">
 							<beans:bean class="org.springframework.batch.core.configuration.xml.TestRetryListener"/>
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 0c77af0a7..4450f2778 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
@@ -8,7 +8,7 @@
 		<step id="step">
 			<tasklet start-limit="25" allow-start-if-complete="true" task-executor="taskExecutor" throttle-limit="10">
 				<chunk reader="reader" processor="processor" writer="writer" commit-interval="10" skip-limit="20"
-						retry-limit="3" cache-capacity="100" is-reader-transactional-queue="true">
+						retry-limit="3" cache-capacity="100" reader-transactional-queue="true">
 					<retry-listeners>
 						<listener>
 							<beans:bean class="org.springframework.batch.core.configuration.xml.TestRetryListener" />
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 c2347da8b..ac79eed4f 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
@@ -11,7 +11,7 @@
 			<tasklet task-executor="taskExecutor">
 				<chunk reader="reader" processor="processor" writer="writer"
 				       commit-interval="10" skip-limit="20" retry-limit="3" cache-capacity="100" 
-				       is-reader-transactional-queue="true">
+				       reader-transactional-queue="true">
 
 					<retry-listeners>
 						<listener ref="retryListener" />