From 005de0523e94ae03fd57ae2218948a34c75515b5 Mon Sep 17 00:00:00 2001 From: dsyer Date: Sun, 9 Mar 2008 09:18:40 +0000 Subject: [PATCH] OPEN - issue BATCH-429: Combine the core and execution modules http://jira.springframework.org/browse/BATCH-429 Removed dependency from resource to launch --- .../batch/core/launch/support/CommandLineJobRunner.java | 1 + .../batch/core/launch/support/SimpleExportedJobLauncher.java | 1 + .../batch/core/resource/StepExecutionProxyResource.java | 2 +- .../support => runtime}/DefaultJobParametersFactory.java | 3 +-- .../core/launch/support/DefaultJobParametersFactoryTests.java | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) rename spring-batch-core/src/main/java/org/springframework/batch/core/{launch/support => runtime}/DefaultJobParametersFactory.java (97%) diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java index ec3f0e816..ef195ea12 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java @@ -24,6 +24,7 @@ import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.configuration.JobLocator; import org.springframework.batch.core.launch.JobLauncher; +import org.springframework.batch.core.runtime.DefaultJobParametersFactory; import org.springframework.batch.core.runtime.JobParametersFactory; import org.springframework.batch.repeat.ExitStatus; import org.springframework.beans.factory.BeanDefinitionStoreException; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleExportedJobLauncher.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleExportedJobLauncher.java index 2195c2be9..66adfb3e4 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleExportedJobLauncher.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleExportedJobLauncher.java @@ -29,6 +29,7 @@ import org.springframework.batch.core.launch.JobLauncher; import org.springframework.batch.core.repository.JobRestartException; import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException; import org.springframework.batch.core.repository.NoSuchJobException; +import org.springframework.batch.core.runtime.DefaultJobParametersFactory; import org.springframework.batch.core.runtime.JobParametersFactory; import org.springframework.batch.support.PropertiesConverter; import org.springframework.beans.factory.InitializingBean; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/resource/StepExecutionProxyResource.java b/spring-batch-core/src/main/java/org/springframework/batch/core/resource/StepExecutionProxyResource.java index b932095bc..585cec73d 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/resource/StepExecutionProxyResource.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/resource/StepExecutionProxyResource.java @@ -28,8 +28,8 @@ import java.util.Map.Entry; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.StepListener; -import org.springframework.batch.core.launch.support.DefaultJobParametersFactory; import org.springframework.batch.core.listener.StepListenerSupport; +import org.springframework.batch.core.runtime.DefaultJobParametersFactory; import org.springframework.batch.core.runtime.JobParametersFactory; import org.springframework.context.ResourceLoaderAware; import org.springframework.core.io.FileSystemResourceLoader; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/DefaultJobParametersFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/DefaultJobParametersFactory.java similarity index 97% rename from spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/DefaultJobParametersFactory.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/runtime/DefaultJobParametersFactory.java index d01a53b36..74c86239e 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/DefaultJobParametersFactory.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/DefaultJobParametersFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.launch.support; +package org.springframework.batch.core.runtime; import java.text.DateFormat; import java.text.DecimalFormat; @@ -28,7 +28,6 @@ import java.util.Map.Entry; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.JobParametersBuilder; -import org.springframework.batch.core.runtime.JobParametersFactory; import org.springframework.util.StringUtils; /** diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/DefaultJobParametersFactoryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/DefaultJobParametersFactoryTests.java index e495310d0..33cc9bd43 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/DefaultJobParametersFactoryTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/DefaultJobParametersFactoryTests.java @@ -25,7 +25,7 @@ import junit.framework.TestCase; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.JobParametersBuilder; -import org.springframework.batch.core.launch.support.DefaultJobParametersFactory; +import org.springframework.batch.core.runtime.DefaultJobParametersFactory; import org.springframework.util.StringUtils; /**