diff --git a/spring-batch-samples/.springBeans b/spring-batch-samples/.springBeans
index 7285cbd34..04c2ec5b5 100644
--- a/spring-batch-samples/.springBeans
+++ b/spring-batch-samples/.springBeans
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[2.0.3.v200802061800]]></pluginVersion>
+	<pluginVersion><![CDATA[2.0.2.v200712142013]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
-	<enableImports><![CDATA[false]]></enableImports>
 	<configs>
 		<config>src/main/resources/jobs/fixedLengthImportJob.xml</config>
 		<config>src/main/resources/jobs/multilineJob.xml</config>
@@ -29,7 +28,6 @@
 		<config>src/main/resources/beanRefContext.xml</config>
 		<config>src/main/resources/jobs/delegatingJob.xml</config>
 		<config>src/main/resources/jobs/parallelJob.xml</config>
-		<config>src/main/resources/jobs/rollbackJob.xml</config>
 		<config>src/main/resources/jobs/retrySample.xml</config>
 		<config>src/main/resources/jobs/simpleJob.xml</config>
 		<config>src/main/resources/simple-job-launcher-context.xml</config>
@@ -38,6 +36,7 @@
 		<config>src/main/resources/adhoc-job-launcher-context.xml</config>
 		<config>src/main/resources/alt-data-source-context.xml</config>
 		<config>src/main/resources/quartz-job-launcher-context.xml</config>
+		<config>src/main/resources/jobs/skipSampleJob.xml</config>
 	</configs>
 	<configSets>
 		<configSet>
@@ -244,17 +243,6 @@
 				<config>src/main/resources/simple-job-launcher-context.xml</config>
 			</configs>
 		</configSet>
-		<configSet>
-			<name><![CDATA[rollback]]></name>
-			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/jobs/rollbackJob.xml</config>
-				<config>src/main/resources/jobs/tradeJobIo.xml</config>
-				<config>src/main/resources/simple-job-launcher-context.xml</config>
-			</configs>
-		</configSet>
 		<configSet>
 			<name><![CDATA[staging]]></name>
 			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
@@ -284,5 +272,16 @@
 				<config>src/main/resources/simple-job-launcher-context.xml</config>
 			</configs>
 		</configSet>
+		<configSet>
+			<name><![CDATA[skipSample]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/jobs/skipSampleJob.xml</config>
+				<config>src/main/resources/simple-job-launcher-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+			</configs>
+		</configSet>
 	</configSets>
 </beansProjectDescription>
diff --git a/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
similarity index 100%
rename from spring-batch-samples/src/main/resources/jobs/rollbackJob.xml
rename to spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RollbackJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java
similarity index 90%
rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/RollbackJobFunctionalTests.java
rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java
index c4e1b7b12..ced5ef126 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RollbackJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SkipSampleFunctionalTests.java
@@ -10,7 +10,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
  * 
  * @author Robert Kasanicky
  */
-public class RollbackJobFunctionalTests extends AbstractValidatingBatchLauncherTests {
+public class SkipSampleFunctionalTests extends AbstractValidatingBatchLauncherTests {
 
 	int before = -1;
 
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/RollbackJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/SkipSampleFunctionalTests-context.xml
similarity index 86%
rename from spring-batch-samples/src/test/resources/org/springframework/batch/sample/RollbackJobFunctionalTests-context.xml
rename to spring-batch-samples/src/test/resources/org/springframework/batch/sample/SkipSampleFunctionalTests-context.xml
index d517e4008..9bc6e791c 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/RollbackJobFunctionalTests-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/SkipSampleFunctionalTests-context.xml
@@ -5,6 +5,6 @@
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
 	<import resource="classpath:/simple-job-launcher-context.xml" />
-	<import resource="classpath:/jobs/rollbackJob.xml" />
+	<import resource="classpath:/jobs/skipSampleJob.xml" />
 
 </beans>