From c2b7519b7bbbcd7580ee35bc37f49b744bbbb459 Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Thu, 28 May 2009 12:30:25 +0000
Subject: [PATCH] Finish off placeholder test with method invoking tasklet

---
 spring-batch-samples/.springBeans             |  3 +-
 .../src/main/resources/jobs/taskletJob.xml    | 43 +++++++++++--------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/spring-batch-samples/.springBeans b/spring-batch-samples/.springBeans
index a7c754fdf..59737c92d 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.2.3.RELEASE]]></pluginVersion>
+	<pluginVersion><![CDATA[2.2.4.RELEASE]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
@@ -70,6 +70,7 @@
 		<config>src/test/resources/org/springframework/batch/sample/PartitionJobFunctionalTests-context.xml</config>
 		<config>src/main/resources/jobs/multilineOrderValidator.xml</config>
 		<config>src/main/resources/jobs/restartFileSampleJob.xml</config>
+		<config>src/main/resources/jobs/taskletJob.xml</config>
 	</configs>
 	<configSets>
 		<configSet>
diff --git a/spring-batch-samples/src/main/resources/jobs/taskletJob.xml b/spring-batch-samples/src/main/resources/jobs/taskletJob.xml
index 83dbe057a..8a3679790 100644
--- a/spring-batch-samples/src/main/resources/jobs/taskletJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/taskletJob.xml
@@ -1,31 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns:batch="http://www.springframework.org/schema/batch"
-	xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans 
-       	http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-      	http://www.springframework.org/schema/batch
-      	http://www.springframework.org/schema/batch/spring-batch-2.0.xsd
-       	http://www.springframework.org/schema/aop
- 		http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:batch="http://www.springframework.org/schema/batch"
+	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.0.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"
+	xmlns:p="http://www.springframework.org/schema/p">
 
-	<!-- The tasklet used in this job will run in an infinite loop.  This is useful for testing graceful shutdown from
-		multiple environments. -->
+	<!--
+		The tasklet used in this job does nothing. The sample shows how to use
+		a method invoking adapter and also how to configure step scope with
+		non-default settings. Proxy target class (true) is needed because the
+		target method is not defined in an interface.
+	-->
+
+	<bean class="org.springframework.batch.core.scope.StepScope"
+		p:proxyTargetClass="true" />
 
 	<batch:job id="loopJob">
 		<batch:step id="step1">
-			<batch:tasklet ref="adapter"/>
+			<batch:tasklet ref="adapter" />
 		</batch:step>
 	</batch:job>
 
-	<bean id="adapter" class="org.springframework.batch.core.step.tasklet.MethodInvokingTaskletAdapter">
-		<property name="targetObject" ref="value"/>
-		<property name="targetMethod" value="toString"/>
+	<bean id="adapter"
+		class="org.springframework.batch.core.step.tasklet.MethodInvokingTaskletAdapter">
+		<property name="targetObject" ref="value" />
+		<property name="targetMethod" value="execute" />
 	</bean>
-	
-	<bean id="value" class="org.springframework.batch.sample.TaskletJobFunctionalTests$TestBean" scope="step">
-		<property name="value" value="#{jobParameters[value]}"/>
+
+	<bean id="value"
+		class="org.springframework.batch.sample.TaskletJobFunctionalTests$TestBean"
+		scope="step">
+		<property name="value" value="#{jobParameters[value]}" />
 	</bean>
 
 </beans>