Rename package batch.integration

spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/AsynchronousFailureException.java

@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.chunk;
+package org.springframework.batch.integration.chunk;
 
 import org.springframework.batch.item.ItemWriterException;
 

spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkHandler.java

@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.chunk;
+package org.springframework.batch.integration.chunk;
 
 
 public interface ChunkHandler {

spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java

@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.chunk;
+package org.springframework.batch.integration.chunk;
 
 import java.util.ArrayList;
 import java.util.List;

spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkRequest.java

@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.chunk;
+package org.springframework.batch.integration.chunk;
 
 import java.io.Serializable;
 import java.util.Collection;

spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkResponse.java

@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.chunk;
+package org.springframework.batch.integration.chunk;
 
 import java.io.Serializable;
 

spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ItemWriterChunkHandler.java

@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.chunk;
+package org.springframework.batch.integration.chunk;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

spring-batch-integration/src/main/java/org/springframework/batch/integration/file/FileToMessagesJobFactoryBean.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.file;
+package org.springframework.batch.integration.file;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobParameters;
@@ -23,6 +23,8 @@ import org.springframework.batch.core.job.SimpleJob;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.resource.StepExecutionResourceProxy;
 import org.springframework.batch.core.step.item.SimpleStepFactoryBean;
+import org.springframework.batch.integration.item.MessageChannelItemWriter;
+import org.springframework.batch.integration.launch.JobLaunchingMessageHandler;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.file.FlatFileItemReader;
 import org.springframework.batch.item.xml.StaxEventItemReader;
@@ -30,8 +32,6 @@ import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.annotation.Required;
 import org.springframework.core.io.Resource;
-import org.springframework.integration.batch.item.MessageChannelItemWriter;
-import org.springframework.integration.batch.launch.JobLaunchingMessageHandler;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.dispatcher.DirectChannel;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -40,7 +40,7 @@ import org.springframework.util.Assert;
 /**
  * A FactoryBean for a {@link Job} with a single step which just pumps messages
  * from a file into a channel. The channel has to be a
- * {@link SynchronousChannel} to ensure that failures propagate up to the step
+ * {@link DirectChannel} to ensure that failures propagate up to the step
  * and fail the job execution. Normally this job will be used in conjunction
  * with a {@link JobLaunchingMessageHandler} and a
  * {@link ResourcePayloadAsJobParameterStrategy}, so that the user can just

spring-batch-integration/src/main/java/org/springframework/batch/integration/file/ResourcePayloadAsJobParameterStrategy.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.file;
+package org.springframework.batch.integration.file;
 
 import java.io.IOException;
 
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.integration.launch.MessageToJobParametersStrategy;
 import org.springframework.batch.item.ItemStreamException;
 import org.springframework.core.io.Resource;
-import org.springframework.integration.batch.launch.MessageToJobParametersStrategy;
 import org.springframework.integration.message.Message;
 
 /**
@@ -39,7 +39,7 @@ public class ResourcePayloadAsJobParameterStrategy implements MessageToJobParame
 	 * Convert a message payload which is a {@link Resource} to its URL
 	 * representation and load that into a job parameter.
 	 * 
-	 * @see org.springframework.integration.batch.launch.MessageToJobParametersStrategy#getJobParameters(org.springframework.integration.message.Message)
+	 * @see org.springframework.batch.integration.launch.MessageToJobParametersStrategy#getJobParameters(org.springframework.integration.message.Message)
 	 */
 	public JobParameters getJobParameters(Message<?> message) {
 		JobParametersBuilder builder = new JobParametersBuilder();

spring-batch-integration/src/main/java/org/springframework/batch/integration/item/MessageChannelItemWriter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.item;
+package org.springframework.batch.integration.item;
 
 import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.beans.factory.annotation.Required;

spring-batch-integration/src/main/java/org/springframework/batch/integration/job/JobExecutionReply.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.job;
+package org.springframework.batch.integration.job;
 
 /**
  * @author dsyer

spring-batch-integration/src/main/java/org/springframework/batch/integration/job/JobExecutionRequest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.job;
+package org.springframework.batch.integration.job;
 
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.JobExecution;
@@ -52,14 +52,14 @@ public class JobExecutionRequest extends AttributeAccessorSupport {
 	}
 
 	/**
-	 * @return
+	 * @return the current job execution id
 	 */
 	public Long getJobId() {
 		return this.jobExecution.getJobId();
 	}
 
 	/**
-	 * @return
+	 * @return the current {@link BatchStatus}
 	 */
 	public BatchStatus getStatus() {
 		return status;
@@ -74,7 +74,7 @@ public class JobExecutionRequest extends AttributeAccessorSupport {
 	}
 
 	/**
-	 * @return
+	 * @return true if there are errors
 	 */
 	public boolean hasErrors() {
 		return throwable != null;

spring-batch-integration/src/main/java/org/springframework/batch/integration/job/MessageOrientedStep.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.job;
+package org.springframework.batch.integration.job;
 
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.JobInterruptedException;

spring-batch-integration/src/main/java/org/springframework/batch/integration/job/StepExecutionMessageHandler.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.job;
+package org.springframework.batch.integration.job;
 
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.JobExecution;

spring-batch-integration/src/main/java/org/springframework/batch/integration/job/StepExecutionTimeoutException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.batch.job;
+package org.springframework.batch.integration.job;
 
 import org.springframework.batch.core.UnexpectedJobExecutionException;
 

spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandler.java

@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.launch;
+package org.springframework.batch.integration.launch;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecution;
@@ -6,7 +6,6 @@ import org.springframework.batch.core.JobExecutionException;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.integration.annotation.Handler;
-import org.springframework.integration.annotation.MessageEndpoint;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageHandlingException;
 

spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/JobLaunchingPostReceiveChannelInterceptor.java

@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.launch;
+package org.springframework.batch.integration.launch;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobExecutionException;
@@ -27,7 +27,6 @@ public class JobLaunchingPostReceiveChannelInterceptor extends ChannelIntercepto
 	 * 
 	 * @param job The job to launch
 	 * @param jobLauncher
-	 * @param errorHandler
 	 */
 	public JobLaunchingPostReceiveChannelInterceptor(Job job, JobLauncher jobLauncher) {
 		super();

spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/MessagePropertiesToJobParametersStrategy.java

@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.launch;
+package org.springframework.batch.integration.launch;
 
 import java.util.Set;
 

spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/MessageToJobParametersStrategy.java

@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.launch;
+package org.springframework.batch.integration.launch;
 
 import org.springframework.batch.core.JobParameters;
 import org.springframework.integration.message.Message;

spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/MessageToJobStrategy.java

@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.launch;
+package org.springframework.batch.integration.launch;
 
 import org.springframework.batch.core.Job;
 import org.springframework.integration.message.Message;

spring-batch-integration/src/main/java/org/springframework/batch/integration/launch/StringPayloadAsJobNameStrategy.java

@@ -1,4 +1,4 @@
-package org.springframework.integration.batch.launch;
+package org.springframework.batch.integration.launch;
 
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.configuration.JobLocator;