Rename package batch.integration

spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests-context.xml

@@ -2,29 +2,29 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:context="http://www.springframework.org/schema/context" xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-                                 http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-                                 http://www.springframework.org/schema/integration
-                                 http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
-                                 http://www.springframework.org/schema/context
-                                 http://www.springframework.org/schema/context/spring-context-2.5.xsd
-                                 http://www.springframework.org/schema/tx
-                                 http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+                                 http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+                                 http://www.springframework.org/schema/integration
+                                 http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+                                 http://www.springframework.org/schema/context
+                                 http://www.springframework.org/schema/context/spring-context-2.5.xsd
+                                 http://www.springframework.org/schema/tx
+                                 http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
 
-	<message-bus auto-create-channels="true" />
+	<message-bus auto-create-channels="true" />
 
-	<annotation-driven />
+	<annotation-driven />
 
-	<channel id="requests" />
-	<channel id="replies" />
+	<channel id="requests" />
+	<channel id="replies" />
 
 	<beans:bean id="transactionManager"
 		class="org.springframework.batch.support.transaction.ResourcelessTransactionManager" />
 	<tx:annotation-driven />
 
-	<beans:bean id="chunkHandler" class="org.springframework.integration.batch.chunk.ItemWriterChunkHandler">
+	<beans:bean id="chunkHandler" class="org.springframework.batch.integration.chunk.ItemWriterChunkHandler">
 		<beans:property name="itemWriter">
-			<beans:bean class="org.springframework.integration.batch.chunk.TestItemWriter"></beans:bean>
+			<beans:bean class="org.springframework.batch.integration.chunk.TestItemWriter"></beans:bean>
 		</beans:property>
 	</beans:bean>
 

spring-batch-integration/src/test/resources/org/springframework/batch/integration/item/MessageChannelItemWriterIntegrationTests-context.xml

@@ -13,7 +13,7 @@
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
 	<integration:message-bus auto-create-channels="true" />
 	<integration:channel id="requests" />
-	<bean id="itemWriter" class="org.springframework.integration.batch.item.MessageChannelItemWriter">
+	<bean id="itemWriter" class="org.springframework.batch.integration.item.MessageChannelItemWriter">
 		<property name="channel" ref="requests"/>
 	</bean>
 </beans>

spring-batch-integration/src/test/resources/org/springframework/batch/integration/job/MessageOrientedStepIntegrationTests-context.xml

@@ -21,7 +21,7 @@
 	<bean id="job" parent="simpleJob">
 		<property name="steps">
 			<bean
-				class="org.springframework.integration.batch.job.MessageOrientedStep">
+				class="org.springframework.batch.integration.job.MessageOrientedStep">
 				<property name="name" value="TODO: I shouldn't have to set this"/>
 				<property name="requestChannel" ref="requests" />
 				<property name="replyChannel" ref="replies" />
@@ -31,12 +31,12 @@
 		<property name="jobRepository" ref="jobRepository" />
 	</bean>
 	<bean id="step"
-		class="org.springframework.integration.batch.job.StepExecutionMessageHandler">
+		class="org.springframework.batch.integration.job.StepExecutionMessageHandler">
 		<property name="step">
 			<bean parent="taskletStep">
 				<property name="tasklet">
 					<bean
-						class="org.springframework.integration.batch.job.TestTasklet" />
+						class="org.springframework.batch.integration.job.TestTasklet" />
 				</property>
 			</bean>
 		</property>

spring-batch-integration/src/test/resources/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests-context.xml

@@ -21,12 +21,12 @@
 	
 	<integration:handler-endpoint input-channel="requests" handler="jobLaunchingHandler" method="handle"/>
 	
-	<bean id="jobLaunchingHandler" class="org.springframework.integration.batch.launch.JobLaunchingMessageHandler">
+	<bean id="jobLaunchingHandler" class="org.springframework.batch.integration.launch.JobLaunchingMessageHandler">
 		<constructor-arg ref="jobLauncher"/>
 		<constructor-arg ref="messageToJobStrategy"/>
 	</bean>
 	
-	<bean id="messageToJobStrategy" class="org.springframework.integration.batch.launch.StringPayloadAsJobNameStrategy">
+	<bean id="messageToJobStrategy" class="org.springframework.batch.integration.launch.StringPayloadAsJobNameStrategy">
 		<constructor-arg ref="jobRegistry" />
 	</bean>
 	
@@ -36,7 +36,7 @@
 	
 	<bean id="step" class="org.springframework.batch.core.step.tasklet.TaskletStep">
 		<property name="tasklet">
-				<bean class="org.springframework.integration.batch.job.TestTasklet"/>
+				<bean class="org.springframework.batch.integration.job.TestTasklet"/>
 		</property>
 		<property name="jobRepository" ref="jobRepository"/>
 	</bean>