From 23c21c23cace7af84bbffe3310198d6b40397b1b Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Mon, 30 Nov 2009 13:43:56 +0000
Subject: [PATCH] Fix expressions for Spring 3

---
 spring-batch-infrastructure/pom.xml                          | 5 +++++
 .../src/main/resources/jobs/iosample/multiResource.xml       | 2 +-
 .../src/main/resources/jobs/skipSampleJob.xml                | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml
index 425c8a585..03788cc7e 100644
--- a/spring-batch-infrastructure/pom.xml
+++ b/spring-batch-infrastructure/pom.xml
@@ -144,6 +144,11 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-jdbc</artifactId>
diff --git a/spring-batch-samples/src/main/resources/jobs/iosample/multiResource.xml b/spring-batch-samples/src/main/resources/jobs/iosample/multiResource.xml
index 74a998186..7c0f5e5d1 100644
--- a/spring-batch-samples/src/main/resources/jobs/iosample/multiResource.xml
+++ b/spring-batch-samples/src/main/resources/jobs/iosample/multiResource.xml
@@ -38,7 +38,7 @@
 	</bean>
 
 	<bean id="itemReader" parent="itemReaderParent" scope="step" autowire-candidate="false">
-		<property name="resources" value="#{jobParameters[file.path]}/delimited*.csv" />
+		<property name="resources" value="#{jobParameters['file.path']}/delimited*.csv" />
 	</bean>
 
 	<bean id="itemReaderForTest" parent="itemReaderParent">
diff --git a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
index e61a6445e..96f7e9513 100644
--- a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml
@@ -73,7 +73,7 @@
 	</step>
 
 	<bean id="fileItemReader" class="org.springframework.batch.item.file.FlatFileItemReader" scope="step">
-		<property name="resource" value="classpath:/data/skipJob/input/input#{jobParameters[run.id]}.txt" />
+		<property name="resource" value="classpath:/data/skipJob/input/input#{jobParameters['run.id']}.txt" />
 		<property name="lineMapper">
 			<bean class="org.springframework.batch.item.file.mapping.DefaultLineMapper">
 				<property name="lineTokenizer">