diff --git a/spring-batch-execution/.springBeans b/spring-batch-execution/.springBeans
index 2683003dd..7d698662f 100644
--- a/spring-batch-execution/.springBeans
+++ b/spring-batch-execution/.springBeans
@@ -1,18 +1,14 @@
 <?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[true]]></enableImports>
 	<configs>
-		<config>src/test/resources/simple-container-definition.xml</config>
-		<config>src/test/resources/job-configuration.xml</config>
 		<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>
 		<config>src/test/resources/org/springframework/batch/execution/configuration/test-context.xml</config>
-		<config>src/test/resources/beanRefContext.xml</config>
 		<config>src/test/resources/org/springframework/batch/execution/bootstrap/support/job.xml</config>
 		<config>src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml</config>
 	</configs>
@@ -22,8 +18,6 @@
 			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
 			<incomplete>false</incomplete>
 			<configs>
-				<config>src/test/resources/job-configuration.xml</config>
-				<config>src/test/resources/simple-container-definition.xml</config>
 			</configs>
 		</configSet>
 		<configSet>
diff --git a/spring-batch-execution/src/test/resources/beanRefContext.xml b/spring-batch-execution/src/test/resources/beanRefContext.xml
deleted file mode 100644
index 5c1e149cd..000000000
--- a/spring-batch-execution/src/test/resources/beanRefContext.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" 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.0.xsd">
-
-	<bean id="batchExecutionEnvironment" class="org.springframework.context.support.ClassPathXmlApplicationContext">
-		<constructor-arg>
-			<value>simple-container-definition.xml</value>
-		</constructor-arg>
-	</bean>
-
-	<bean id="testBatchEnvironment" class="org.springframework.context.support.ClassPathXmlApplicationContext">
-		<constructor-arg>
-			<value>org/springframework/batch/execution/bootstrap/support/test-batch-environment.xml</value>
-		</constructor-arg>
-	</bean>
-
-	<bean id="testBatchEnvironmentNoLauncher" class="org.springframework.context.support.ClassPathXmlApplicationContext">
-		<constructor-arg>
-			<value>org/springframework/batch/execution/bootstrap/support/test-batch-environment-no-launcher.xml</value>
-		</constructor-arg>
-	</bean>
-
-</beans>
\ No newline at end of file
diff --git a/spring-batch-execution/src/test/resources/job-configuration.xml b/spring-batch-execution/src/test/resources/job-configuration.xml
deleted file mode 100644
index c7580e372..000000000
--- a/spring-batch-execution/src/test/resources/job-configuration.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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"
-	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.0.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
-
-	<bean
-		class="org.springframework.batch.execution.configuration.JobRegistryBeanPostProcessor">
-		<property name="jobRegistry" ref="jobRegistry" />
-	</bean>
-
-	<bean id="test-job"
-		class="org.springframework.batch.execution.job.JobSupport">
-		<property name="steps">
-			<bean id="step1"
-				class="org.springframework.batch.execution.step.support.DefaultStepFactoryBean">
-				<property name="itemReader">
-					<bean
-						class="org.springframework.batch.item.reader.ListItemReader">
-						<constructor-arg value="foo,bar,spam" />
-					</bean>
-				</property>
-				<property name="itemWriter">
-					<bean
-						class="org.springframework.batch.execution.launch.EmptyItemWriter" />
-				</property>
-				<property name="jobRepository"
-					ref="simpleJobRepository" />
-				<property name="transactionManager"
-					ref="transactionManager" />
-			</bean>
-		</property>
-	</bean>
-
-</beans>
diff --git a/spring-batch-execution/src/test/resources/simple-container-definition.xml b/spring-batch-execution/src/test/resources/simple-container-definition.xml
deleted file mode 100644
index 9c6901d8c..000000000
--- a/spring-batch-execution/src/test/resources/simple-container-definition.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?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"
-	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.0.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
-
-	<bean id="simpleContainerLauncher"
-		class="org.springframework.batch.execution.launch.SimpleJobLauncher">
-		<property name="jobRepository" ref="simpleJobRepository" />
-	</bean>
-
-	<bean id="jobRegistry"
-		class="org.springframework.batch.execution.configuration.MapJobRegistry" />
-
-	<bean id="simpleJob"
-		class="org.springframework.batch.execution.job.SimpleJob"
-		abstract="true">
-		<property name="restartable" value="true" />
-		<property name="jobRepository" ref="simpleJobRepository" />
-	</bean>
-
-	<bean id="simpleStep"
-		class="org.springframework.batch.execution.step.ItemOrientedStep"
-		abstract="true">
-		<property name="allowStartIfComplete" value="true" />
-		<property name="jobRepository" ref="jobRegistry" />
-		<property name="transactionManager" ref="transactionManager" />
-	</bean>
-
-	<bean id="transactionManager"
-		class="org.springframework.batch.support.transaction.ResourcelessTransactionManager" />
-
-	<bean id="simpleJobRepository"
-		class="org.springframework.batch.execution.repository.SimpleJobRepository">
-		<constructor-arg ref="jobInstanceDao" />
-		<constructor-arg ref="jobExecutionDao" />
-		<constructor-arg ref="stepDao" />
-	</bean>
-
-	<bean id="jobInstanceDao"
-		class="org.springframework.batch.execution.repository.dao.MapJobInstanceDao" />
-	<!-- init-method="clear"/-->
-	
-	<bean id="jobExecutionDao"
-		class="org.springframework.batch.execution.repository.dao.MapJobExecutionDao" />
-	<!-- init-method="clear"/-->
-
-	<bean id="stepDao"
-		class="org.springframework.batch.execution.repository.dao.MapStepExecutionDao" />
-	<!-- init-method="clear"/-->
-
-	<bean
-		class="org.springframework.batch.execution.launch.support.SimpleJvmExitCodeMapper" />
-
-	<bean
-		class="org.springframework.beans.factory.config.CustomEditorConfigurer">
-		<property name="customEditors">
-			<map>
-				<entry key="int[]">
-					<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>
-				<entry key="java.util.Date">
-					<bean
-						class="org.springframework.beans.propertyeditors.CustomDateEditor">
-						<constructor-arg>
-							<bean class="java.text.SimpleDateFormat">
-								<constructor-arg value="yyyyMMdd" />
-							</bean>
-						</constructor-arg>
-						<constructor-arg value="false" />
-					</bean>
-				</entry>
-			</map>
-		</property>
-	</bean>
-
-	<bean
-		class="org.springframework.batch.execution.launch.support.CommandLineJobRunnerTests$StubSystemExiter" />
-
-</beans>
diff --git a/spring-batch-samples/.springBeans b/spring-batch-samples/.springBeans
index c6ae57c3e..f7ec99f5f 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>
@@ -17,7 +16,6 @@
 		<config>src/main/resources/jobs/tradeJobIo.xml</config>
 		<config>src/main/resources/jobs/restartSample.xml</config>
 		<config>src/main/resources/data-source-context.xml</config>
-		<config>src/main/resources/simple-container-definition.xml</config>
 		<config>src/main/resources/jobs/beanWrapperMapperSampleJob.xml</config>
 		<config>src/main/resources/jobs/adhocLoopJob.xml</config>
 		<config>src/main/resources/jobs/infiniteLoopJob.xml</config>
@@ -43,7 +41,6 @@
 				<config>src/main/resources/jobs/adhocLoopJob.xml</config>
 				<config>src/main/resources/data-source-context.xml</config>
 				<config>src/main/resources/data-source-context-init.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
 			</configs>
 		</configSet>
 		<configSet>
@@ -54,7 +51,6 @@
 				<config>src/main/resources/jobs/beanWrapperMapperSampleJob.xml</config>
 				<config>src/main/resources/data-source-context.xml</config>
 				<config>src/main/resources/data-source-context-init.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
 			</configs>
 		</configSet>
 		<configSet>
@@ -65,7 +61,6 @@
 				<config>src/main/resources/jobs/fixedLengthImportJob.xml</config>
 				<config>src/main/resources/data-source-context.xml</config>
 				<config>src/main/resources/data-source-context-init.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
 			</configs>
 		</configSet>
 		<configSet>
@@ -76,7 +71,6 @@
 				<config>src/main/resources/jobs/infiniteLoopJob.xml</config>
 				<config>src/main/resources/data-source-context.xml</config>
 				<config>src/main/resources/data-source-context-init.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
 			</configs>
 		</configSet>
 		<configSet>
@@ -87,7 +81,6 @@
 				<config>src/main/resources/data-source-context.xml</config>
 				<config>src/main/resources/data-source-context-init.xml</config>
 				<config>src/main/resources/jobs/multilineJob.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
 			</configs>
 		</configSet>
 		<configSet>
@@ -98,7 +91,6 @@
 				<config>src/main/resources/data-source-context.xml</config>
 				<config>src/main/resources/data-source-context-init.xml</config>
 				<config>src/main/resources/jobs/restartSample.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
 			</configs>
 		</configSet>
 		<configSet>
@@ -110,7 +102,6 @@
 				<config>src/main/resources/data-source-context-init.xml</config>
 				<config>src/main/resources/jobs/tradeJob.xml</config>
 				<config>src/main/resources/jobs/tradeJobIo.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
 			</configs>
 		</configSet>
 		<configSet>
@@ -124,7 +115,6 @@
 				<config>src/main/resources/jobs/multilineOrderIo.xml</config>
 				<config>src/main/resources/jobs/multilineOrderJob.xml</config>
 				<config>src/main/resources/jobs/multilineOrderOutputDescriptors.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
 			</configs>
 		</configSet>
 		<configSet>
@@ -134,7 +124,6 @@
 			<configs>
 				<config>src/main/resources/data-source-context.xml</config>
 				<config>src/main/resources/data-source-context-init.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
 				<config>src/main/resources/jobs/xmlStaxJob.xml</config>
 			</configs>
 		</configSet>
@@ -144,7 +133,6 @@
 			<incomplete>false</incomplete>
 			<configs>
 				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
 				<config>src/main/resources/jobs/footballJob.xml</config>
 			</configs>
 		</configSet>
@@ -155,7 +143,6 @@
 			<configs>
 				<config>src/main/resources/data-source-context.xml</config>
 				<config>src/main/resources/jobs/hibernateJob.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
 			</configs>
 		</configSet>
 		<configSet>
@@ -165,7 +152,6 @@
 			<configs>
 				<config>src/main/resources/data-source-context.xml</config>
 				<config>src/main/resources/jobs/ibatisJob.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
 			</configs>
 		</configSet>
 		<configSet>
@@ -175,7 +161,6 @@
 			<configs>
 				<config>src/main/resources/data-source-context.xml</config>
 				<config>src/main/resources/jobs/parallelJob.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
 			</configs>
 		</configSet>
 		<configSet>
@@ -183,7 +168,6 @@
 			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
 			<incomplete>false</incomplete>
 			<configs>
-				<config>src/main/resources/simple-container-definition.xml</config>
 				<config>src/main/resources/data-source-context.xml</config>
 				<config>src/main/resources/data-source-context-init.xml</config>
 				<config>src/main/resources/jobs/compositeProcessorSampleJob.xml</config>
@@ -196,7 +180,6 @@
 			<configs>
 				<config>src/main/resources/data-source-context.xml</config>
 				<config>src/main/resources/jobs/delegatingJob.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
 			</configs>
 		</configSet>
 		<configSet>
@@ -205,7 +188,6 @@
 			<incomplete>false</incomplete>
 			<configs>
 				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
 			</configs>
 		</configSet>
 		<configSet>
@@ -223,7 +205,6 @@
 			<configs>
 				<config>src/main/resources/data-source-context.xml</config>
 				<config>src/main/resources/jobs/rollbackJob.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
 				<config>src/main/resources/jobs/tradeJobIo.xml</config>
 			</configs>
 		</configSet>
@@ -233,7 +214,6 @@
 			<incomplete>false</incomplete>
 			<configs>
 				<config>src/main/resources/jobs/retrySample.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
 				<config>src/main/resources/data-source-context.xml</config>
 				<config>src/main/resources/data-source-context-init.xml</config>
 			</configs>
@@ -244,7 +224,6 @@
 			<incomplete>false</incomplete>
 			<configs>
 				<config>src/main/resources/data-source-context.xml</config>
-				<config>src/main/resources/simple-container-definition.xml</config>
 				<config>src/main/resources/jobs/simpleJob.xml</config>
 			</configs>
 		</configSet>
diff --git a/spring-batch-samples/src/main/resources/quartz-job-launcher-context.xml b/spring-batch-samples/src/main/resources/quartz-job-launcher-context.xml
index 78b756b0b..22bb626f5 100644
--- a/spring-batch-samples/src/main/resources/quartz-job-launcher-context.xml
+++ b/spring-batch-samples/src/main/resources/quartz-job-launcher-context.xml
@@ -6,7 +6,7 @@
        	http://www.springframework.org/schema/aop
  		http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
 
-	<import resource="simple-container-definition.xml" />
+	<import resource="simple-job-launcher-context.xml" />
 
 	<bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
 		<property name="triggers">
diff --git a/spring-batch-samples/src/main/resources/simple-container-definition.xml b/spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
similarity index 100%
rename from spring-batch-samples/src/main/resources/simple-container-definition.xml
rename to spring-batch-samples/src/main/resources/simple-job-launcher-context.xml
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java
index e8ed4ef7d..cefa22778 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java
@@ -34,7 +34,7 @@ public class JdbcJobRepositoryTests extends AbstractTransactionalDataSourceSprin
 	}
 
 	protected String[] getConfigLocations() {
-		return new String[] { "simple-container-definition.xml" };
+		return new String[] { "simple-job-launcher-context.xml" };
 	}
 
 	protected void onSetUpInTransaction() throws Exception {
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests-context.xml
index 5da630ff5..7f29c7950 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests-context.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<import resource="classpath:/simple-container-definition.xml" />
+	<import resource="classpath:/simple-job-launcher-context.xml" />
 	<import resource="classpath:/jobs/beanWrapperMapperSampleJob.xml" />
 
 </beans>
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests-context.xml
index 9e3cea936..c39b58f55 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests-context.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<import resource="classpath:/simple-container-definition.xml" />
+	<import resource="classpath:/simple-job-launcher-context.xml" />
 	<import resource="classpath:/jobs/compositeProcessorSampleJob.xml" />
 
 </beans>
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/DelegatingJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/DelegatingJobFunctionalTests-context.xml
index 66a08c89e..9bc71b2e6 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/DelegatingJobFunctionalTests-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/DelegatingJobFunctionalTests-context.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<import resource="classpath:/simple-container-definition.xml" />
+	<import resource="classpath:/simple-job-launcher-context.xml" />
 	<import resource="classpath:/jobs/delegatingJob.xml" />
 
 </beans>
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests-context.xml
index 989a84a89..1be281566 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests-context.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<import resource="classpath:/simple-container-definition.xml" />
+	<import resource="classpath:/simple-job-launcher-context.xml" />
 	<import resource="classpath:/jobs/fixedLengthImportJob.xml" />
 
 </beans>
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/FootballJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/FootballJobFunctionalTests-context.xml
index 9f1c8369c..8f8000f40 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/FootballJobFunctionalTests-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/FootballJobFunctionalTests-context.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<import resource="classpath:/simple-container-definition.xml" />
+	<import resource="classpath:/simple-job-launcher-context.xml" />
 	<import resource="classpath:/jobs/footballJob.xml" />
 
 </beans>
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/GracefulShutdownFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/GracefulShutdownFunctionalTests-context.xml
index de56c8199..93b921438 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/GracefulShutdownFunctionalTests-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/GracefulShutdownFunctionalTests-context.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<import resource="classpath:/simple-container-definition.xml" />
+	<import resource="classpath:/simple-job-launcher-context.xml" />
 	<import resource="classpath:/jobs/infiniteLoopJob.xml" />
 
 </beans>
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/HibernateFailureJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/HibernateFailureJobFunctionalTests-context.xml
index e42f76a40..0ff99097e 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/HibernateFailureJobFunctionalTests-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/HibernateFailureJobFunctionalTests-context.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<import resource="classpath:/simple-container-definition.xml" />
+	<import resource="classpath:/simple-job-launcher-context.xml" />
 	<import resource="classpath:/jobs/hibernateJob.xml" />
 
 </beans>
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/HibernateJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/HibernateJobFunctionalTests-context.xml
index e42f76a40..0ff99097e 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/HibernateJobFunctionalTests-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/HibernateJobFunctionalTests-context.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<import resource="classpath:/simple-container-definition.xml" />
+	<import resource="classpath:/simple-job-launcher-context.xml" />
 	<import resource="classpath:/jobs/hibernateJob.xml" />
 
 </beans>
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/IbatisJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/IbatisJobFunctionalTests-context.xml
index b714a989f..febb709fa 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/IbatisJobFunctionalTests-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/IbatisJobFunctionalTests-context.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<import resource="classpath:/simple-container-definition.xml" />
+	<import resource="classpath:/simple-job-launcher-context.xml" />
 	<import resource="classpath:/jobs/ibatisJob.xml*" />
 
 </beans>
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/MultilineJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/MultilineJobFunctionalTests-context.xml
index f1234e9f1..638ccc88e 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/MultilineJobFunctionalTests-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/MultilineJobFunctionalTests-context.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<import resource="classpath:/simple-container-definition.xml" />
+	<import resource="classpath:/simple-job-launcher-context.xml" />
 	<import resource="classpath:/jobs/multilineJob.xml" />
 
 </beans>
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/MultilineOrderJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/MultilineOrderJobFunctionalTests-context.xml
index 14eb7710c..8c516d2c7 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/MultilineOrderJobFunctionalTests-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/MultilineOrderJobFunctionalTests-context.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<import resource="classpath:/simple-container-definition.xml" />
+	<import resource="classpath:/simple-job-launcher-context.xml" />
 	<import resource="classpath:/jobs/multilineOrderJob.xml" />
 
 </beans>
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/ParallelJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/ParallelJobFunctionalTests-context.xml
index 2ce2daf9b..44f3288b3 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/ParallelJobFunctionalTests-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/ParallelJobFunctionalTests-context.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<import resource="classpath:/simple-container-definition.xml" />
+	<import resource="classpath:/simple-job-launcher-context.xml" />
 	<import resource="classpath:/jobs/parallelJob.xml" />
 
 </beans>
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/RestartFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/RestartFunctionalTests-context.xml
index 0a7a8b1e5..76460ba57 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/RestartFunctionalTests-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/RestartFunctionalTests-context.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<import resource="classpath:/simple-container-definition.xml" />
+	<import resource="classpath:/simple-job-launcher-context.xml" />
 	<import resource="classpath:/jobs/restartSample.xml" />
 
 </beans>
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/RetrySampleFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/RetrySampleFunctionalTests-context.xml
index 69785592c..5ae2aca9a 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/RetrySampleFunctionalTests-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/RetrySampleFunctionalTests-context.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<import resource="classpath:/simple-container-definition.xml" />
+	<import resource="classpath:/simple-job-launcher-context.xml" />
 	<import resource="classpath:/jobs/retrySample.xml" />
 
 </beans>
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/RollbackJobFunctionalTests-context.xml
index 6e624a1ef..d517e4008 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/RollbackJobFunctionalTests-context.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<import resource="classpath:/simple-container-definition.xml" />
+	<import resource="classpath:/simple-job-launcher-context.xml" />
 	<import resource="classpath:/jobs/rollbackJob.xml" />
 
 </beans>
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/SimpleJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/SimpleJobFunctionalTests-context.xml
index b04d2f299..f9e2afacc 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/SimpleJobFunctionalTests-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/SimpleJobFunctionalTests-context.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<import resource="classpath:/simple-container-definition.xml" />
+	<import resource="classpath:/simple-job-launcher-context.xml" />
 	<import resource="classpath:/jobs/simpleJob.xml" />
 
 </beans>
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/TradeJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/TradeJobFunctionalTests-context.xml
index e4dcda99c..c3b224ce7 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/TradeJobFunctionalTests-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/TradeJobFunctionalTests-context.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<import resource="classpath:/simple-container-definition.xml" />
+	<import resource="classpath:/simple-job-launcher-context.xml" />
 	<import resource="classpath:/jobs/tradeJob.xml" />
 
 </beans>
diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/XmlStaxJobFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/XmlStaxJobFunctionalTests-context.xml
index b54650f44..763aeaca5 100644
--- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/XmlStaxJobFunctionalTests-context.xml
+++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/XmlStaxJobFunctionalTests-context.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<import resource="classpath:/simple-container-definition.xml" />
+	<import resource="classpath:/simple-job-launcher-context.xml" />
 	<import resource="classpath:/jobs/xmlStaxJob.xml" />
 
 </beans>