diff --git a/archetypes/simple-cli/pom.xml b/archetypes/simple-cli/pom.xml
index 11889a2b2..bcc0bba90 100644
--- a/archetypes/simple-cli/pom.xml
+++ b/archetypes/simple-cli/pom.xml
@@ -16,7 +16,7 @@
 	</description>
 	<properties>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
-		<spring.framework.version>3.0.0.BUILD-SNAPSHOT</spring.framework.version>
+		<spring.framework.version>2.5.6.A</spring.framework.version>
 		<bundlor.version>1.0.0.M1</bundlor.version>
 	</properties>
 	<profiles>
@@ -67,9 +67,15 @@
 			<version>${spring.framework.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.jdbc</artifactId>
+			<version>${spring.framework.version}</version>
+			<scope>runtime</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.batch</groupId>
-			<artifactId>org.springframework.batch.samples</artifactId>
+			<artifactId>org.springframework.batch.core</artifactId>
 			<version>${pom.version}</version>
 		</dependency>
 		<dependency>
diff --git a/archetypes/simple-cli/src/main/resources/META-INF/spring/module-context.xml b/archetypes/simple-cli/src/main/resources/META-INF/spring/module-context.xml
index c43fa6801..43a531208 100644
--- a/archetypes/simple-cli/src/main/resources/META-INF/spring/module-context.xml
+++ b/archetypes/simple-cli/src/main/resources/META-INF/spring/module-context.xml
@@ -5,8 +5,6 @@
 
 	<description>Example job to get you started. It provides a skeleton for a typical batch application.</description>
 	
-	<import resource="classpath:/org/springframework/batch/sample/config/common-context.xml" />
-
 	<bean id="job1" parent="simpleJob">
 		<property name="steps">
 			<list>
@@ -22,4 +20,17 @@
 		</property>
 	</bean>
 
+	<bean id="simpleJob" class="org.springframework.batch.core.job.SimpleJob" abstract="true">
+		<property name="jobRepository" ref="jobRepository" />
+		<property name="restartable" value="true" />
+	</bean>
+
+	<bean id="simpleStep" class="org.springframework.batch.core.step.item.SimpleStepFactoryBean"
+		abstract="true">
+		<property name="transactionManager" ref="transactionManager" />
+		<property name="jobRepository" ref="jobRepository" />
+		<property name="startLimit" value="100" />
+		<property name="commitInterval" value="1" />
+	</bean>
+	
 </beans>
diff --git a/archetypes/simple-cli/src/main/resources/batch.properties b/archetypes/simple-cli/src/main/resources/batch.properties
new file mode 100644
index 000000000..688179a6b
--- /dev/null
+++ b/archetypes/simple-cli/src/main/resources/batch.properties
@@ -0,0 +1,11 @@
+# Placeholders batch.*
+#    for HSQLDB:
+batch.jdbc.driver=org.hsqldb.jdbcDriver
+batch.jdbc.url=jdbc:hsqldb:mem:testdb;sql.enforce_strict_size=true
+# use this one for a separate server process so you can inspect the results
+# (or add it to system properties with -D to override at run time).
+# batch.jdbc.url=jdbc:hsqldb:hsql://localhost:9005/samples
+batch.jdbc.user=sa
+batch.jdbc.password=
+batch.schema=
+batch.schema.script=schema-hsqldb.sql
diff --git a/archetypes/simple-cli/src/main/resources/launch-context.xml b/archetypes/simple-cli/src/main/resources/launch-context.xml
index 6df744a45..7f8867ad7 100644
--- a/archetypes/simple-cli/src/main/resources/launch-context.xml
+++ b/archetypes/simple-cli/src/main/resources/launch-context.xml
@@ -1,9 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<beans xmlns="http://www.springframework.org/schema/beans" 
+	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">
 
 	<import resource="classpath:/META-INF/spring/module-context.xml"/>
-	<import resource="classpath:/simple-job-launcher-context.xml"/>
+
+	<bean id="jobLauncher"
+		class="org.springframework.batch.core.launch.support.SimpleJobLauncher">
+		<property name="jobRepository" ref="jobRepository" />
+	</bean>
+	
+	<bean id="jobRepository"
+		class="org.springframework.batch.core.repository.support.JobRepositoryFactoryBean"
+		p:dataSource-ref="dataSource" p:transactionManager-ref="transactionManager" />
+
+	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource">
+		<property name="driverClassName" value="${batch.jdbc.driver}" />
+		<property name="url" value="${batch.jdbc.url}" />
+		<property name="username" value="${batch.jdbc.user}" />
+		<property name="password" value="${batch.jdbc.password}" />
+	</bean>
+
+	<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager" lazy-init="true">
+		<property name="dataSource" ref="dataSource" />
+	</bean>
+
+	<bean id="placeholderProperties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="location" value="classpath:batch.properties" />
+		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+		<property name="ignoreUnresolvablePlaceholders" value="true" />
+		<property name="order" value="1" />
+	</bean>
+
+	<!-- Initialize the datasource - remove this bean definition for production use! -->
+	<bean id="dataSourceInitializer" class="test.jdbc.datasource.DataSourceInitializer">
+		<property name="dataSource" ref="dataSource"/>
+		<property name="initScripts" value="${batch.schema.script}"/>
+	</bean>
 
 </beans>
diff --git a/archetypes/simple-cli/src/test/java/example/ExampleJobConfigurationTests.java b/archetypes/simple-cli/src/test/java/example/ExampleJobConfigurationTests.java
index 63386985f..2900f2d6d 100644
--- a/archetypes/simple-cli/src/test/java/example/ExampleJobConfigurationTests.java
+++ b/archetypes/simple-cli/src/test/java/example/ExampleJobConfigurationTests.java
@@ -19,6 +19,8 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.batch.core.Job;
+import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
@@ -34,9 +36,18 @@ public class ExampleJobConfigurationTests {
 	
 	@Autowired
 	private JobLauncher jobLauncher;
+
+	@Autowired
+	private Job job;
 	
 	@Test
 	public void testSimpleProperties() throws Exception {
 		assertNotNull(jobLauncher);
 	}
+	
+	@Test
+	public void testLaunchJob() throws Exception {
+		jobLauncher.run(job, new JobParameters());
+	}
+	
 }