diff --git a/spring-batch-execution/.classpath b/spring-batch-execution/.classpath
index 6165ff76e..992ed6aa5 100644
--- a/spring-batch-execution/.classpath
+++ b/spring-batch-execution/.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="target/test-classes" path="src/test/java"/>
-	<classpathentry excluding="**/*.java" including="**" kind="src" path="src/main/resources"/>
-	<classpathentry excluding="**/*.java" including="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry exported="true" kind="con" path="org.devzuz.q.maven.jdt.core.mavenClasspathContainer"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" 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="target/classes"/>
+	<classpathentry kind="output" path="Dave/Spring/spring-batch/trunk/spring-batch-execution/target/classes"/>
 </classpath>
diff --git a/spring-batch-execution/.settings/org.eclipse.jdt.core.prefs b/spring-batch-execution/.settings/org.eclipse.jdt.core.prefs
index cf0919644..6498f7be3 100644
--- a/spring-batch-execution/.settings/org.eclipse.jdt.core.prefs
+++ b/spring-batch-execution/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,5 @@
-#Thu Jan 31 17:05:10 GMT 2008
+#Mon Feb 25 10:12:41 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/src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryDerby.xml b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryDerby.xml
index 46d7f4a48..9184a38c5 100644
--- a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryDerby.xml
+++ b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryDerby.xml
@@ -5,9 +5,9 @@
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-1.0.xsd">
 
-	<job-repository data-source="dataSource" db-type="derby"/>
-	
+	<job-repository data-source="dataSource" db-type="derby" />
+
 	<beans:bean id="dataSource"
-			class="org.springframework.batch.execution.configuration.StubDataSource"/>
+		class="org.springframework.batch.execution.configuration.StubDataSource" />
 
 </beans:beans>
\ No newline at end of file
diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryHsql.xml b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryHsql.xml
index 3df2d5aeb..7720d4647 100644
--- a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryHsql.xml
+++ b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryHsql.xml
@@ -5,9 +5,9 @@
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-1.0.xsd">
 
-	<job-repository data-source="dataSource" db-type="hsql"/>
-	
+	<job-repository data-source="dataSource" db-type="hsql" />
+
 	<beans:bean id="dataSource"
-			class="org.springframework.batch.execution.configuration.StubDataSource"/>
+		class="org.springframework.batch.execution.configuration.StubDataSource" />
 
 </beans:beans>
\ No newline at end of file
diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryMissingDataSource.xml b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryMissingDataSource.xml
index b6e7505f9..015b888e5 100644
--- a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryMissingDataSource.xml
+++ b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/BatchNamespaceHandlerJobRepositoryMissingDataSource.xml
@@ -5,6 +5,6 @@
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-1.0.xsd">
 
-	<job-repository data-source="" db-type="db2"/>
+	<job-repository data-source="" db-type="db2" />
 
 </beans:beans>
\ No newline at end of file
diff --git a/spring-batch-infrastructure/.classpath b/spring-batch-infrastructure/.classpath
index cd4c91139..623ecbc7a 100644
--- a/spring-batch-infrastructure/.classpath
+++ b/spring-batch-infrastructure/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
 	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**/*.java" including="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry exported="true" kind="con" path="org.devzuz.q.maven.jdt.core.mavenClasspathContainer"/>
+	<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="target/classes"/>
 </classpath>
diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml
index 4967ef2d8..9cb154a2e 100644
--- a/spring-batch-samples/pom.xml
+++ b/spring-batch-samples/pom.xml
@@ -200,20 +200,6 @@
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.3</version>
-				<configuration>
-					<!--forkMode>pertest</forkMode-->
-					<includes>
-						<include>**/*Tests.java</include>
-					</includes>
-					<excludes>
-						<exclude>**/Abstract*.java</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-antrun-plugin</artifactId>