diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml
index 87e1ed11c..d5a9dbcfe 100644
--- a/spring-batch-samples/pom.xml
+++ b/spring-batch-samples/pom.xml
@@ -1,308 +1,370 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>spring-batch-samples</artifactId>
-	<packaging>jar</packaging>
-	<name>Samples</name>
-	<description>
-		<!--  Use CDATA to keep it on a single line in the manifest -->
-		<![CDATA[Example batch jobs using Spring Batch Core and Execution.]]>
-	</description>
-
-	<parent>
-		<groupId>org.springframework.batch</groupId>
-		<artifactId>spring-batch</artifactId>
-		<version>1.0.0.rc1-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-
-	<profiles>
-		<profile>
-			<id>clover</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-clover-plugin</artifactId>
-					</plugin>
-				</plugins>
-			</build>
-			<reporting>
-				<plugins>
-					<plugin>
-						<artifactId>maven-clover-plugin</artifactId>
-					</plugin>
-				</plugins>
-			</reporting>
-		</profile>
-	</profiles>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.batch</groupId>
-			<artifactId>spring-batch-execution</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>aspectj</groupId>
-			<artifactId>aspectjrt</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springmodules</groupId>
-			<artifactId>spring-modules-validation</artifactId>
-			<version>0.8</version>
-			<exclusions>
-				<exclusion>
-					<groupId>rhino</groupId>
-					<artifactId>js</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>commons-validator</groupId>
-					<artifactId>commons-validator</artifactId>
-				</exclusion>
-	        	<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring</artifactId>
-	        	</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>quartz</groupId>
-			<artifactId>quartz</artifactId>
-			<version>1.5.1</version>
-		</dependency>
-		<dependency>
-			<groupId>asm</groupId>
-			<artifactId>asm-all</artifactId>
-			<version>2.2.3</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>aspectj</groupId>
-			<artifactId>aspectjweaver</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-dbcp</groupId>
-			<artifactId>commons-dbcp</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-	        <groupId>org.springframework.ws</groupId>
-			<artifactId>spring-oxm</artifactId>
-	        <version>1.0.0</version>
-	        <optional>true</optional>
-	        <exclusions>
-	        	<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-beans</artifactId>
-	        	</exclusion>
-	        	<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-core</artifactId>
-	        	</exclusion>
-	        </exclusions>
-		</dependency>
-		<dependency>
-			<groupId>geronimo-spec</groupId>
-			<artifactId>geronimo-spec-j2ee</artifactId>
-			<version>1.4-rc4</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>easymock</groupId>
-			<artifactId>easymock</artifactId>
-		</dependency>
-		<!-- optional dependency from infrastructure -->
-		<dependency>
-			<groupId>com.thoughtworks.xstream</groupId>
-			<artifactId>xstream</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<!-- optional dependency from infrastructure -->
-		<dependency>
-			<groupId>stax</groupId>
-			<artifactId>stax</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>xmlunit</groupId>
-			<artifactId>xmlunit</artifactId>
-			<scope>test</scope>
-			<version>1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<!-- Needed by Hibernate if JTA is excluded -->
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jta_1.1_spec</artifactId>
-			<version>1.1</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<!-- Force Hibernate to use a particular nodep version of cglib in case of clash with Spring AOP -->
-			<groupId>cglib</groupId>
-			<artifactId>cglib-nodep</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>backport-util-concurrent</groupId>
-			<artifactId>backport-util-concurrent</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ibatis</groupId>
-			<artifactId>ibatis-sqlmap</artifactId>
-			<version>2.3.0</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>derby</artifactId>
-			<version>10.2.1.6</version>
-			<scope>test</scope>
-		</dependency>
-<!-- Spring Dependencies -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>generate-sql</id>
-						<phase>generate-sources</phase>
-						<configuration>
-							<tasks>
-								<typedef resource="foundrylogic/vpp/typedef.properties" />
-								<taskdef resource="foundrylogic/vpp/taskdef.properties" />
-								<!-- Reference script for HSQLDB - N.B. not under source control, but packagaed in jar. -->
-								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
-									<config>
-										<context>
-											<property key="includes" value="src/main/sql" />
-											<property file="${basedir}/src/main/sql/hsqldb.properties" />
-										</context>
-										<engine>
-											<property key="velocimacro.library" value="src/main/sql/hsqldb.vpp" />
-										</engine>
-									</config>
-									<fileset dir="${basedir}/src/main/sql" includes="business-schema.sql.vpp" />
-									<mapper type="glob" from="*.sql.vpp" to="*-hsqldb.sql" />
-								</vppcopy>
-								<!-- Reference script for DB2 - N.B. not under source control, but packagaed in jar. -->
-								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
-									<config>
-										<context>
-											<property key="includes" value="src/main/sql" />
-											<property file="${basedir}/src/main/sql/db2.properties" />
-										</context>
-										<engine>
-											<property key="velocimacro.library" value="src/main/sql/db2.vpp" />
-										</engine>
-									</config>
-									<fileset dir="${basedir}/src/main/sql" includes="business-schema.sql.vpp" />
-									<mapper type="glob" from="*.sql.vpp" to="*-db2.sql" />
-								</vppcopy>
-								<!-- Reference script for Derby - N.B. not under source control, but packagaed in jar. -->
-								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
-									<config>
-										<context>
-											<property key="includes" value="src/main/sql" />
-											<property file="${basedir}/src/main/sql/derby.properties" />
-										</context>
-										<engine>
-											<property key="velocimacro.library" value="src/main/sql/derby.vpp" />
-										</engine>
-									</config>
-									<fileset dir="${basedir}/src/main/sql" includes="business-schema.sql.vpp" />
-									<mapper type="glob" from="*.sql.vpp" to="*-derby.sql" />
-								</vppcopy>
-								<!-- Reference script for Oracle - N.B. not under source control, but packagaed in jar. -->
-								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
-									<config>
-										<context>
-											<property key="includes" value="src/main/sql" />
-											<property file="${basedir}/src/main/sql/oracle10g.properties" />
-										</context>
-										<engine>
-											<property key="velocimacro.library" value="src/main/sql/oracle10g.vpp" />
-										</engine>
-									</config>
-									<fileset dir="${basedir}/src/main/sql" includes="business-schema.sql.vpp" />
-									<mapper type="glob" from="*.sql.vpp" to="*-oracle10g.sql" />
-								</vppcopy>
-								<!-- Reference script for PostgreSQL - N.B. not under source control, but packagaed in jar. -->
-								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
-									<config>
-										<context>
-											<property key="includes" value="src/main/sql" />
-											<property file="${basedir}/src/main/sql/postgresql.properties" />
-										</context>
-										<engine>
-											<property key="velocimacro.library" value="src/main/sql/postgresql.vpp" />
-										</engine>
-									</config>
-									<fileset dir="${basedir}/src/main/sql" includes="business-schema.sql.vpp" />
-									<mapper type="glob" from="*.sql.vpp" to="*-postgresql.sql" />
-								</vppcopy>
-								<!-- Reference script for MySQL - N.B. not under source control, but packaged in jar. -->
-								<vppcopy todir="${basedir}/target/generated-resources" overwrite="true">
-									<config>
-										<context>
-											<property key="includes" value="src/main/sql" />
-											<property file="${basedir}/src/main/sql/mysql.properties" />
-										</context>
-										<engine>
-											<property key="velocimacro.library" value="src/main/sql/mysql.vpp" />
-										</engine>
-									</config>
-									<fileset dir="${basedir}/src/main/sql" includes="business-schema.sql.vpp" />
-									<mapper type="glob" from="*.sql.vpp" to="*-mysql.sql" />
-								</vppcopy>
-							</tasks>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>spring-batch-samples</artifactId>
+	<packaging>jar</packaging>
+	<name>Samples</name>
+	<description>
+		<!--  Use CDATA to keep it on a single line in the manifest -->
+		<![CDATA[Example batch jobs using Spring Batch Core and Execution.]]>
+	</description>
+
+	<parent>
+		<groupId>org.springframework.batch</groupId>
+		<artifactId>spring-batch</artifactId>
+		<version>1.0.0.rc1-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+
+	<profiles>
+		<profile>
+			<id>clover</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-clover-plugin</artifactId>
+					</plugin>
+				</plugins>
+			</build>
+			<reporting>
+				<plugins>
+					<plugin>
+						<artifactId>maven-clover-plugin</artifactId>
+					</plugin>
+				</plugins>
+			</reporting>
+		</profile>
+	</profiles>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.batch</groupId>
+			<artifactId>spring-batch-execution</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springmodules</groupId>
+			<artifactId>spring-modules-validation</artifactId>
+			<version>0.8</version>
+			<exclusions>
+				<exclusion>
+					<groupId>rhino</groupId>
+					<artifactId>js</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>commons-validator</groupId>
+					<artifactId>commons-validator</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>quartz</groupId>
+			<artifactId>quartz</artifactId>
+			<version>1.5.1</version>
+		</dependency>
+		<dependency>
+			<groupId>asm</groupId>
+			<artifactId>asm-all</artifactId>
+			<version>2.2.3</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>aspectj</groupId>
+			<artifactId>aspectjweaver</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>hsqldb</groupId>
+			<artifactId>hsqldb</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>commons-dbcp</groupId>
+			<artifactId>commons-dbcp</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.ws</groupId>
+			<artifactId>spring-oxm</artifactId>
+			<version>1.0.0</version>
+			<optional>true</optional>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-beans</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-core</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>geronimo-spec</groupId>
+			<artifactId>geronimo-spec-j2ee</artifactId>
+			<version>1.4-rc4</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>easymock</groupId>
+			<artifactId>easymock</artifactId>
+		</dependency>
+		<!-- optional dependency from infrastructure -->
+		<dependency>
+			<groupId>com.thoughtworks.xstream</groupId>
+			<artifactId>xstream</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<!-- optional dependency from infrastructure -->
+		<dependency>
+			<groupId>stax</groupId>
+			<artifactId>stax</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>xmlunit</groupId>
+			<artifactId>xmlunit</artifactId>
+			<scope>test</scope>
+			<version>1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<!-- Needed by Hibernate if JTA is excluded -->
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-jta_1.1_spec</artifactId>
+			<version>1.1</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<!-- Force Hibernate to use a particular nodep version of cglib in case of clash with Spring AOP -->
+			<groupId>cglib</groupId>
+			<artifactId>cglib-nodep</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>backport-util-concurrent</groupId>
+			<artifactId>backport-util-concurrent</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.ibatis</groupId>
+			<artifactId>ibatis-sqlmap</artifactId>
+			<version>2.3.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.derby</groupId>
+			<artifactId>derby</artifactId>
+			<version>10.2.1.6</version>
+			<scope>test</scope>
+		</dependency>
+		<!-- Spring Dependencies -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<scope>test</scope>
+		</dependency>
+		
+		<!-- JMX for Java 1.4 -->
+		<dependency>
+			<groupId>mx4j</groupId>
+			<artifactId>mx4j</artifactId>
+			<version>3.0.2</version>
+			<scope>optional</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-sql</id>
+						<phase>generate-sources</phase>
+						<configuration>
+							<tasks>
+								<typedef
+									resource="foundrylogic/vpp/typedef.properties" />
+								<taskdef
+									resource="foundrylogic/vpp/taskdef.properties" />
+								<!-- Reference script for HSQLDB - N.B. not under source control, but packagaed in jar. -->
+								<vppcopy
+									todir="${basedir}/target/generated-resources"
+									overwrite="true">
+									<config>
+										<context>
+											<property key="includes"
+												value="src/main/sql" />
+											<property
+												file="${basedir}/src/main/sql/hsqldb.properties" />
+										</context>
+										<engine>
+											<property
+												key="velocimacro.library" value="src/main/sql/hsqldb.vpp" />
+										</engine>
+									</config>
+									<fileset
+										dir="${basedir}/src/main/sql"
+										includes="business-schema.sql.vpp" />
+									<mapper type="glob" from="*.sql.vpp"
+										to="*-hsqldb.sql" />
+								</vppcopy>
+								<!-- Reference script for DB2 - N.B. not under source control, but packagaed in jar. -->
+								<vppcopy
+									todir="${basedir}/target/generated-resources"
+									overwrite="true">
+									<config>
+										<context>
+											<property key="includes"
+												value="src/main/sql" />
+											<property
+												file="${basedir}/src/main/sql/db2.properties" />
+										</context>
+										<engine>
+											<property
+												key="velocimacro.library" value="src/main/sql/db2.vpp" />
+										</engine>
+									</config>
+									<fileset
+										dir="${basedir}/src/main/sql"
+										includes="business-schema.sql.vpp" />
+									<mapper type="glob" from="*.sql.vpp"
+										to="*-db2.sql" />
+								</vppcopy>
+								<!-- Reference script for Derby - N.B. not under source control, but packagaed in jar. -->
+								<vppcopy
+									todir="${basedir}/target/generated-resources"
+									overwrite="true">
+									<config>
+										<context>
+											<property key="includes"
+												value="src/main/sql" />
+											<property
+												file="${basedir}/src/main/sql/derby.properties" />
+										</context>
+										<engine>
+											<property
+												key="velocimacro.library" value="src/main/sql/derby.vpp" />
+										</engine>
+									</config>
+									<fileset
+										dir="${basedir}/src/main/sql"
+										includes="business-schema.sql.vpp" />
+									<mapper type="glob" from="*.sql.vpp"
+										to="*-derby.sql" />
+								</vppcopy>
+								<!-- Reference script for Oracle - N.B. not under source control, but packagaed in jar. -->
+								<vppcopy
+									todir="${basedir}/target/generated-resources"
+									overwrite="true">
+									<config>
+										<context>
+											<property key="includes"
+												value="src/main/sql" />
+											<property
+												file="${basedir}/src/main/sql/oracle10g.properties" />
+										</context>
+										<engine>
+											<property
+												key="velocimacro.library"
+												value="src/main/sql/oracle10g.vpp" />
+										</engine>
+									</config>
+									<fileset
+										dir="${basedir}/src/main/sql"
+										includes="business-schema.sql.vpp" />
+									<mapper type="glob" from="*.sql.vpp"
+										to="*-oracle10g.sql" />
+								</vppcopy>
+								<!-- Reference script for PostgreSQL - N.B. not under source control, but packagaed in jar. -->
+								<vppcopy
+									todir="${basedir}/target/generated-resources"
+									overwrite="true">
+									<config>
+										<context>
+											<property key="includes"
+												value="src/main/sql" />
+											<property
+												file="${basedir}/src/main/sql/postgresql.properties" />
+										</context>
+										<engine>
+											<property
+												key="velocimacro.library"
+												value="src/main/sql/postgresql.vpp" />
+										</engine>
+									</config>
+									<fileset
+										dir="${basedir}/src/main/sql"
+										includes="business-schema.sql.vpp" />
+									<mapper type="glob" from="*.sql.vpp"
+										to="*-postgresql.sql" />
+								</vppcopy>
+								<!-- Reference script for MySQL - N.B. not under source control, but packaged in jar. -->
+								<vppcopy
+									todir="${basedir}/target/generated-resources"
+									overwrite="true">
+									<config>
+										<context>
+											<property key="includes"
+												value="src/main/sql" />
+											<property
+												file="${basedir}/src/main/sql/mysql.properties" />
+										</context>
+										<engine>
+											<property
+												key="velocimacro.library" value="src/main/sql/mysql.vpp" />
+										</engine>
+									</config>
+									<fileset
+										dir="${basedir}/src/main/sql"
+										includes="business-schema.sql.vpp" />
+									<mapper type="glob" from="*.sql.vpp"
+										to="*-mysql.sql" />
+								</vppcopy>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java
index 9185ab3d7..1e9f3b7bb 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDao.java
@@ -20,12 +20,12 @@ public class JdbcPlayerSummaryDao extends JdbcDaoSupport implements ItemWriter {
 		
 		PlayerSummary summary = (PlayerSummary)output;
 		
-		Object[] args = new Object[]{summary.getId(), Integer.valueOf(summary.getYear()),
-				Integer.valueOf(summary.getCompletes()), Integer.valueOf(summary.getAttempts()),
-				Integer.valueOf(summary.getPassingYards()), Integer.valueOf(summary.getPassingTd()),
-				Integer.valueOf(summary.getInterceptions()), Integer.valueOf(summary.getRushes()),
-				Integer.valueOf(summary.getRushYards()), Integer.valueOf(summary.getReceptions()),
-				Integer.valueOf(summary.getReceptionYards()), Integer.valueOf(summary.getTotalTd()) };
+		Object[] args = new Object[]{summary.getId(), new Integer(summary.getYear()),
+				new Integer(summary.getCompletes()), new Integer(summary.getAttempts()),
+				new Integer(summary.getPassingYards()), new Integer(summary.getPassingTd()),
+				new Integer(summary.getInterceptions()), new Integer(summary.getRushes()),
+				new Integer(summary.getRushYards()), new Integer(summary.getReceptions()),
+				new Integer(summary.getReceptionYards()), new Integer(summary.getTotalTd()) };
 		
 		getJdbcTemplate().update(INSERT_SUMMARY, args);
 	}
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java
index 09b3d430f..a1ad23597 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java
@@ -68,7 +68,7 @@ public class FixedLengthImportJobFunctionalTests extends AbstractValidatingBatch
 					trade = (Trade)inputSource.read();
 				}
 				catch (Exception e) {
-					throw new IllegalStateException(e);
+					throw new IllegalStateException(e.getMessage());
 				}
 				assertEquals(trade.getIsin(), rs.getString(2));
 				assertEquals(trade.getQuantity(),rs.getLong(3));
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/advice/JobExecutionNotificationPublisherTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/advice/JobExecutionNotificationPublisherTests.java
index e37346e98..6b37b91d5 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/advice/JobExecutionNotificationPublisherTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/advice/JobExecutionNotificationPublisherTests.java
@@ -43,7 +43,7 @@ public class JobExecutionNotificationPublisherTests extends TestCase {
 		publisher.onApplicationEvent(new SimpleMessageApplicationEvent(this, "foo"));
 		assertEquals(1, list.size());
 		String message = ((Notification) list.get(0)).getMessage();
-		assertTrue("Message does not contain 'foo': ", message.contains("foo"));
+		assertTrue("Message does not contain 'foo': ", message.indexOf("foo") > 0);
 	}
 
 }
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java
index f600c0ac8..b75e2a6ab 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java
@@ -64,7 +64,7 @@ public class JdbcGameDaoIntegrationTests extends AbstractTransactionalDataSource
 		gameDao.write(game);
 
 		Game tempGame = (Game) getJdbcTemplate().queryForObject("SELECT * FROM GAMES where PLAYER_ID=? AND YEAR_NO=?",
-				new Object[] { game.getId(), Integer.valueOf(game.getYear()) }, new GameRowMapper());
+				new Object[] { game.getId(), new Integer(game.getYear()) }, new GameRowMapper());
 		assertEquals(tempGame, game);
 	}
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderTransformerTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderTransformerTests.java
index 7ed5ec678..026bcac77 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderTransformerTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderTransformerTests.java
@@ -54,7 +54,7 @@ public class OrderTransformerTests extends TestCase {
 		order.setBillingAddress(new Address());
 		order.setBilling(new BillingInfo());
 		order.setLineItems(Collections.EMPTY_LIST);
-		order.setTotalPrice(BigDecimal.TEN);
+		order.setTotalPrice(new BigDecimal(10));
 		Object result = converter.transform(order);
 		assertTrue(result instanceof Collection);
 	}