[BATCH-432] Moved the domain objects up to the root core directory

spring-batch-samples/src/main/java/org/springframework/batch/sample/ClassPathXmlApplicationContextJobFactory.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.batch.sample;
 
+import org.springframework.batch.core.Job;
 import org.springframework.batch.core.configuration.JobFactory;
-import org.springframework.batch.core.domain.Job;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/DefaultJobInterruptionAdvice.java

@@ -2,9 +2,9 @@ package org.springframework.batch.sample.advice;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.domain.BatchStatus;
-import org.springframework.batch.core.domain.JobExecution;
-import org.springframework.batch.core.domain.JobInterruptedException;
+import org.springframework.batch.core.BatchStatus;
+import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.JobInterruptedException;
 
 /**
  * Monitors {@link JobExecution} and throws a {@link JobInterruptedException} in

spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/JobInterruptionAdvice.java

@@ -1,6 +1,6 @@
 package org.springframework.batch.sample.advice;
 
-import org.springframework.batch.core.domain.JobInterruptedException;
+import org.springframework.batch.core.JobInterruptedException;
 
 /**
  * Interface for monitors that check whether a job was interrupted by user.

spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java

@@ -20,7 +20,7 @@ import java.util.ArrayList;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.domain.StepExecution;
+import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.io.file.mapping.FieldSet;
 import org.springframework.batch.io.file.mapping.FieldSetMapper;
 import org.springframework.batch.item.reader.DelegatingItemReader;

spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/StagingItemReader.java

@@ -9,8 +9,8 @@ import java.util.List;
 import org.apache.commons.lang.SerializationUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.domain.StepExecution;
-import org.springframework.batch.core.domain.StepListener;
+import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.StepListener;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemStream;

spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/StagingItemWriter.java

@@ -5,8 +5,8 @@ import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
 import org.apache.commons.lang.SerializationUtils;
-import org.springframework.batch.core.domain.StepExecution;
-import org.springframework.batch.core.domain.StepListener;
+import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.StepListener;
 import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.item.exception.ClearFailedException;
 import org.springframework.batch.item.exception.FlushFailedException;

spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/TaskExecutorLauncher.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.batch.sample.launch;
 
+import org.springframework.batch.core.Job;
 import org.springframework.batch.core.configuration.JobRegistry;
-import org.springframework.batch.core.domain.Job;
 import org.springframework.batch.core.repository.DuplicateJobException;
 import org.springframework.batch.sample.ClassPathXmlApplicationContextJobFactory;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;

spring-batch-samples/src/main/java/org/springframework/batch/sample/quartz/JobLauncherDetails.java

@@ -18,8 +18,8 @@ package org.springframework.batch.sample.quartz;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.quartz.JobExecutionContext;
+import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.configuration.JobLocator;
-import org.springframework.batch.core.domain.JobParameters;
 import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
 import org.springframework.batch.core.repository.JobRestartException;
 import org.springframework.batch.core.repository.NoSuchJobException;

spring-batch-samples/src/main/java/org/springframework/batch/sample/quartz/QuartzBatchLauncher.java

@@ -18,8 +18,8 @@ package org.springframework.batch.sample.quartz;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.batch.core.Job;
 import org.springframework.batch.core.configuration.JobRegistry;
-import org.springframework.batch.core.domain.Job;
 import org.springframework.batch.core.repository.DuplicateJobException;
 import org.springframework.batch.sample.ClassPathXmlApplicationContextJobFactory;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;

spring-batch-samples/src/main/java/org/springframework/batch/sample/step/support/NoopStepInterruptionPolicy.java

@@ -1,6 +1,6 @@
 package org.springframework.batch.sample.step.support;
 
-import org.springframework.batch.core.domain.JobInterruptedException;
+import org.springframework.batch.core.JobInterruptedException;
 import org.springframework.batch.execution.step.support.StepInterruptionPolicy;
 import org.springframework.batch.repeat.RepeatContext;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/InfiniteLoopTasklet.java

@@ -18,7 +18,7 @@ package org.springframework.batch.sample.tasklet;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.domain.StepExecution;
+import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.listener.StepListenerSupport;
 import org.springframework.batch.core.tasklet.Tasklet;
 import org.springframework.batch.repeat.ExitStatus;