diff --git a/spring-batch-samples/.settings/jmxLauncher.launch b/spring-batch-samples/.settings/jmxLauncher.launch
index 671eaa23c..b854074c2 100644
--- a/spring-batch-samples/.settings/jmxLauncher.launch
+++ b/spring-batch-samples/.settings/jmxLauncher.launch
@@ -2,7 +2,7 @@
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <stringAttribute key="bad_container_name" value="\spring-batch-samples\.settings\j"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskExecutorLauncher.java"/>
+<listEntry value="/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/TaskExecutorLauncher.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
diff --git a/spring-batch-samples/.springBeans b/spring-batch-samples/.springBeans
index bc007b60a..7285cbd34 100644
--- a/spring-batch-samples/.springBeans
+++ b/spring-batch-samples/.springBeans
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[2.0.4.v200802202100]]></pluginVersion>
+	<pluginVersion><![CDATA[2.0.3.v200802061800]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
@@ -35,6 +35,9 @@
 		<config>src/main/resources/simple-job-launcher-context.xml</config>
 		<config>src/main/resources/jobs/batchUpdateJob.xml</config>
 		<config>src/test/resources/org/springframework/batch/sample/item/writer/staging-test-context.xml</config>
+		<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>
 	</configs>
 	<configSets>
 		<configSet>
@@ -261,5 +264,25 @@
 				<config>src/test/resources/org/springframework/batch/sample/item/writer/staging-test-context.xml</config>
 			</configs>
 		</configSet>
+		<configSet>
+			<name><![CDATA[quartzLauncher]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/quartz-job-launcher-context.xml</config>
+				<config>src/main/resources/simple-job-launcher-context.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[jmxLauncher]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/adhoc-job-launcher-context.xml</config>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/simple-job-launcher-context.xml</config>
+			</configs>
+		</configSet>
 	</configSets>
 </beansProjectDescription>
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/ClassPathXmlApplicationContextJobFactory.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/ClassPathXmlApplicationContextJobFactory.java
index ed20f99b4..bcbb86248 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/ClassPathXmlApplicationContextJobFactory.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/ClassPathXmlApplicationContextJobFactory.java
@@ -15,9 +15,14 @@
  */
 package org.springframework.batch.sample;
 
+import java.util.List;
+
 import org.springframework.batch.core.Job;
+import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.JobExecutionException;
 import org.springframework.batch.core.configuration.JobFactory;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
@@ -54,7 +59,8 @@ public class ClassPathXmlApplicationContextJobFactory implements JobFactory {
 	 */
 	public Job createJob() {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[] { path }, parent);
-		return (Job) context.getBean(beanName, Job.class);
+		Job job = (Job) context.getBean(beanName, Job.class);
+		return new ContextClosingJob(job, context);
 	}
 
 	/**
@@ -67,5 +73,57 @@ public class ClassPathXmlApplicationContextJobFactory implements JobFactory {
 	public String getJobName() {
 		return beanName;
 	}
+	
+	/**
+	 * @author Dave Syer
+	 *
+	 */
+	private static class ContextClosingJob implements Job {
+		private Job delegate;
+		private ConfigurableApplicationContext context;
+		/**
+		 * @param delegate
+		 * @param context
+		 */
+		public ContextClosingJob(Job delegate, ConfigurableApplicationContext context) {
+			super();
+			this.delegate = delegate;
+			this.context = context;
+		}
+		/**
+		 * @param execution
+		 * @throws JobExecutionException
+		 * @see org.springframework.batch.core.Job#execute(org.springframework.batch.core.JobExecution)
+		 */
+		public void execute(JobExecution execution) throws JobExecutionException {
+			try {
+				delegate.execute(execution);
+			} finally {
+				context.close();
+			}
+		}
+		/**
+		 * @return
+		 * @see org.springframework.batch.core.Job#getName()
+		 */
+		public String getName() {
+			return delegate.getName();
+		}
+		/**
+		 * @return
+		 * @see org.springframework.batch.core.Job#getSteps()
+		 */
+		public List getSteps() {
+			return delegate.getSteps();
+		}
+		/**
+		 * @return
+		 * @see org.springframework.batch.core.Job#isRestartable()
+		 */
+		public boolean isRestartable() {
+			return delegate.isRestartable();
+		}
+
+	}	
 
 }
diff --git a/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml b/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml
index 503829fc5..50be87399 100644
--- a/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml
+++ b/spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml
@@ -7,14 +7,14 @@
        	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.jmx.export.MBeanExporter">
 		<property name="beans">
 			<map>
 				<entry key="spring:service=batch,bean=jobLauncher">
 					<bean
-						class="org.springframework.batch.execution.bootstrap.support.SimpleExportedJobLauncher">
+						class="org.springframework.batch.core.launch.support.SimpleExportedJobLauncher">
 						<property name="launcher" ref="jobLauncher" />
 						<property name="jobLocator"
 							ref="jobConfigurationRegistry" />
@@ -35,7 +35,7 @@
 					<map>
 						<entry
 							key="spring:service=batch,bean=jobLauncher"
-							value="org.springframework.batch.execution.bootstrap.support.ExportedJobLauncher" />
+							value="org.springframework.batch.core.launch.support.ExportedJobLauncher" />
 						<entry key="spring:service=batch,bean=jobLoader"
 							value="org.springframework.batch.sample.JobLoader" />
 					</map>
@@ -48,7 +48,7 @@
 		class="org.springframework.batch.sample.advice.JobExecutionNotificationPublisher" />
 
 	<bean id="jobLauncher"
-		class="org.springframework.batch.execution.launch.SimpleJobLauncher">
+		class="org.springframework.batch.core.launch.support.SimpleJobLauncher">
 		<property name="jobRepository" ref="jobRepository" />
 		<property name="taskExecutor">
 			<bean
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 22bb626f5..349b28e32 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
@@ -30,7 +30,7 @@
 	</bean>
 
 
-	<bean id="jobLauncher" class="org.springframework.batch.execution.launch.SimpleJobLauncher">
+	<bean id="jobLauncher" class="org.springframework.batch.core.launch.support.SimpleJobLauncher">
 		<property name="jobRepository" ref="jobRepository" />
 		<property name="taskExecutor">
 			<bean class="org.springframework.core.task.SimpleAsyncTaskExecutor" />