diff --git a/spring-batch-execution/.classpath b/spring-batch-execution/.classpath
index 521ffcfb5..b6d9ce7c7 100644
--- a/spring-batch-execution/.classpath
+++ b/spring-batch-execution/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
-	<classpathentry kind="src" output="bin/test-classes" path="src/test/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" output="bin/test-classes" path="src/test/resources"/>
+	<classpathentry including="**/*.java" kind="src" output="bin/test-classes" path="src/test/java"/>
+	<classpathentry excluding="**/*.java" including="**" kind="src" path="src/main/resources"/>
+	<classpathentry excluding="**/*.java" including="**" kind="src" output="bin/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.devzuz.q.maven.jdt.core.mavenClasspathContainer"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin/classes"/>
diff --git a/spring-batch-execution/.settings/org.eclipse.jdt.core.prefs b/spring-batch-execution/.settings/org.eclipse.jdt.core.prefs
index 6498f7be3..f13e0b065 100644
--- a/spring-batch-execution/.settings/org.eclipse.jdt.core.prefs
+++ b/spring-batch-execution/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,7 @@
-#Mon Feb 25 10:12:41 GMT 2008
+#Thu Mar 06 17:27:20 GMT 2008
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
 org.eclipse.jdt.core.compiler.compliance=1.4
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.4
diff --git a/spring-batch-execution/.springBeans b/spring-batch-execution/.springBeans
index 7d698662f..3f58094ef 100644
--- a/spring-batch-execution/.springBeans
+++ b/spring-batch-execution/.springBeans
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[2.0.2.v200712142013]]></pluginVersion>
+	<pluginVersion><![CDATA[2.0.3.v200802061800]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
+	<enableImports><![CDATA[false]]></enableImports>
 	<configs>
 		<config>src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml</config>
 		<config>src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml</config>
@@ -13,13 +14,6 @@
 		<config>src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml</config>
 	</configs>
 	<configSets>
-		<configSet>
-			<name><![CDATA[bootstrap]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-			</configs>
-		</configSet>
 		<configSet>
 			<name><![CDATA[sqltest]]></name>
 			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml
index 260707acb..33b2f5f80 100644
--- a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml
+++ b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml
@@ -38,11 +38,4 @@
 		<property name="incrementerName" value="BATCH_STEP_EXECUTION_SEQ" />
 	</bean>
 
-	<bean id="partitionIncrementer" parent="incrementerParent">
-		<property name="incrementerName" value="BATCH_PARTITION_SEQ" />
-	</bean>
-
-	<bean id="partitionExecutionIncrementer" parent="incrementerParent">
-		<property name="incrementerName" value="BATCH_PARTITION_EXECUTION_SEQ" />
-	</bean>
 </beans>
\ No newline at end of file
diff --git a/spring-batch-infrastructure/.classpath b/spring-batch-infrastructure/.classpath
index 317ed9707..bf5d1cf16 100644
--- a/spring-batch-infrastructure/.classpath
+++ b/spring-batch-infrastructure/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
-	<classpathentry kind="src" output="bin/test-classes" path="src/test/java"/>
-	<classpathentry kind="src" output="bin/test-classes" path="src/test/resources"/>
+	<classpathentry including="**/*.java" kind="src" output="bin/test-classes" path="src/test/java"/>
+	<classpathentry excluding="**/*.java" including="**" kind="src" output="bin/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.devzuz.q.maven.jdt.core.mavenClasspathContainer"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin/classes"/>
diff --git a/spring-batch-infrastructure/.settings/org.eclipse.jdt.core.prefs b/spring-batch-infrastructure/.settings/org.eclipse.jdt.core.prefs
index 2021b6bf0..b97ef7d41 100644
--- a/spring-batch-infrastructure/.settings/org.eclipse.jdt.core.prefs
+++ b/spring-batch-infrastructure/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,8 @@
-#Tue Mar 04 12:26:32 GMT 2008
+#Thu Mar 06 17:21:58 GMT 2008
 eclipse.preferences.version=1
 instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
 org.eclipse.jdt.core.compiler.compliance=1.4
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.source=1.4
diff --git a/spring-batch-samples/.classpath b/spring-batch-samples/.classpath
index b6d9ce7c7..6ceeb8b67 100644
--- a/spring-batch-samples/.classpath
+++ b/spring-batch-samples/.classpath
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
-	<classpathentry including="**/*.java" kind="src" output="bin/test-classes" path="src/test/java"/>
+	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**/*.java" including="**" kind="src" path="src/main/resources"/>
-	<classpathentry excluding="**/*.java" including="**" kind="src" output="bin/test-classes" path="src/test/resources"/>
+	<classpathentry excluding="**/*.java" including="**" kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.devzuz.q.maven.jdt.core.mavenClasspathContainer"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin/classes"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml b/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
index 5f5581209..82665ba54 100644
--- a/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
+++ b/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:p="http://www.springframework.org/schema/p"
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
@@ -13,34 +11,28 @@
 
 	<bean id="jobConfigurationRegistryBeanPostProcessor"
 		class="org.springframework.batch.execution.configuration.JobRegistryBeanPostProcessor">
-		<property name="jobRegistry"
-			ref="jobConfigurationRegistry" />
+		<property name="jobRegistry" ref="jobConfigurationRegistry" />
 	</bean>
 
-	<bean id="jobLauncher"
-		class="org.springframework.batch.execution.launch.SimpleJobLauncher">
+	<bean id="jobLauncher" class="org.springframework.batch.execution.launch.SimpleJobLauncher">
 		<property name="jobRepository" ref="jobRepository" />
 	</bean>
 
-	<bean id="jobConfigurationRegistry"
-		class="org.springframework.batch.execution.configuration.MapJobRegistry" />
+	<bean id="jobConfigurationRegistry" class="org.springframework.batch.execution.configuration.MapJobRegistry" />
 
 	<aop:config>
-		<aop:advisor
-			pointcut="execution(* org.springframework.batch.execution..*Repository+.*(..))"
+		<aop:advisor pointcut="execution(* org.springframework.batch.execution..*Repository+.*(..))"
 			advice-ref="txAdvice" />
 	</aop:config>
 
 	<tx:advice id="txAdvice" transaction-manager="transactionManager">
 		<tx:attributes>
-			<tx:method name="*Create*" propagation="REQUIRES_NEW"
-				isolation="SERIALIZABLE" />
+			<tx:method name="*Create*" propagation="REQUIRES_NEW" isolation="SERIALIZABLE" />
 			<tx:method name="*" />
 		</tx:attributes>
 	</tx:advice>
-	
-	<bean id="jobRepository"
-		class="org.springframework.batch.execution.repository.JobRepositoryFactoryBean"
+
+	<bean id="jobRepository" class="org.springframework.batch.execution.repository.JobRepositoryFactoryBean"
 		p:databaseType="hsql" p:dataSource-ref="dataSource" />
 
 	<bean id="mapJobInstanceDao" lazy-init="true"
@@ -52,27 +44,21 @@
 	<bean id="mapStepExecutionDao" lazy-init="true"
 		class="org.springframework.batch.execution.repository.dao.MapStepExecutionDao" />
 
-	<bean id="jdbcTemplate"
-		class="org.springframework.jdbc.core.JdbcTemplate">
+	<bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
 		<property name="dataSource" ref="dataSource" />
 	</bean>
 
-	<bean id="simpleJob"
-		class="org.springframework.batch.execution.job.SimpleJob"
-		abstract="true">
+	<bean id="simpleJob" class="org.springframework.batch.execution.job.SimpleJob" abstract="true">
 		<property name="jobRepository" ref="jobRepository" />
 		<property name="restartable" value="true" />
 	</bean>
 
-	<bean id="taskletStep"
-		class="org.springframework.batch.execution.step.TaskletStep"
-		abstract="true">
+	<bean id="taskletStep" class="org.springframework.batch.execution.step.TaskletStep" abstract="true">
 		<property name="jobRepository" ref="jobRepository" />
 		<property name="allowStartIfComplete" value="true" />
 	</bean>
 
-	<bean id="simpleStep"
-		class="org.springframework.batch.execution.step.support.DefaultStepFactoryBean"
+	<bean id="simpleStep" class="org.springframework.batch.execution.step.support.DefaultStepFactoryBean"
 		abstract="true">
 		<property name="transactionManager" ref="transactionManager" />
 		<property name="jobRepository" ref="jobRepository" />
@@ -80,22 +66,17 @@
 		<property name="commitInterval" value="1" />
 	</bean>
 
-	<bean id="customEditorConfigurer"
-		class="org.springframework.beans.factory.config.CustomEditorConfigurer">
+	<bean id="customEditorConfigurer" class="org.springframework.beans.factory.config.CustomEditorConfigurer">
 		<property name="customEditors">
 			<map>
 				<entry key="int[]">
-					<bean
-						class="org.springframework.batch.support.IntArrayPropertyEditor" />
+					<bean class="org.springframework.batch.support.IntArrayPropertyEditor" />
 				</entry>
-				<entry
-					key="org.springframework.batch.io.file.transform.Range[]">
-					<bean
-						class="org.springframework.batch.io.file.transform.RangeArrayPropertyEditor" />
+				<entry key="org.springframework.batch.io.file.transform.Range[]">
+					<bean class="org.springframework.batch.io.file.transform.RangeArrayPropertyEditor" />
 				</entry>
 				<entry key="java.util.Date">
-					<bean
-						class="org.springframework.beans.propertyeditors.CustomDateEditor">
+					<bean class="org.springframework.beans.propertyeditors.CustomDateEditor">
 						<constructor-arg>
 							<bean class="java.text.SimpleDateFormat">
 								<constructor-arg value="yyyyMMdd" />
@@ -108,27 +89,19 @@
 		</property>
 	</bean>
 
-	<bean id="logAdvice"
-		class="org.springframework.batch.sample.advice.ProcessorLogAdvice" />
+	<bean id="logAdvice" class="org.springframework.batch.sample.advice.ProcessorLogAdvice" />
 
-	<bean id="eventAdvice"
-		class="org.springframework.batch.sample.advice.MethodExecutionApplicationEventAdvice" />
+	<bean id="eventAdvice" class="org.springframework.batch.sample.advice.MethodExecutionApplicationEventAdvice" />
 
 	<aop:config>
 		<aop:aspect ref="logAdvice">
-			<aop:after
-				pointcut="execution( * org.springframework.batch.sample..InfiniteLoopTasklet+.execute(..))"
+			<aop:after pointcut="execution( * org.springframework.batch.sample..InfiniteLoopTasklet+.execute(..))"
 				method="doBasicLogging" />
 		</aop:aspect>
 		<aop:aspect ref="eventAdvice">
-			<aop:before
-				pointcut="execution( * org.springframework.batch..Step+.execute(..))"
-				method="before" />
-			<aop:after
-				pointcut="execution( * org.springframework.batch..Step+.execute(..))"
-				method="after" />
-			<aop:after-throwing throwing="t"
-				pointcut="execution( * org.springframework.batch..Step+.execute(..))"
+			<aop:before pointcut="execution( * org.springframework.batch..Step+.execute(..))" method="before" />
+			<aop:after pointcut="execution( * org.springframework.batch..Step+.execute(..))" method="after" />
+			<aop:after-throwing throwing="t" pointcut="execution( * org.springframework.batch..Step+.execute(..))"
 				method="onError" />
 		</aop:aspect>
 	</aop:config>