From eae6e5078b5d324cd63a64014bfa8677c8546f44 Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Mon, 21 Jul 2008 16:49:14 +0000
Subject: [PATCH] BATCH 733: Parent context missed a commit...

---
 archetypes/simple-cli/pom.xml                                | 2 +-
 .../src/main/resources/META-INF/spring/module-context.xml    | 2 +-
 dictionary.txt                                               | 3 +++
 pom.xml                                                      | 5 +++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/archetypes/simple-cli/pom.xml b/archetypes/simple-cli/pom.xml
index 5245c3ad2..7ebc4c99f 100644
--- a/archetypes/simple-cli/pom.xml
+++ b/archetypes/simple-cli/pom.xml
@@ -142,7 +142,7 @@
 					<mainClass>org.springframework.batch.core.launch.support.CommandLineJobRunner</mainClass>
 					<arguments>
 						<!-- job configuration file -->
-						<argument>classpath:/META-INF/spring/module-context.xml</argument>
+						<argument>classpath:/launch-context.xml</argument>
 						<!-- job name -->
 						<argument>job1</argument>
 					</arguments>
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 b1003f215..c43fa6801 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,7 +5,7 @@
 
 	<description>Example job to get you started. It provides a skeleton for a typical batch application.</description>
 	
-	<import resource="classpath:/simple-job-launcher-context.xml"/>
+	<import resource="classpath:/org/springframework/batch/sample/config/common-context.xml" />
 
 	<bean id="job1" parent="simpleJob">
 		<property name="steps">
diff --git a/dictionary.txt b/dictionary.txt
index fee78af67..19075881f 100644
--- a/dictionary.txt
+++ b/dictionary.txt
@@ -72,3 +72,6 @@ tokenizer
 tokenizes
 interceptions
 immutable
+stateless
+autowiring
+strategizing
diff --git a/pom.xml b/pom.xml
index 992204270..c1fb6fd2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -599,6 +599,11 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.osgi</groupId>
+				<artifactId>spring-osgi-core</artifactId>
+				<version>1.1.0</version>
+			</dependency>
 			<dependency>
 				<groupId>xerces</groupId>
 				<artifactId>xercesImpl</artifactId>