From 90cb1e8ea3b47721f52070aee9a1c2d6320afaea Mon Sep 17 00:00:00 2001 From: dsyer Date: Sat, 1 Mar 2008 10:24:28 +0000 Subject: [PATCH] Rename some packages with more logical names --- .../JobFactory.java | 2 +- .../JobLocator.java | 3 ++- .../JobRegistry.java | 3 ++- .../ListableJobRegistry.java | 2 +- .../{support => }/CommandLineJobRunner.java | 4 ++-- .../DefaultJobParametersFactory.java | 2 +- .../{support => }/ExitCodeMapper.java | 2 +- .../{support => }/ExportedJobLauncher.java | 2 +- .../{support => }/JvmSystemExiter.java | 2 +- .../ScheduledJobParametersFactory.java | 2 +- .../SimpleExportedJobLauncher.java | 4 ++-- .../SimpleJvmExitCodeMapper.java | 2 +- .../bootstrap/{support => }/SystemExiter.java | 2 +- .../batch/execution/bootstrap/package.html | 2 +- .../execution/bootstrap/support/package.html | 7 ------ .../JobRegistryBeanPostProcessor.java | 4 ++-- .../configuration/MapJobRegistry.java | 6 ++--- .../configuration/ReferenceJobFactory.java | 6 ++--- .../resource/StepExecutionProxyResource.java | 2 +- .../step/support/ListenerMulticaster.java | 2 +- .../CommandLineJobRunnerTests.java | 4 +++- .../DefaultJobParametersFactoryTests.java | 3 ++- .../ScheduledJobParametersFactoryTests.java | 3 ++- .../SimpleExportedJobLauncherTests.java | 23 ++++++++++--------- .../SimpleJvmExitCodeMapperTests.java | 4 +++- .../{support => }/StubJobLauncher.java | 2 +- .../configuration/MapJobRegistryTests.java | 2 +- .../bootstrap/support/test-environment.xml | 8 +++---- .../resources/simple-container-definition.xml | 4 ++-- .../CompositeRepeatListener.java | 2 +- .../RepeatListenerSupport.java | 2 +- .../{interceptor => listener}/package.html | 0 .../RetryListenerSupport.java | 2 +- .../{interceptor => listener}/package.html | 0 .../CompositeRepeatListenerTests.java | 4 +++- .../RepeatListenerTests.java | 3 ++- .../RetryListenerSupportTests.java | 4 +++- .../RetryListenerTests.java | 3 ++- ...ssPathXmlApplicationContextJobFactory.java | 6 ++--- .../batch/sample/DefaultJobLoader.java | 2 +- .../batch/sample/TaskExecutorLauncher.java | 2 +- 41 files changed, 76 insertions(+), 68 deletions(-) rename spring-batch-core/src/main/java/org/springframework/batch/core/{repository => configuration}/JobFactory.java (93%) rename spring-batch-core/src/main/java/org/springframework/batch/core/{repository => configuration}/JobLocator.java (87%) rename spring-batch-core/src/main/java/org/springframework/batch/core/{repository => configuration}/JobRegistry.java (88%) rename spring-batch-core/src/main/java/org/springframework/batch/core/{repository => configuration}/ListableJobRegistry.java (92%) rename spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/{support => }/CommandLineJobRunner.java (98%) rename spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/{support => }/DefaultJobParametersFactory.java (98%) rename spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/{support => }/ExitCodeMapper.java (90%) rename spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/{support => }/ExportedJobLauncher.java (93%) rename spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/{support => }/JvmSystemExiter.java (92%) rename spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/{support => }/ScheduledJobParametersFactory.java (98%) rename spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/{support => }/SimpleExportedJobLauncher.java (97%) rename spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/{support => }/SimpleJvmExitCodeMapper.java (94%) rename spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/{support => }/SystemExiter.java (92%) delete mode 100644 spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/package.html rename spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/{support => }/CommandLineJobRunnerTests.java (95%) rename spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/{support => }/DefaultJobParametersFactoryTests.java (97%) rename spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/{support => }/ScheduledJobParametersFactoryTests.java (96%) rename spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/{support => }/SimpleExportedJobLauncherTests.java (84%) rename spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/{support => }/SimpleJvmExitCodeMapperTests.java (90%) rename spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/{support => }/StubJobLauncher.java (92%) rename spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/{interceptor => listener}/CompositeRepeatListener.java (98%) rename spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/{interceptor => listener}/RepeatListenerSupport.java (95%) rename spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/{interceptor => listener}/package.html (100%) rename spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/{interceptor => listener}/RetryListenerSupport.java (95%) rename spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/{interceptor => listener}/package.html (100%) rename spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/{interceptor => listener}/CompositeRepeatListenerTests.java (93%) rename spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/{interceptor => listener}/RepeatListenerTests.java (98%) rename spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/{interceptor => listener}/RetryListenerSupportTests.java (91%) rename spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/{interceptor => listener}/RetryListenerTests.java (97%) diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobFactory.java similarity index 93% rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobFactory.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobFactory.java index d4ba1994c..2c0af08e5 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobFactory.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.repository; +package org.springframework.batch.core.configuration; import org.springframework.batch.core.domain.Job; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobLocator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobLocator.java similarity index 87% rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobLocator.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobLocator.java index 43858bee2..263c82860 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobLocator.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobLocator.java @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.repository; +package org.springframework.batch.core.configuration; import org.springframework.batch.core.domain.Job; +import org.springframework.batch.core.repository.NoSuchJobException; /** * A runtime service locator interface for retrieving job configurations by diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRegistry.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobRegistry.java similarity index 88% rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRegistry.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobRegistry.java index be24eaac4..e8bd41c1f 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRegistry.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobRegistry.java @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.repository; +package org.springframework.batch.core.configuration; import org.springframework.batch.core.domain.Job; +import org.springframework.batch.core.repository.DuplicateJobException; /** * A runtime service registry interface for registering job configurations by diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/ListableJobRegistry.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/ListableJobRegistry.java similarity index 92% rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/ListableJobRegistry.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/configuration/ListableJobRegistry.java index e4f0657b7..6b28911c0 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/ListableJobRegistry.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/ListableJobRegistry.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.repository; +package org.springframework.batch.core.configuration; import java.util.Collection; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/CommandLineJobRunner.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/CommandLineJobRunner.java similarity index 98% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/CommandLineJobRunner.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/CommandLineJobRunner.java index 034524a10..45449cd2e 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/CommandLineJobRunner.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/CommandLineJobRunner.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.execution.bootstrap.support; +package org.springframework.batch.execution.bootstrap; import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.batch.core.configuration.JobLocator; 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.repository.JobLocator; import org.springframework.batch.core.runtime.ExitStatusExceptionClassifier; import org.springframework.batch.core.runtime.JobParametersFactory; import org.springframework.batch.execution.launch.JobLauncher; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/DefaultJobParametersFactory.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/DefaultJobParametersFactory.java similarity index 98% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/DefaultJobParametersFactory.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/DefaultJobParametersFactory.java index 8d313217f..1bfb5a5bc 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/DefaultJobParametersFactory.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/DefaultJobParametersFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.execution.bootstrap.support; +package org.springframework.batch.execution.bootstrap; import java.text.DateFormat; import java.text.DecimalFormat; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ExitCodeMapper.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ExitCodeMapper.java similarity index 90% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ExitCodeMapper.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ExitCodeMapper.java index 41d74e7bd..38fe44e03 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ExitCodeMapper.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ExitCodeMapper.java @@ -1,4 +1,4 @@ -package org.springframework.batch.execution.bootstrap.support; +package org.springframework.batch.execution.bootstrap; /** diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ExportedJobLauncher.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ExportedJobLauncher.java similarity index 93% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ExportedJobLauncher.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ExportedJobLauncher.java index 655d11ce4..d1452ba96 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ExportedJobLauncher.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ExportedJobLauncher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.execution.bootstrap.support; +package org.springframework.batch.execution.bootstrap; import java.util.Properties; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/JvmSystemExiter.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/JvmSystemExiter.java similarity index 92% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/JvmSystemExiter.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/JvmSystemExiter.java index 1993b2a91..142df2413 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/JvmSystemExiter.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/JvmSystemExiter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.execution.bootstrap.support; +package org.springframework.batch.execution.bootstrap; /** * Implementation of the {@link SystemExiter} interface that calls the standards diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ScheduledJobParametersFactory.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ScheduledJobParametersFactory.java similarity index 98% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ScheduledJobParametersFactory.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ScheduledJobParametersFactory.java index 356435ab4..00f16e2c8 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ScheduledJobParametersFactory.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/ScheduledJobParametersFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.execution.bootstrap.support; +package org.springframework.batch.execution.bootstrap; import java.text.DateFormat; import java.text.ParseException; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SimpleExportedJobLauncher.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SimpleExportedJobLauncher.java similarity index 97% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SimpleExportedJobLauncher.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SimpleExportedJobLauncher.java index 04d616858..1de03f4ae 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SimpleExportedJobLauncher.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SimpleExportedJobLauncher.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.execution.bootstrap.support; +package org.springframework.batch.execution.bootstrap; import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.Properties; +import org.springframework.batch.core.configuration.JobLocator; 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.domain.StepExecution; import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException; -import org.springframework.batch.core.repository.JobLocator; import org.springframework.batch.core.repository.NoSuchJobException; import org.springframework.batch.core.runtime.JobParametersFactory; import org.springframework.batch.execution.launch.JobLauncher; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapper.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SimpleJvmExitCodeMapper.java similarity index 94% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapper.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SimpleJvmExitCodeMapper.java index 54938e9de..20ae329ef 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapper.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SimpleJvmExitCodeMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.execution.bootstrap.support; +package org.springframework.batch.execution.bootstrap; import java.util.HashMap; import java.util.Map; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SystemExiter.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SystemExiter.java similarity index 92% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SystemExiter.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SystemExiter.java index f9f23e6d9..fe4cbdf59 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SystemExiter.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/SystemExiter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.execution.bootstrap.support; +package org.springframework.batch.execution.bootstrap; /** * Interface for exiting the JVM. This abstraction is only diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/package.html b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/package.html index bf6cb3777..7f6a1eae1 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/package.html +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/package.html @@ -1,7 +1,7 @@

-Specific implementations of bootstrap concerns. +Support classes for use in bootstrap implementations or configurations.

diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/package.html b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/package.html deleted file mode 100644 index 7f6a1eae1..000000000 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - -

-Support classes for use in bootstrap implementations or configurations. -

- - 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 e246c417f..15d366496 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,10 +19,10 @@ import java.util.Collection; import java.util.HashSet; import java.util.Iterator; +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.batch.core.repository.JobLocator; -import org.springframework.batch.core.repository.JobRegistry; import org.springframework.beans.BeansException; import org.springframework.beans.FatalBeanException; import org.springframework.beans.factory.DisposableBean; 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 e577dbdc9..ff5806a37 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,11 +21,11 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; +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.JobFactory; -import org.springframework.batch.core.repository.JobRegistry; -import org.springframework.batch.core.repository.ListableJobRegistry; 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 a78721b83..a98910076 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.configuration.JobFactory; import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.repository.JobFactory; /** * A {@link JobFactory} that just keeps a reference to a {@link Job}. It never @@ -43,7 +43,7 @@ public class ReferenceJobFactory implements JobFactory { /** * Just return the instance passed in on initialization. * - * @see org.springframework.batch.core.repository.JobFactory#createJob() + * @see org.springframework.batch.core.configuration.JobFactory#createJob() */ public Job createJob() { return job; @@ -52,7 +52,7 @@ public class ReferenceJobFactory implements JobFactory { /** * Returns the job name as passed in on initialization. * - * @see org.springframework.batch.core.repository.JobFactory#getJobName() + * @see org.springframework.batch.core.configuration.JobFactory#getJobName() */ public String getJobName() { return name; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java index 0c85d19df..d262dee97 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java @@ -30,7 +30,7 @@ import org.springframework.batch.core.domain.StepExecution; import org.springframework.batch.core.domain.StepListener; import org.springframework.batch.core.listener.StepListenerSupport; import org.springframework.batch.core.runtime.JobParametersFactory; -import org.springframework.batch.execution.bootstrap.support.DefaultJobParametersFactory; +import org.springframework.batch.execution.bootstrap.DefaultJobParametersFactory; import org.springframework.context.ResourceLoaderAware; import org.springframework.core.io.FileSystemResourceLoader; import org.springframework.core.io.Resource; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ListenerMulticaster.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ListenerMulticaster.java index c765e9a72..2e512ceb7 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ListenerMulticaster.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ListenerMulticaster.java @@ -33,7 +33,7 @@ import org.springframework.batch.item.exception.StreamException; import org.springframework.batch.item.stream.CompositeItemStream; import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.RepeatListener; -import org.springframework.batch.repeat.interceptor.CompositeRepeatListener; +import org.springframework.batch.repeat.listener.CompositeRepeatListener; /** * @author Dave Syer diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/CommandLineJobRunnerTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/CommandLineJobRunnerTests.java similarity index 95% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/CommandLineJobRunnerTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/CommandLineJobRunnerTests.java index 92577be9c..3905a22d4 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/CommandLineJobRunnerTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/CommandLineJobRunnerTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.execution.bootstrap.support; +package org.springframework.batch.execution.bootstrap; import junit.framework.TestCase; @@ -22,6 +22,8 @@ import org.springframework.batch.core.domain.JobExecution; import org.springframework.batch.core.domain.JobParameters; import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException; import org.springframework.batch.core.runtime.ExitStatusExceptionClassifier; +import org.springframework.batch.execution.bootstrap.CommandLineJobRunner; +import org.springframework.batch.execution.bootstrap.SystemExiter; import org.springframework.batch.execution.launch.JobLauncher; import org.springframework.batch.repeat.ExitStatus; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/DefaultJobParametersFactoryTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/DefaultJobParametersFactoryTests.java similarity index 97% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/DefaultJobParametersFactoryTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/DefaultJobParametersFactoryTests.java index 5d76f5e46..002676382 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/DefaultJobParametersFactoryTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/DefaultJobParametersFactoryTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.execution.bootstrap.support; +package org.springframework.batch.execution.bootstrap; import java.text.DateFormat; import java.text.DecimalFormat; @@ -25,6 +25,7 @@ import junit.framework.TestCase; import org.springframework.batch.core.domain.JobParameters; import org.springframework.batch.core.domain.JobParametersBuilder; +import org.springframework.batch.execution.bootstrap.DefaultJobParametersFactory; import org.springframework.util.StringUtils; /** diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/ScheduledJobParametersFactoryTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/ScheduledJobParametersFactoryTests.java similarity index 96% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/ScheduledJobParametersFactoryTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/ScheduledJobParametersFactoryTests.java index ac6dc6fcf..3cbb34045 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/ScheduledJobParametersFactoryTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/ScheduledJobParametersFactoryTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.execution.bootstrap.support; +package org.springframework.batch.execution.bootstrap; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -24,6 +24,7 @@ import junit.framework.TestCase; import org.springframework.batch.core.domain.JobParameters; import org.springframework.batch.core.domain.JobParametersBuilder; +import org.springframework.batch.execution.bootstrap.ScheduledJobParametersFactory; import org.springframework.util.StringUtils; /** diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/SimpleExportedJobLauncherTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/SimpleExportedJobLauncherTests.java similarity index 84% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/SimpleExportedJobLauncherTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/SimpleExportedJobLauncherTests.java index 72bd9de1d..a6e70951a 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/SimpleExportedJobLauncherTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/SimpleExportedJobLauncherTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.execution.bootstrap.support; +package org.springframework.batch.execution.bootstrap; import java.util.ArrayList; import java.util.List; @@ -28,6 +28,7 @@ import org.springframework.batch.core.domain.JobParametersBuilder; import org.springframework.batch.core.domain.StepExecution; import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException; import org.springframework.batch.core.runtime.JobParametersFactory; +import org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher; import org.springframework.batch.execution.configuration.MapJobRegistry; import org.springframework.batch.execution.configuration.ReferenceJobFactory; import org.springframework.batch.execution.job.JobSupport; @@ -65,7 +66,7 @@ public class SimpleExportedJobLauncherTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.execution.bootstrap.support.SimpleExportedJobLauncher#afterPropertiesSet()}. + * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#afterPropertiesSet()}. * @throws Exception */ public void testAfterPropertiesSet() throws Exception { @@ -82,7 +83,7 @@ public class SimpleExportedJobLauncherTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.execution.bootstrap.support.SimpleExportedJobLauncher#afterPropertiesSet()}. + * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#afterPropertiesSet()}. * @throws Exception */ public void testAfterPropertiesSetWithLauncher() throws Exception { @@ -104,7 +105,7 @@ public class SimpleExportedJobLauncherTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.execution.bootstrap.support.SimpleExportedJobLauncher#getStatistics()}. + * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#getStatistics()}. */ public void testGetStatistics() { Properties props = launcher.getStatistics(); @@ -114,7 +115,7 @@ public class SimpleExportedJobLauncherTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.execution.bootstrap.support.SimpleExportedJobLauncher#getStatistics()}. + * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#getStatistics()}. * @throws Exception */ public void testGetStatisticsWithContent() throws Exception { @@ -127,7 +128,7 @@ public class SimpleExportedJobLauncherTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.execution.bootstrap.support.SimpleExportedJobLauncher#isRunning()}. + * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#isRunning()}. * @throws Exception */ public void testIsRunning() throws Exception { @@ -138,7 +139,7 @@ public class SimpleExportedJobLauncherTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.execution.bootstrap.support.SimpleExportedJobLauncher#isRunning()}. + * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#isRunning()}. * @throws Exception */ public void testAlreadyRunning() throws Exception { @@ -154,7 +155,7 @@ public class SimpleExportedJobLauncherTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.execution.bootstrap.support.SimpleExportedJobLauncher#run(java.lang.String)}. + * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#run(java.lang.String)}. */ public void testRunNonExistentJob() { String value = launcher.run("foo"); @@ -163,7 +164,7 @@ public class SimpleExportedJobLauncherTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.execution.bootstrap.support.SimpleExportedJobLauncher#run(java.lang.String)}. + * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#run(java.lang.String)}. * @throws Exception */ public void testRunJobWithParameters() throws Exception { @@ -175,7 +176,7 @@ public class SimpleExportedJobLauncherTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.execution.bootstrap.support.SimpleExportedJobLauncher#run(java.lang.String)}. + * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#run(java.lang.String)}. * @throws Exception */ public void testRunJobWithParametersAndFactory() throws Exception { @@ -195,7 +196,7 @@ public class SimpleExportedJobLauncherTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.execution.bootstrap.support.SimpleExportedJobLauncher#stop()}. + * {@link org.springframework.batch.execution.bootstrap.SimpleExportedJobLauncher#stop()}. * @throws Exception */ public void testStop() throws Exception { diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapperTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/SimpleJvmExitCodeMapperTests.java similarity index 90% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapperTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/SimpleJvmExitCodeMapperTests.java index 2b6ea3116..b70ec33fc 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapperTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/SimpleJvmExitCodeMapperTests.java @@ -14,13 +14,15 @@ * limitations under the License. */ -package org.springframework.batch.execution.bootstrap.support; +package org.springframework.batch.execution.bootstrap; import java.util.HashMap; import java.util.Map; import junit.framework.TestCase; +import org.springframework.batch.execution.bootstrap.ExitCodeMapper; +import org.springframework.batch.execution.bootstrap.SimpleJvmExitCodeMapper; import org.springframework.batch.repeat.ExitStatus; public class SimpleJvmExitCodeMapperTests extends TestCase { diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/StubJobLauncher.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/StubJobLauncher.java similarity index 92% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/StubJobLauncher.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/StubJobLauncher.java index b97507d7b..595a6aaa3 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/StubJobLauncher.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/StubJobLauncher.java @@ -1,4 +1,4 @@ -package org.springframework.batch.execution.bootstrap.support; +package org.springframework.batch.execution.bootstrap; import org.springframework.batch.core.domain.Job; import org.springframework.batch.core.domain.JobExecution; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/MapJobRegistryTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/MapJobRegistryTests.java index 628c4b24b..2c97d8cca 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/MapJobRegistryTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/MapJobRegistryTests.java @@ -19,8 +19,8 @@ import java.util.Collection; import junit.framework.TestCase; +import org.springframework.batch.core.configuration.JobFactory; import org.springframework.batch.core.repository.DuplicateJobException; -import org.springframework.batch.core.repository.JobFactory; import org.springframework.batch.core.repository.NoSuchJobException; import org.springframework.batch.execution.job.JobSupport; diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml index e8dc1e376..40053e7b1 100644 --- a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml +++ b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml @@ -7,14 +7,14 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd"> - + - + + class="org.springframework.batch.execution.bootstrap.CommandLineJobRunnerTests$StubSystemExiter" /> + class="org.springframework.batch.execution.bootstrap.CommandLineJobRunnerTests$StubExceptionClassifier" /> diff --git a/spring-batch-execution/src/test/resources/simple-container-definition.xml b/spring-batch-execution/src/test/resources/simple-container-definition.xml index 2b3e26e62..81ba33472 100644 --- a/spring-batch-execution/src/test/resources/simple-container-definition.xml +++ b/spring-batch-execution/src/test/resources/simple-container-definition.xml @@ -62,7 +62,7 @@ + class="org.springframework.batch.execution.bootstrap.SimpleJvmExitCodeMapper" /> @@ -93,6 +93,6 @@ + class="org.springframework.batch.execution.bootstrap.CommandLineJobRunnerTests$StubSystemExiter" /> diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/CompositeRepeatListener.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/CompositeRepeatListener.java similarity index 98% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/CompositeRepeatListener.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/CompositeRepeatListener.java index ca548df04..58a16d420 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/CompositeRepeatListener.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/CompositeRepeatListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.repeat.interceptor; +package org.springframework.batch.repeat.listener; import java.util.ArrayList; import java.util.Arrays; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatListenerSupport.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/RepeatListenerSupport.java similarity index 95% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatListenerSupport.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/RepeatListenerSupport.java index e78b3b4e2..d1a497a23 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatListenerSupport.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/RepeatListenerSupport.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.repeat.interceptor; +package org.springframework.batch.repeat.listener; import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.RepeatContext; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/package.html similarity index 100% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/package.html diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/interceptor/RetryListenerSupport.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/listener/RetryListenerSupport.java similarity index 95% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/interceptor/RetryListenerSupport.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/listener/RetryListenerSupport.java index 6988df48c..cae0c1524 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/interceptor/RetryListenerSupport.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/listener/RetryListenerSupport.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.retry.interceptor; +package org.springframework.batch.retry.listener; import org.springframework.batch.retry.RetryCallback; import org.springframework.batch.retry.RetryContext; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/interceptor/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/listener/package.html similarity index 100% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/interceptor/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/listener/package.html diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/CompositeRepeatListenerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/CompositeRepeatListenerTests.java similarity index 93% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/CompositeRepeatListenerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/CompositeRepeatListenerTests.java index 792162796..81e23d301 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/CompositeRepeatListenerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/CompositeRepeatListenerTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.repeat.interceptor; +package org.springframework.batch.repeat.listener; import java.util.ArrayList; import java.util.List; @@ -23,6 +23,8 @@ import junit.framework.TestCase; import org.springframework.batch.repeat.RepeatContext; import org.springframework.batch.repeat.RepeatListener; import org.springframework.batch.repeat.context.RepeatContextSupport; +import org.springframework.batch.repeat.listener.CompositeRepeatListener; +import org.springframework.batch.repeat.listener.RepeatListenerSupport; /** * @author Dave Syer diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/RepeatListenerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/RepeatListenerTests.java similarity index 98% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/RepeatListenerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/RepeatListenerTests.java index 3ad4e1622..35068423c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/RepeatListenerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/RepeatListenerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.repeat.interceptor; +package org.springframework.batch.repeat.listener; import java.util.ArrayList; import java.util.List; @@ -25,6 +25,7 @@ import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.RepeatCallback; import org.springframework.batch.repeat.RepeatContext; import org.springframework.batch.repeat.RepeatListener; +import org.springframework.batch.repeat.listener.RepeatListenerSupport; import org.springframework.batch.repeat.support.RepeatTemplate; import org.springframework.batch.repeat.support.TaskExecutorRepeatTemplate; import org.springframework.core.task.SimpleAsyncTaskExecutor; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/interceptor/RetryListenerSupportTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/listener/RetryListenerSupportTests.java similarity index 91% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/interceptor/RetryListenerSupportTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/listener/RetryListenerSupportTests.java index 83859393b..2b449dd30 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/interceptor/RetryListenerSupportTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/listener/RetryListenerSupportTests.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package org.springframework.batch.retry.interceptor; +package org.springframework.batch.retry.listener; + +import org.springframework.batch.retry.listener.RetryListenerSupport; import junit.framework.TestCase; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/interceptor/RetryListenerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/listener/RetryListenerTests.java similarity index 97% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/interceptor/RetryListenerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/listener/RetryListenerTests.java index adb198996..203e56fb6 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/interceptor/RetryListenerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/listener/RetryListenerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.retry.interceptor; +package org.springframework.batch.retry.listener; import java.util.ArrayList; import java.util.List; @@ -25,6 +25,7 @@ import org.springframework.batch.retry.RetryCallback; import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.RetryListener; import org.springframework.batch.retry.exception.TerminatedRetryException; +import org.springframework.batch.retry.listener.RetryListenerSupport; import org.springframework.batch.retry.policy.NeverRetryPolicy; import org.springframework.batch.retry.support.RetryTemplate; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/ClassPathXmlApplicationContextJobFactory.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/ClassPathXmlApplicationContextJobFactory.java index f2e7f747e..20538d183 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/ClassPathXmlApplicationContextJobFactory.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/ClassPathXmlApplicationContextJobFactory.java @@ -15,8 +15,8 @@ */ package org.springframework.batch.sample; +import org.springframework.batch.core.configuration.JobFactory; import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.repository.JobFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -50,7 +50,7 @@ public class ClassPathXmlApplicationContextJobFactory implements JobFactory { * Create a {@link ClassPathXmlApplicationContext} from the path provided * and pull out a bean with the name given during initialization. * - * @see org.springframework.batch.core.repository.JobFactory#createJob() + * @see org.springframework.batch.core.configuration.JobFactory#createJob() */ public Job createJob() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[] { path }, parent); @@ -62,7 +62,7 @@ public class ClassPathXmlApplicationContextJobFactory implements JobFactory { * usually the name of the job as well, but it needn't be. The important * thing is that the job can be located by this name. * - * @see org.springframework.batch.core.repository.JobFactory#getJobName() + * @see org.springframework.batch.core.configuration.JobFactory#getJobName() */ public String getJobName() { return beanName; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/DefaultJobLoader.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/DefaultJobLoader.java index 2faeb8c94..df2e1c42e 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/DefaultJobLoader.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/DefaultJobLoader.java @@ -7,8 +7,8 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.springframework.batch.core.configuration.ListableJobRegistry; import org.springframework.batch.core.domain.Job; -import org.springframework.batch.core.repository.ListableJobRegistry; import org.springframework.batch.core.repository.NoSuchJobException; import org.springframework.beans.BeanWrapperImpl; import org.springframework.beans.BeansException; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskExecutorLauncher.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskExecutorLauncher.java index b38fa1f90..5c724877f 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskExecutorLauncher.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskExecutorLauncher.java @@ -15,9 +15,9 @@ */ package org.springframework.batch.sample; +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.core.repository.JobRegistry; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.xml.XmlBeanFactory;