From d94133b392a99e7447b2e5c5c4f744c9b9c3baee Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Tue, 21 Aug 2007 11:04:34 +0000
Subject: [PATCH] OPEN - issue BATCH-105: The functionality in
 "DefaultFlatFileItemProvider" (validating and mapping) should be provided by
 the infrastructure layer (DefaultFlatFileInputSource).
 http://opensource.atlassian.com/projects/spring/browse/BATCH-105

---
 samples/.springBeans                                 | 12 ++++++++++++
 .../main/resources/jobs/compositeProcessorSample.xml |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/samples/.springBeans b/samples/.springBeans
index aea75188f..5384a5417 100644
--- a/samples/.springBeans
+++ b/samples/.springBeans
@@ -20,6 +20,7 @@
 		<config>src/main/resources/jobs/adhocLoopJob.xml</config>
 		<config>src/main/resources/jobs/infiniteLoopJob.xml</config>
 		<config>src/main/resources/data-source-context-init.xml</config>
+		<config>src/main/resources/jobs/compositeProcessorSample.xml</config>
 	</configs>
 	<configSets>
 		<configSet>
@@ -125,5 +126,16 @@
 				<config>src/main/resources/simple-container-definition.xml</config>
 			</configs>
 		</configSet>
+		<configSet>
+			<name><![CDATA[compositeProcessor]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/resources/jobs/compositeProcessorSample.xml</config>
+				<config>src/main/resources/simple-container-definition.xml</config>
+				<config>src/main/resources/data-source-context.xml</config>
+				<config>src/main/resources/data-source-context-init.xml</config>
+			</configs>
+		</configSet>
 	</configSets>
 </beansProjectDescription>
diff --git a/samples/src/main/resources/jobs/compositeProcessorSample.xml b/samples/src/main/resources/jobs/compositeProcessorSample.xml
index b4b995073..5a7a568ee 100644
--- a/samples/src/main/resources/jobs/compositeProcessorSample.xml
+++ b/samples/src/main/resources/jobs/compositeProcessorSample.xml
@@ -22,21 +22,21 @@
 						class="org.springframework.batch.execution.tasklet.RestartableItemProviderTasklet">
 						<property name="itemProvider">
 							<bean
-								class="org.springframework.batch.execution.tasklet.support.DefaultFlatFileItemProvider">
+								class="org.springframework.batch.item.provider.DefaultFlatFileItemProvider">
 								<property name="source" ref="fileInputTemplate" />
 								<property name="mapper" ref="fieldSetMapper" />
 								<property name="validator" ref="fixedValidator" />
 							</bean>
 						</property>
 						<property name="itemProcessor">
-							<bean class="org.springframework.batch.execution.tasklet.support.CompositeItemProcessor" >
+							<bean class="org.springframework.batch.item.processor.CompositeItemProcessor" >
 								<property name="itemProcessors" >
 									<list>
 										<bean class="org.springframework.batch.sample.module.process.TradeProcessor">
 											<property name="writer" ref="tradeDao" />
 										</bean>
 										
-										<bean class="org.springframework.batch.execution.tasklet.support.OutputSourceItemProcessor">
+										<bean class="org.springframework.batch.item.processor.OutputSourceItemProcessor">
 											<property name="outputSource" ref="flatFileOutputSource" />
 										</bean>
 									</list>