From a00f675b6ab4f97faed1600e340d58e1ba297bc5 Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Sat, 19 Jan 2008 17:10:52 +0000
Subject: [PATCH] Complete - task 67: Football job failures . Remove
 unnecessary extra properties file and launcher - use jobLauncher instead

---
 .../.settings/footballJob.launch              | 13 -------
 .../.settings/jobLauncher.launch              |  4 +-
 .../data/footballjob/input/input.properties   |  2 -
 .../src/main/resources/jobs/footballJob.xml   | 37 +++++++++++++------
 4 files changed, 27 insertions(+), 29 deletions(-)
 delete mode 100644 spring-batch-samples/.settings/footballJob.launch
 delete mode 100644 spring-batch-samples/src/main/resources/data/footballjob/input/input.properties

diff --git a/spring-batch-samples/.settings/footballJob.launch b/spring-batch-samples/.settings/footballJob.launch
deleted file mode 100644
index e612cd3bd..000000000
--- a/spring-batch-samples/.settings/footballJob.launch
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/BatchCommandLineLauncher.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.springframework.batch.execution.bootstrap.support.BatchCommandLineLauncher"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="spring-batch-samples"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djob.configuration.path=jobs/footballJob.xml&#13;-Djob.name=footballJob&#13;-Dplayer.file.name=player.csv&#13;-Dgames.file.name=games.csv"/>
-</launchConfiguration>
diff --git a/spring-batch-samples/.settings/jobLauncher.launch b/spring-batch-samples/.settings/jobLauncher.launch
index 9edd2c284..d491336bb 100644
--- a/spring-batch-samples/.settings/jobLauncher.launch
+++ b/spring-batch-samples/.settings/jobLauncher.launch
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/BatchCommandLineLauncher.java"/>
+<listEntry value="/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/BatchCommandLineLauncher.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -11,5 +11,5 @@
 <stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;core&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;classpathContainer path=&amp;quot;org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.classpathContainer&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;execution&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;infrastructure&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;default/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.springframework.batch.execution.bootstrap.support.BatchCommandLineLauncher"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="spring-batch-samples"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djob.configuration.path=jobs/footballJob.xml -Djob.name=footballjob"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djob.configuration.path=jobs/footballJob.xml -Djob.name=footballJob -Dplayer.file.name=player.csv  -Dgames.file.name=games.csv"/>
 </launchConfiguration>
diff --git a/spring-batch-samples/src/main/resources/data/footballjob/input/input.properties b/spring-batch-samples/src/main/resources/data/footballjob/input/input.properties
deleted file mode 100644
index 7667c2e69..000000000
--- a/spring-batch-samples/src/main/resources/data/footballjob/input/input.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-games.file.name=games-small.csv
-player.file.name=player-small.csv
\ No newline at end of file
diff --git a/spring-batch-samples/src/main/resources/jobs/footballJob.xml b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
index d727f97b7..b98f78e4b 100644
--- a/spring-batch-samples/src/main/resources/jobs/footballJob.xml
+++ b/spring-batch-samples/src/main/resources/jobs/footballJob.xml
@@ -27,7 +27,8 @@
 					<property name="tasklet">
 						<bean
 							class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
-							<property name="itemReader" ref="playerFileItemReader" />
+							<property name="itemReader"
+								ref="playerFileItemReader" />
 							<property name="itemProcessor">
 								<bean
 									class="org.springframework.batch.sample.item.processor.PlayerItemProcessor">
@@ -51,7 +52,8 @@
 					<property name="tasklet">
 						<bean
 							class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
-							<property name="itemReader" ref="gameFileItemReader" />
+							<property name="itemReader"
+								ref="gameFileItemReader" />
 							<property name="itemProcessor">
 								<bean
 									class="org.springframework.batch.item.processor.ItemWriterItemProcessor">
@@ -75,7 +77,8 @@
 					<property name="tasklet">
 						<bean
 							class="org.springframework.batch.execution.tasklet.RestartableItemOrientedTasklet">
-							<property name="itemReader" ref="playerSummarizationSource" />
+							<property name="itemReader"
+								ref="playerSummarizationSource" />
 							<property name="itemProcessor">
 								<bean
 									class="org.springframework.batch.item.processor.ItemWriterItemProcessor">
@@ -96,9 +99,11 @@
 	</bean>
 
 	<bean id="playerFileItemReader"
-		class="org.springframework.batch.io.file.DefaultFlatFileItemReader" scope="step">
-		<aop:scoped-proxy/>		
-		<property name="resource" value="classpath:data/footballjob/input/${player.file.name}" />
+		class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
+		scope="step">
+		<aop:scoped-proxy />
+		<property name="resource"
+			value="classpath:data/footballjob/input/${player.file.name}" />
 		<property name="tokenizer">
 			<bean
 				class="org.springframework.batch.io.file.transform.DelimitedLineTokenizer">
@@ -113,9 +118,11 @@
 	</bean>
 
 	<bean id="gameFileItemReader"
-		class="org.springframework.batch.io.file.DefaultFlatFileItemReader" scope="step">
-		<aop:scoped-proxy/>
-		<property name="resource" value="classpath:data/footballjob/input/${games.file.name}"/>
+		class="org.springframework.batch.io.file.DefaultFlatFileItemReader"
+		scope="step">
+		<aop:scoped-proxy />
+		<property name="resource"
+			value="classpath:data/footballjob/input/${games.file.name}" />
 		<property name="tokenizer">
 			<bean
 				class="org.springframework.batch.io.file.transform.DelimitedLineTokenizer">
@@ -130,8 +137,9 @@
 	</bean>
 
 	<bean id="playerSummarizationSource"
-		class="org.springframework.batch.io.cursor.JdbcCursorItemReader" scope="step">
-		<aop:scoped-proxy/>
+		class="org.springframework.batch.io.cursor.JdbcCursorItemReader"
+		scope="step">
+		<aop:scoped-proxy />
 		<property name="dataSource" ref="dataSource" />
 		<property name="mapper">
 			<bean
@@ -161,7 +169,12 @@
 
 	<bean
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="location" value="classpath:data/footballJob/input/input.properties" />
+		<property name="properties">
+			<value>
+				games.file.name=games-small.csv
+				player.file.name=player-small.csv
+			</value>
+		</property>
 		<property name="systemPropertiesModeName"
 			value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
 		<property name="ignoreUnresolvablePlaceholders" value="false" />