From a5ac07b26fff154c13672c136eb5c6a43eb4f04c Mon Sep 17 00:00:00 2001
From: dhgarrette <dhgarrette@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Sat, 16 May 2009 00:40:20 +0000
Subject: [PATCH] BATCH-1213: Removed "literal" (non-reference) defaults from
 the XSD.

---
 .../core/configuration/xml/spring-batch-2.0.xsd    | 14 +++++++-------
 .../core/configuration/xml/StepParserTests.java    |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

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 5b6f2ded2..792a59f4c 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
@@ -56,7 +56,7 @@
 					</xsd:appinfo>
 				</xsd:annotation>
 			</xsd:attribute>
-			<xsd:attribute name="restartable" type="xsd:string" default="true" use="optional">
+			<xsd:attribute name="restartable" type="xsd:string" use="optional">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 					Whether the job should be retartable or not in case of failure.  Set this to false
@@ -316,7 +316,7 @@
 	</xsd:complexType>
 
 	<xsd:complexType name="transaction-attributesType">
-		<xsd:attribute name="propagation" default="REQUIRED">
+		<xsd:attribute name="propagation">
 			<xsd:annotation>
 				<xsd:documentation source="java:org.springframework.transaction.annotation.Propagation"><![CDATA[
 				The transaction propagation behavior.
@@ -334,18 +334,18 @@
 				</xsd:restriction>
 			</xsd:simpleType>
 		</xsd:attribute>
-		<xsd:attribute name="isolation" default="DEFAULT" type="isolationType">
+		<xsd:attribute name="isolation" type="isolationType">
 			<xsd:annotation>
 				<xsd:documentation source="java:org.springframework.transaction.annotation.Isolation"><![CDATA[
 				The transaction isolation level.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="timeout" type="xsd:integer" default="-1">
+		<xsd:attribute name="timeout" type="xsd:integer">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	The transaction timeout value (in seconds).
-							]]></xsd:documentation>
+				The transaction timeout value (in seconds).
+				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:complexType>
@@ -517,7 +517,7 @@
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
-		<xsd:attribute name="is-reader-transactional-queue" type="xsd:string" default="false" use="optional">
+		<xsd:attribute name="is-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/StepParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java
index 2d0f21568..f9f563156 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java
@@ -177,7 +177,7 @@ public class StepParserTests {
 		DefaultTransactionAttribute txa = getTransactionAttribute(ctx, stepName);
 		assertEquals(TransactionDefinition.PROPAGATION_REQUIRED, txa.getPropagationBehavior());
 		assertEquals(TransactionDefinition.ISOLATION_DEFAULT, txa.getIsolationLevel());
-		assertEquals(-1, txa.getTimeout());
+		assertEquals(10, txa.getTimeout());
 	}
 
 	@SuppressWarnings("unchecked")