diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobFactory.java index 2c0af08e5..95c7d35de 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobFactory.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobFactory.java @@ -15,7 +15,7 @@ */ package org.springframework.batch.core.configuration; -import org.springframework.batch.core.domain.Job; +import org.springframework.batch.core.Job; /** * Strategy for creating a single job. diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobLocator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobLocator.java index 86e638614..20007e81d 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobLocator.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobLocator.java @@ -15,7 +15,7 @@ */ package org.springframework.batch.core.configuration; -import org.springframework.batch.core.domain.Job; +import org.springframework.batch.core.Job; import org.springframework.batch.core.repository.NoSuchJobException; /** diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobRegistry.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobRegistry.java index 1b2c454d5..a8a661ea3 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobRegistry.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobRegistry.java @@ -15,7 +15,7 @@ */ package org.springframework.batch.core.configuration; -import org.springframework.batch.core.domain.Job; +import org.springframework.batch.core.Job; import org.springframework.batch.core.repository.DuplicateJobException; /** diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/package.html b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/package.html deleted file mode 100644 index 5b7a23f51..000000000 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/domain/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - -

-Interfaces and generic implementations of domain concerns. -

- - diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/BatchListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/BatchListenerSupport.java index 3191ede8b..d4ea6d11f 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/BatchListenerSupport.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/BatchListenerSupport.java @@ -15,12 +15,12 @@ */ package org.springframework.batch.core.listener; -import org.springframework.batch.core.domain.BatchListener; -import org.springframework.batch.core.domain.ChunkListener; -import org.springframework.batch.core.domain.ItemReadListener; -import org.springframework.batch.core.domain.ItemWriteListener; -import org.springframework.batch.core.domain.StepExecution; -import org.springframework.batch.core.domain.StepListener; +import org.springframework.batch.core.BatchListener; +import org.springframework.batch.core.ChunkListener; +import org.springframework.batch.core.ItemReadListener; +import org.springframework.batch.core.ItemWriteListener; +import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.StepListener; import org.springframework.batch.repeat.ExitStatus; /** diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ChunkListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ChunkListenerSupport.java index 704e77023..06635cebb 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ChunkListenerSupport.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ChunkListenerSupport.java @@ -15,7 +15,7 @@ */ package org.springframework.batch.core.listener; -import org.springframework.batch.core.domain.ChunkListener; +import org.springframework.batch.core.ChunkListener; /** * Basic support implementation of {@link ChunkListener} diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemListenerSupport.java index 22d9b2475..a173403c7 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemListenerSupport.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemListenerSupport.java @@ -15,8 +15,8 @@ */ package org.springframework.batch.core.listener; -import org.springframework.batch.core.domain.ItemReadListener; -import org.springframework.batch.core.domain.ItemWriteListener; +import org.springframework.batch.core.ItemReadListener; +import org.springframework.batch.core.ItemWriteListener; /** * Basic no-op implementation of both the {@link ItemWriteListener} and diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerSupport.java index a74f30f55..5832c6c55 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerSupport.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerSupport.java @@ -15,8 +15,8 @@ */ package org.springframework.batch.core.listener; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobListener; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobListener; /** * @author Dave Syer diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerSupport.java index 5458c6344..8488050dc 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerSupport.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerSupport.java @@ -15,8 +15,8 @@ */ package org.springframework.batch.core.listener; -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.repeat.ExitStatus; /** diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/DuplicateJobException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/DuplicateJobException.java index 75680e360..ed2d93220 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/DuplicateJobException.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/DuplicateJobException.java @@ -15,7 +15,7 @@ */ package org.springframework.batch.core.repository; -import org.springframework.batch.core.domain.Job; +import org.springframework.batch.core.Job; /** * Checked exception that indicates a name clash when registering diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobException.java index bfbbc6234..a68c3e3de 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobException.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobException.java @@ -15,7 +15,7 @@ */ package org.springframework.batch.core.repository; -import org.springframework.batch.core.domain.Job; +import org.springframework.batch.core.Job; /** * Base class for checked exceptions related to {@link Job} diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobExecutionAlreadyRunningException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobExecutionAlreadyRunningException.java index acd8ac93c..48390971d 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobExecutionAlreadyRunningException.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobExecutionAlreadyRunningException.java @@ -15,7 +15,7 @@ */ package org.springframework.batch.core.repository; -import org.springframework.batch.core.domain.JobExecutionException; +import org.springframework.batch.core.JobExecutionException; /** * @author Dave Syer diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRepository.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRepository.java index 79b7ed19b..aaec09158 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRepository.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRepository.java @@ -16,12 +16,12 @@ package org.springframework.batch.core.repository; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.item.ExecutionContext; /** diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/NoSuchJobException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/NoSuchJobException.java index 7c1e1a273..171ab381e 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/NoSuchJobException.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/NoSuchJobException.java @@ -15,7 +15,7 @@ */ package org.springframework.batch.core.repository; -import org.springframework.batch.core.domain.Job; +import org.springframework.batch.core.Job; /** diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/JobParametersFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/JobParametersFactory.java index 25a728423..848b79b55 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/JobParametersFactory.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/JobParametersFactory.java @@ -18,8 +18,8 @@ package org.springframework.batch.core.runtime; import java.util.Properties; -import org.springframework.batch.core.domain.JobParameters; -import org.springframework.batch.core.domain.JobParametersBuilder; +import org.springframework.batch.core.JobParameters; +import org.springframework.batch.core.JobParametersBuilder; /** * A factory for {@link JobParameters} instances. A job can be diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/Tasklet.java b/spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/Tasklet.java index d2096abad..c53adad59 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/Tasklet.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/Tasklet.java @@ -16,9 +16,9 @@ package org.springframework.batch.core.tasklet; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; -import org.springframework.batch.core.domain.StepListener; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.StepListener; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.repeat.ExitStatus; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobExecutionExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobExecutionExceptionTests.java deleted file mode 100644 index f06c9af08..000000000 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobExecutionExceptionTests.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2006-2007 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.batch.core.domain; - -import org.springframework.batch.core.AbstractExceptionTests; -import org.springframework.batch.core.domain.JobExecutionException; - -/** - * @author Dave Syer - * - */ -public class JobExecutionExceptionTests extends AbstractExceptionTests { - - /* (non-Javadoc) - * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String) - */ - public Exception getException(String msg) throws Exception { - return new JobExecutionException(msg); - } - - /* (non-Javadoc) - * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String, java.lang.Throwable) - */ - public Exception getException(String msg, Throwable t) throws Exception { - return new JobExecutionException(msg, t); - } - -} diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java index 1f6e34239..2fae13d60 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java @@ -19,9 +19,9 @@ import java.util.Collection; import java.util.HashSet; import java.util.Iterator; +import org.springframework.batch.core.Job; import org.springframework.batch.core.configuration.JobLocator; import org.springframework.batch.core.configuration.JobRegistry; -import org.springframework.batch.core.domain.Job; import org.springframework.batch.core.repository.DuplicateJobException; import org.springframework.beans.BeansException; import org.springframework.beans.FatalBeanException; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/MapJobRegistry.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/MapJobRegistry.java index 269d65408..e5c054754 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/MapJobRegistry.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/MapJobRegistry.java @@ -21,10 +21,10 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import org.springframework.batch.core.Job; import org.springframework.batch.core.configuration.JobFactory; import org.springframework.batch.core.configuration.JobRegistry; import org.springframework.batch.core.configuration.ListableJobRegistry; -import org.springframework.batch.core.domain.Job; import org.springframework.batch.core.repository.DuplicateJobException; import org.springframework.batch.core.repository.NoSuchJobException; import org.springframework.util.Assert; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/ReferenceJobFactory.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/ReferenceJobFactory.java index a98910076..84c21508f 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/ReferenceJobFactory.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/ReferenceJobFactory.java @@ -15,8 +15,8 @@ */ package org.springframework.batch.execution.configuration; +import org.springframework.batch.core.Job; import org.springframework.batch.core.configuration.JobFactory; -import org.springframework.batch.core.domain.Job; /** * A {@link JobFactory} that just keeps a reference to a {@link Job}. It never diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/AbstractJob.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/AbstractJob.java index 431382410..64984bde2 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/AbstractJob.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/AbstractJob.java @@ -19,8 +19,8 @@ package org.springframework.batch.execution.job; import java.util.ArrayList; import java.util.List; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.Step; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.Step; import org.springframework.beans.factory.BeanNameAware; import org.springframework.util.ClassUtils; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/SimpleJob.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/SimpleJob.java index addd36347..ebf10b97d 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/SimpleJob.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/SimpleJob.java @@ -20,13 +20,13 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import org.springframework.batch.core.domain.BatchStatus; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.JobInterruptedException; -import org.springframework.batch.core.domain.JobListener; -import org.springframework.batch.core.domain.Step; -import org.springframework.batch.core.domain.StepExecution; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobInstance; +import org.springframework.batch.core.JobInterruptedException; +import org.springframework.batch.core.JobListener; +import org.springframework.batch.core.Step; +import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.execution.listener.CompositeJobListener; import org.springframework.batch.io.exception.InfrastructureException; @@ -70,7 +70,7 @@ public class SimpleJob extends AbstractJob { * Run the specified job by looping through the steps and delegating to the * {@link Step}. * - * @see org.springframework.batch.core.domain.Job#execute(org.springframework.batch.core.domain.JobExecution) + * @see org.springframework.batch.core.Job#execute(org.springframework.batch.core.JobExecution) */ public void execute(JobExecution execution) throws InfrastructureException { diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobLauncher.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobLauncher.java index 52aad3999..14d8d835d 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobLauncher.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobLauncher.java @@ -15,9 +15,9 @@ */ package org.springframework.batch.execution.launch; -import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobParameters; +import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.repository.JobRestartException; import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException; diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql index 265fa0889..ee822b8d7 100644 --- a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql +++ b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql @@ -62,12 +62,12 @@ CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT ( references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID) ); -CREATE TABLE BATCH_STEP_EXECUTION_SEQ ( - ID BIGINT IDENTITY -); -CREATE TABLE BATCH_JOB_EXECUTION_SEQ ( - ID BIGINT IDENTITY -); -CREATE TABLE BATCH_JOB_SEQ ( - ID BIGINT IDENTITY -); +CREATE TABLE BATCH_STEP_EXECUTION_SEQ ( + ID BIGINT IDENTITY +); +CREATE TABLE BATCH_JOB_EXECUTION_SEQ ( + ID BIGINT IDENTITY +); +CREATE TABLE BATCH_JOB_SEQ ( + ID BIGINT IDENTITY +);