General cleanup in spring-batch-samples

* Delete unused classes, files, misc ide files
* Cleanup checkstyle/pmd/findbugs reports
* Add @Override as needed
* Remove schema versions in xml configs
* Remove unused imports
* General tidying
* Cleanup deprecated jdbctemplate methods
* Fix @Ignored OrderItemReaderTests test

spring-batch-samples/src/main/resources/META-INF/persistence.xml

@@ -4,10 +4,7 @@
 		version="1.0">
 
 	<persistence-unit name="customerCredit" transaction-type="RESOURCE_LOCAL">
-
         <class>org.springframework.batch.sample.domain.trade.CustomerCredit</class>
 		<exclude-unlisted-classes>true</exclude-unlisted-classes>
-
 	</persistence-unit>
-
-</persistence>
+</persistence>

spring-batch-samples/src/main/resources/META-INF/spring/config-beans.xml

@@ -5,9 +5,8 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns:context="http://www.springframework.org/schema/context"
         xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
-    <!-- Property values used in the application -->
     <context:property-placeholder location="classpath:default.amqp.properties" />
 </beans:beans>

spring-batch-samples/src/main/resources/META-INF/spring/jobs/amqp/amqp-example-job-beans.xml

@@ -4,7 +4,7 @@
         xmlns:beans="http://www.springframework.org/schema/beans"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <beans:bean id="amqpItemReader" class="org.springframework.batch.item.amqp.AmqpItemReader">
         <beans:constructor-arg ref="inboundAmqpTemplate"/>

spring-batch-samples/src/main/resources/META-INF/spring/jobs/amqp/amqp-example-job.xml

@@ -5,8 +5,8 @@
     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.2.xsd
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+        http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <beans:import resource="classpath:/META-INF/spring/config-beans.xml"/>
     <beans:import resource="classpath:/META-INF/spring/jobs/messaging/rabbitmq-beans.xml"/>

spring-batch-samples/src/main/resources/META-INF/spring/jobs/messaging/rabbitmq-beans.xml

@@ -6,8 +6,8 @@
         xmlns:rabbit="http://www.springframework.org/schema/rabbit"
         xmlns:p="http://www.springframework.org/schema/p"
         xsi:schemaLocation="
-        http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit-1.0.xsd
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+        http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <rabbit:connection-factory id="rabbitConnectionFactory" port="${rabbitmq.port}" host="${rabbitmq.host}"/>
     <rabbit:admin connection-factory="rabbitConnectionFactory"/>

spring-batch-samples/src/main/resources/adhoc-job-launcher-context.xml

@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans 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-3.1.xsd
-       	http://www.springframework.org/schema/aop
- 		http://www.springframework.org/schema/aop/spring-aop-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+       	http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<import resource="simple-job-launcher-context.xml" />
 
@@ -57,5 +54,4 @@
 	<bean id="loader" class="org.springframework.batch.sample.launch.DefaultJobLoader">
 		<property name="registry" ref="jobRegistry" />
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/data-source-context.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-	http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
 
 	<!--  Initialise the database before every test case: -->
     <jdbc:initialize-database data-source="dataSource">

spring-batch-samples/src/main/resources/hibernate-context.xml

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
 	<bean id="sessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
 		<property name="dataSource" ref="dataSource" />
 		<property name="mappingLocations" value="classpath*:/org/springframework/batch/sample/domain/**/*.hbm.xml" />
@@ -19,5 +19,4 @@
 	<bean id="transactionManager" class="org.springframework.orm.hibernate4.HibernateTransactionManager" lazy-init="true">
 		<property name="sessionFactory" ref="sessionFactory" />
 	</bean>
-
-</beans>
+</beans>

spring-batch-samples/src/main/resources/ibatis-config.xml

@@ -3,7 +3,5 @@
 	"http://ibatis.apache.org/dtd/sql-map-config-2.dtd">
 
 <sqlMapConfig>
-
   <sqlMap resource="ibatis-customer-credit.xml"/>
-
-</sqlMapConfig>
+</sqlMapConfig>

spring-batch-samples/src/main/resources/ibatis-customer-credit.xml

@@ -3,7 +3,6 @@
 	"http://ibatis.apache.org/dtd/sql-map-2.dtd">
 
 <sqlMap namespace="Customer">
-
   <resultMap id="result" class="org.springframework.batch.sample.domain.trade.CustomerCredit">
     <result property="name" column="NAME" />
     <result property="credit" column="CREDIT" />
@@ -24,5 +23,4 @@
   <update id="updateCredit" parameterClass="org.springframework.batch.sample.domain.trade.CustomerCredit" >
   	update CUSTOMER set CREDIT = #credit# where NAME = #name#
   </update>
-
-</sqlMap>
+</sqlMap>

spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml

@@ -6,7 +6,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
        	http://www.springframework.org/schema/beans/spring-beans.xsd
       	http://www.springframework.org/schema/batch
-      	http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
+      	http://www.springframework.org/schema/batch/spring-batch.xsd
        	http://www.springframework.org/schema/aop
  		http://www.springframework.org/schema/aop/spring-aop.xsd">
 
@@ -40,5 +40,4 @@
 				method="onError" />
 		</aop:aspect>
 	</aop:config>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/amqp-example-job.xml

@@ -5,8 +5,8 @@
     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.2.xsd
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+        http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <beans:import resource="classpath:/META-INF/spring/config-beans.xml"/>
     <beans:import resource="classpath:/META-INF/spring/jobs/messaging/rabbitmq-beans.xml"/>

spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p"
+<beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
+		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd">
 
 	<job id="beanWrapperMapperJob" xmlns="http://www.springframework.org/schema/batch">
 		<step id="step1" next="step2">
@@ -94,5 +91,4 @@
 	</bean>
 
 	<bean id="personWriter" class="org.springframework.batch.sample.domain.person.internal.PersonWriter" />
-
 </beans>

spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
+		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd">
 
 	<description>
 	<![CDATA[Sample showing usage of CompositeItemWriter.
@@ -92,5 +89,4 @@
 	</bean>
 
 	<bean id="fieldSetMapper" class="org.springframework.batch.sample.domain.trade.internal.TradeFieldSetMapper" />
-
 </beans>

spring-batch-samples/src/main/resources/jobs/customerFilterJob.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:lang="http://www.springframework.org/schema/lang"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd
-		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd">
+		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd">
 
 	<job id="customerFilterJob" xmlns="http://www.springframework.org/schema/batch">
 		<step id="uploadCustomer">
@@ -72,5 +71,4 @@
 			</bean>
 		</property>
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/delegatingJob.xml

@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:p="http://www.springframework.org/schema/p"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
+		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd">
 
 	<description>
 		The intent is to to give an example of how existing bean
@@ -41,5 +36,4 @@
 	</bean>
 
 	<bean id="delegateObject" class="org.springframework.batch.sample.domain.person.PersonService" />
-
 </beans>

spring-batch-samples/src/main/resources/jobs/footballJob.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:p="http://www.springframework.org/schema/p"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
+		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<job id="footballJob" xmlns="http://www.springframework.org/schema/batch">
@@ -127,5 +126,4 @@
 		<property name="ignoreUnresolvablePlaceholders" value="true" />
 		<property name="order" value="1" />
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/groovyJob.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:lang="http://www.springframework.org/schema/lang"
-	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd">
 
 	<job id="groovyJob" xmlns="http://www.springframework.org/schema/batch">
@@ -53,5 +53,4 @@
 			}
 		</lang:inline-script>
 	</lang:groovy>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/headerFooterSample.xml

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
+		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd">
 	<description>
 		Showcases reading and writing of headers and footers. Copies header from input to output and adds a footer.
 	</description>

spring-batch-samples/src/main/resources/jobs/hibernateJob.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd">
 
 	<description>Example for Hibernate integration.</description>
 
@@ -42,5 +42,4 @@
 		<property name="queryString" value="from CustomerCredit" />
 		<property name="sessionFactory" ref="sessionFactory" />
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml

@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans 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.xsd
-       	http://www.springframework.org/schema/aop
- 		http://www.springframework.org/schema/aop/spring-aop.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+       	http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<!-- The tasklet used in this job will run in an infinite loop.  This is useful for testing graceful shutdown from
 		multiple environments. -->
@@ -37,11 +34,6 @@
 			<bean class="org.springframework.batch.core.launch.support.RunIdIncrementer" />	
 		</property>
 		<property name="steps">
-			<!--bean id="step1" parent="taskletStep">
-				<property name="tasklet">
-					<bean id="module" class="org.springframework.batch.sample.tasklet.InfiniteLoopTasklet"/>
-				</property>
-			</bean-->
 			<bean id="infiniteStep" parent="simpleStep">
 				<property name="itemReader">
 					<bean id="reader" class="org.springframework.batch.sample.domain.trade.internal.GeneratingTradeItemReader">
@@ -54,5 +46,4 @@
 			</bean>
 		</property>
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/ioSampleJob.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<job id="ioSampleJob" xmlns="http://www.springframework.org/schema/batch">
@@ -13,7 +13,5 @@
 		</step>
 	</job>
 
-	<bean id="itemProcessor"
-		class="org.springframework.batch.sample.domain.trade.internal.CustomerCreditIncreaseProcessor" />
-
+	<bean id="itemProcessor" class="org.springframework.batch.sample.domain.trade.internal.CustomerCreditIncreaseProcessor" />
 </beans>

spring-batch-samples/src/main/resources/jobs/iosample/delimited.xml

@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:p="http://www.springframework.org/schema/p"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:util="http://www.springframework.org/schema/util"
 	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="itemReader" class="org.springframework.batch.item.file.FlatFileItemReader" scope="step">
 		<property name="lineMapper">

spring-batch-samples/src/main/resources/jobs/iosample/fixedLength.xml

@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:util="http://www.springframework.org/schema/util"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="itemReader" class="org.springframework.batch.item.file.FlatFileItemReader" scope="step">
 		<property name="resource" value="#{jobParameters[inputFile]}" />

spring-batch-samples/src/main/resources/jobs/iosample/ibatis.xml

@@ -3,7 +3,6 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-
 	<bean id="itemReader"
 		class="org.springframework.batch.item.database.IbatisPagingItemReader">
 		<property name="queryId" value="getAllCustomerCredits" />
@@ -21,5 +20,4 @@
 	<bean id="sqlMapClient" class="com.ibatis.sqlmap.client.SqlMapClientBuilder" factory-method="buildSqlMapClient">
 		<constructor-arg value="ibatis-config.xml"/>
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/iosample/jdbcCursor.xml

@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:p="http://www.springframework.org/schema/p"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:util="http://www.springframework.org/schema/util"
 	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="itemReader" class="org.springframework.batch.item.database.JdbcCursorItemReader">
 		<property name="dataSource" ref="dataSource"/>
@@ -28,5 +21,4 @@
 		<property name="sql" value="UPDATE CUSTOMER set credit = :credit where id = :id" />
 		<property name="dataSource" ref="dataSource" />
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/iosample/jdbcPaging.xml

@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:util="http://www.springframework.org/schema/util"
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="itemReader" class="org.springframework.batch.item.database.JdbcPagingItemReader" scope="step">
 		<property name="dataSource" ref="dataSource" />
@@ -45,5 +41,4 @@
 		<property name="sql" value="UPDATE CUSTOMER set credit = :credit where id = :id" />
 		<property name="dataSource" ref="dataSource" />
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/iosample/multiLine.xml

@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:batch="http://www.springframework.org/schema/batch"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:p="http://www.springframework.org/schema/p"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:util="http://www.springframework.org/schema/util"
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd">
 
 	<batch:job id="ioSampleJob">
 		<batch:step id="step1">
@@ -49,5 +42,4 @@
 			</bean>
 		</property>
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/iosample/multiRecordType.xml

@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:batch="http://www.springframework.org/schema/batch"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:p="http://www.springframework.org/schema/p"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:util="http://www.springframework.org/schema/util"
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd">
 
 	<batch:job id="ioSampleJob">
 		<batch:step id="step1">
@@ -34,12 +27,12 @@
 				<entry key="CUST*" value-ref="customerLineTokenizer" />
 			</map>
 		</property>
-		<property name="fieldSetMappers">
-			<map>
-				<entry key="TRAD*" value-ref="tradeFieldSetMapper" />
-				<entry key="CUST*" value-ref="customerFieldSetMapper" />
-			</map>
-		</property>
+		<property name="fieldSetMappers">
+			<map>
+				<entry key="TRAD*" value-ref="tradeFieldSetMapper" />
+				<entry key="CUST*" value-ref="customerFieldSetMapper" />
+			</map>
+		</property>
 	</bean>
 
 	<bean id="tradeLineTokenizer"
@@ -55,7 +48,7 @@
 	</bean>
 
 	<bean id="tradeFieldSetMapper"
-		class="org.springframework.batch.sample.domain.trade.internal.TradeFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.trade.internal.TradeFieldSetMapper" />
 
 	<bean id="customerFieldSetMapper"
 		class="org.springframework.batch.sample.domain.trade.internal.CustomerCreditFieldSetMapper" />

spring-batch-samples/src/main/resources/jobs/iosample/multiResource.xml

@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:util="http://www.springframework.org/schema/util"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="itemReader"
 		class="org.springframework.batch.item.file.MultiResourceItemReader" scope="step">
@@ -59,5 +54,4 @@
 			</bean>
 		</property>
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/iosample/xml.xml

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:util="http://www.springframework.org/schema/util"
 	xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
 	<bean id="itemReader" class="org.springframework.batch.item.xml.StaxEventItemReader">
@@ -36,5 +33,4 @@
 	<bean id="outputResource" class="org.springframework.core.io.FileSystemResource">
 		<constructor-arg value="target/test-outputs/output.xml" />
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/jobStepSample.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<job id="jobStepJob" restartable="true" xmlns="http://www.springframework.org/schema/batch">

spring-batch-samples/src/main/resources/jobs/loopFlowSample.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<job id="loopFlowSample" xmlns="http://www.springframework.org/schema/batch">
@@ -40,5 +40,4 @@
 	<bean id="resettingListener" class="org.springframework.batch.sample.loop.GeneratingTradeResettingListener">
 		<property name="reader" ref="itemGenerator" />
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/mailJob.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
-		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<job id="mailJob" xmlns="http://www.springframework.org/schema/batch">
 		<step id="step1" xmlns="http://www.springframework.org/schema/batch">
@@ -12,9 +11,6 @@
 					<skippable-exception-classes>
 						<include class="java.lang.RuntimeException" />
 					</skippable-exception-classes>
-					<!--
-						<fatal-exception-classes> <include class="org.springframework.mail.MailException"/> </fatal-exception-classes>
-					-->
 				</chunk>
 			</tasklet>
 		</step>
@@ -48,5 +44,4 @@
 			</list>
 		</property>
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/multilineJob.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<job id="multilineJob" xmlns="http://www.springframework.org/schema/batch">
@@ -75,5 +75,4 @@
 		<property name="names" value="ISIN,Quantity,Price,Customer" />
 		<property name="columns" value="1-12, 13-15, 16-20, 21-29" />
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/multilineOrderInputTokenizers.xml

@@ -61,5 +61,4 @@
 	<bean id="itemLineTokenizer" parent="parentLineTokenizer">
 		<property name="names" value="LINE_ID,ITEM_ID,PRICE,DISCOUNT_PERC,DISCOUNT_AMOUNT,SHIPPING_PRICE,HANDLING_PRICE,QUANTITY,TOTAL_PRICE" />
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
        	http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/batch
-		http://www.springframework.org/schema/batch/spring-batch.xsd
-       	http://www.springframework.org/schema/aop
- 		http://www.springframework.org/schema/aop/spring-aop.xsd">
+		http://www.springframework.org/schema/batch/spring-batch.xsd">
 
 	<import resource="multilineOrderInputTokenizers.xml" />
 	<import resource="multilineOrderOutputAggregators.xml" />
@@ -67,5 +65,4 @@
 			</bean>
 		</property>
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/multilineOrderOutputAggregators.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:p="http://www.springframework.org/schema/p" xmlns:util="http://www.springframework.org/schema/util"
+	xmlns:util="http://www.springframework.org/schema/util"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
        	http://www.springframework.org/schema/beans/spring-beans.xsd
        	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
@@ -57,5 +57,4 @@
 			<bean class="org.springframework.batch.sample.domain.order.internal.extractor.LineItemFieldExtractor"/>
 		</property>
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/parallelJob.xml

@@ -3,7 +3,7 @@
 	xmlns:aop="http://www.springframework.org/schema/aop"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
+		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<job id="parallelJob" xmlns="http://www.springframework.org/schema/batch">
@@ -107,5 +107,4 @@
 				method="doStronglyTypedLogging" />
 		</aop:aspect>
 	</aop:config>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/partitionFileJob.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop"
+<beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<job id="partitionJob" xmlns="http://www.springframework.org/schema/batch">
@@ -82,5 +81,4 @@
 			</bean>
 		</property>
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/partitionJdbcJob.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop"
+<beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
-		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<job id="partitionJdbcJob" xmlns="http://www.springframework.org/schema/batch">
 		<step id="step">
@@ -113,5 +112,4 @@
 			</bean>
 		</property>
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/restartFileSampleJob.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<job id="ioSampleJob" xmlns="http://www.springframework.org/schema/batch">
@@ -63,5 +63,4 @@
 	<bean id="outputResource" class="org.springframework.core.io.FileSystemResource">
 		<constructor-arg value="target/test-outputs/restartFileOutput.csv" />
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/restartSample.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<job id="restartSampleJob" restartable="true" xmlns="http://www.springframework.org/schema/batch">
@@ -16,8 +16,6 @@
 		</step>
 	</job>
 
-	<!-- INFRASTRUCTURE SETUP -->
-
 	<bean id="processor" class="org.springframework.batch.item.validator.ValidatingItemProcessor">
 		<constructor-arg ref="fixedValidator" />
 	</bean>
@@ -63,5 +61,4 @@
 	</bean>
 
 	<bean id="fieldSetMapper" class="org.springframework.batch.sample.domain.trade.internal.TradeFieldSetMapper" />
-
 </beans>

spring-batch-samples/src/main/resources/jobs/retrySample.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<job id="retrySample" xmlns="http://www.springframework.org/schema/batch">
@@ -24,5 +24,4 @@
 	</bean>
 
 	<bean id="itemWriter" class="org.springframework.batch.sample.support.RetrySampleItemWriter" />
-
 </beans>

spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
@@ -133,5 +133,4 @@
 	<bean id="skipCheckingDecider" class="org.springframework.batch.sample.common.SkipCheckingDecider" />
 
 	<bean id="incrementer" class="org.springframework.batch.core.launch.support.RunIdIncrementer" />
-
 </beans>

spring-batch-samples/src/main/resources/jobs/taskletJob.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
 	xmlns:p="http://www.springframework.org/schema/p">
 
@@ -34,5 +34,4 @@
 		scope="step">
 		<property name="value" value="#{jobParameters[value]}" />
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/jobs/tradeJob.xml

@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:p="http://www.springframework.org/schema/p"
 	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.2.xsd
+	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<batch:job-repository />
@@ -109,5 +109,4 @@
             <bean class="org.springframework.batch.sample.domain.trade.internal.validator.TradeValidator"/>
 		</property>
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/org/springframework/batch/sample/config/common-context.xml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p"
+<beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<bean id="customEditorConfigurer" class="org.springframework.beans.factory.config.CustomEditorConfigurer">
 		<property name="customEditors">
@@ -14,5 +10,4 @@
 			</map>
 		</property>
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/org/springframework/batch/sample/football-job-context.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<!-- useful for launching this job on its own from the command line -->
 	<import resource="classpath:/simple-job-launcher-context.xml" />
 	<import resource="classpath:/jobs/footballJob.xml" />
-
 </beans>

spring-batch-samples/src/main/resources/quartz-job-launcher-context.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans 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-3.1.xsd
-       	http://www.springframework.org/schema/aop
- 		http://www.springframework.org/schema/aop/spring-aop-3.1.xsd">
-
-	<import resource="simple-job-launcher-context.xml" />
-
-	<bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
-		<property name="triggers">
-			<bean id="cronTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
-				<property name="jobDetail" ref="jobDetail" />
-				<property name="cronExpression" value="0/10 * * * * ?" />
-			</bean>
-	</property>
-	</bean>
-
-	<bean id="jobDetail" class="org.springframework.scheduling.quartz.JobDetailBean">
-		<property name="jobClass" value="org.springframework.batch.sample.quartz.JobLauncherDetails" />
-		<property name="group" value="quartz-batch" />
-		<property name="jobDataAsMap">
-			<map>
-				<entry key="jobName" value="footballJob"/>
-				<entry key="jobLocator" value-ref="jobRegistry"/>
-				<entry key="jobLauncher" value-ref="jobLauncher"/>
-			</map>
-		</property>
-	</bean>
-
-
-	<bean id="jobRegistry" class="org.springframework.batch.core.configuration.support.MapJobRegistry" />
-
-	<bean id="jobLauncher" class="org.springframework.batch.core.launch.support.SimpleJobLauncher">
-		<property name="jobRepository" ref="jobRepository" />
-		<property name="taskExecutor">
-			<bean class="org.springframework.core.task.SimpleAsyncTaskExecutor" />
-		</property>
-	</bean>
-
-</beans>

spring-batch-samples/src/main/resources/simple-job-launcher-context.xml

@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
 	xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 	<import resource="data-source-context.xml" />
 	<import
 		resource="classpath:/org/springframework/batch/sample/config/common-context.xml" />
@@ -47,5 +44,4 @@
 
 	<bean id="eventAdvice"
 		class="org.springframework.batch.sample.jmx.StepExecutionApplicationEventAdvice" />
-
 </beans>

spring-batch-samples/src/main/resources/skipSample-job-launcher-context.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:batch="http://www.springframework.org/schema/batch"
-	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p"
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:p="http://www.springframework.org/schema/p"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.2.xsd
-	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<import resource="data-source-context.xml" />
 	<import resource="classpath:/org/springframework/batch/sample/config/common-context.xml" />
@@ -45,6 +44,4 @@
 	<bean id="customerIncrementer" parent="incrementerParent">
 		<property name="incrementerName" value="CUSTOMER_SEQ" />
 	</bean>
-
-
 </beans>

spring-batch-samples/src/main/resources/staging-test-context.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<import resource="classpath:data-source-context.xml" />
 
@@ -18,5 +16,4 @@
 	<bean id="provider" class="org.springframework.batch.sample.common.StagingItemReader">
 		<property name="dataSource" ref="dataSource" />
 	</bean>
-
 </beans>

spring-batch-samples/src/main/resources/xstream-config.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <mode>1003</mode>
-  <root-element-name>purchaseOrders</root-element-name>
-  <root-element-attributes>
-    <attribute>
-      <key>xmlns</key>
-      <value>http://adsj.accenture.com/purchaseorders</value>
-    </attribute>  
-    <attribute>
-      <key>xmlns:xsi</key>
-      <value>http://www.w3.org/2001/XMLSchema-instance</value>
-    </attribute>  
-    <attribute>
-      <key>xsi:schemaLocation</key>
-      <value>http://adsj.accenture.com/purchaseorders purchaseorders.xsd</value>
-    </attribute>  
-  </root-element-attributes>
-  <class-aliases>
-  </class-aliases>
-  <type-aliases>
-  </type-aliases>
-  <field-aliases>
-    <field-alias>
-      <alias-name>org.springframework.batch.sample.domain.order.internal.xml.Customer</alias-name>
-      <type>org.springframework.batch.sample.domain.order.internal.xml.Order</type>
-      <field-name>customer</field-name>
-    </field-alias>
-    <field-alias>
-      <alias-name>org.springframework.batch.sample.domain.order.internal.xml.Shipper</alias-name>
-      <type>org.springframework.batch.sample.domain.order.internal.xml.Order</type>
-      <field-name>shipper</field-name>
-    </field-alias>
-  </field-aliases>
-  <attribute-aliases>
-  </attribute-aliases>
-  <attributes>
-  </attributes>
-  <converters>
-  </converters>
-  <implicit-collections>
-  </implicit-collections>
-  <ommited-fields>
-  </ommited-fields>
-  <immutable-types>
-  </immutable-types>
-  <default-implementations>
-  </default-implementations>
-  <mappings>
-    <mapping>
-      <namespaceURI>http://adsj.accenture.com/purchaseorders</namespaceURI>
-      <localPart>order</localPart>
-      <prefix></prefix>
-      <class-name>org.springframework.batch.sample.domain.order.internal.xml.Order</class-name>
-    </mapping>
-    <mapping>
-      <namespaceURI>http://adsj.accenture.com/purchaseorders</namespaceURI>
-      <localPart>customer</localPart>
-      <prefix></prefix>
-       <class-name>org.springframework.batch.sample.domain.order.internal.xml.Customer</class-name>
-    </mapping>
-    <mapping>
-      <namespaceURI>http://adsj.accenture.com/purchaseorders</namespaceURI>
-      <localPart>shipper</localPart>
-      <prefix></prefix>
-       <class-name>org.springframework.batch.sample.domain.order.internal.xml.Shipper</class-name>
-    </mapping>
-    <mapping>
-      <namespaceURI>http://adsj.accenture.com/purchaseorders</namespaceURI>
-      <localPart>lineItem</localPart>
-      <prefix></prefix>
-       <class-name>org.springframework.batch.sample.domain.order.internal.xml.LineItem</class-name>
-    </mapping>
-  </mappings>
-</configuration>