From bfb9447d6b8fe019741064be88c4338b671ef28e Mon Sep 17 00:00:00 2001 From: nebhale Date: Fri, 7 Mar 2008 16:02:22 +0000 Subject: [PATCH] [BATCH-429] Moved all code out of execution --- spring-batch-core/pom.xml | 152 +++++++++++++++++- .../JobRegistryBeanPostProcessor.java | 0 .../configuration/MapJobRegistry.java | 0 .../configuration/ReferenceJobFactory.java | 0 .../execution/configuration/package.html | 0 .../batch/execution/job/AbstractJob.java | 0 .../batch/execution/job/SimpleJob.java | 0 .../batch/execution/job/package.html | 0 .../batch/execution/launch/JobLauncher.java | 0 .../execution/launch/SimpleJobLauncher.java | 0 .../batch/execution/launch/package.html | 0 .../launch/support/CommandLineJobRunner.java | 0 .../support/DefaultJobParametersFactory.java | 0 .../launch/support/ExitCodeMapper.java | 0 .../launch/support/ExportedJobLauncher.java | 0 .../launch/support/JvmSystemExiter.java | 0 .../ScheduledJobParametersFactory.java | 0 .../support/SimpleExportedJobLauncher.java | 0 .../support/SimpleJvmExitCodeMapper.java | 0 .../launch/support/SystemExiter.java | 0 .../execution/launch/support/package.html | 0 .../listener/CompositeChunkListener.java | 0 .../listener/CompositeItemReadListener.java | 0 .../listener/CompositeItemWriteListener.java | 0 .../listener/CompositeJobListener.java | 0 .../listener/CompositeStepListener.java | 0 .../batch/execution/package.html | 0 .../repository/JobRepositoryFactoryBean.java | 0 .../repository/SimpleJobRepository.java | 0 .../dao/AbstractJdbcBatchMetadataDao.java | 0 .../repository/dao/JdbcJobExecutionDao.java | 0 .../repository/dao/JdbcJobInstanceDao.java | 0 .../repository/dao/JdbcStepExecutionDao.java | 0 .../repository/dao/JobExecutionDao.java | 0 .../repository/dao/JobInstanceDao.java | 0 .../repository/dao/MapJobExecutionDao.java | 0 .../repository/dao/MapJobInstanceDao.java | 0 .../repository/dao/MapStepExecutionDao.java | 0 .../repository/dao/NoSuchObjectException.java | 0 .../repository/dao/StepExecutionDao.java | 0 .../execution/repository/dao/package.html | 0 .../batch/execution/repository/package.html | 0 .../resource/StepExecutionProxyResource.java | 0 .../batch/execution/step/AbstractStep.java | 0 .../batch/execution/step/ItemHandler.java | 0 .../execution/step/ItemOrientedStep.java | 0 .../batch/execution/step/TaskletStep.java | 0 .../batch/execution/step/package.html | 0 .../step/support/AbstractStepFactoryBean.java | 0 .../support/AlwaysSkipItemSkipPolicy.java | 0 .../support/BatchListenerFactoryHelper.java | 0 .../support/DefaultItemFailureHandler.java | 0 .../DefaultStepExecutionSynchronizer.java | 0 .../step/support/DefaultStepFactoryBean.java | 0 .../support/ItemSkipPolicyItemHandler.java | 0 .../support/LimitCheckingItemSkipPolicy.java | 0 .../step/support/ListenerMulticaster.java | 0 .../step/support/NeverSkipItemSkipPolicy.java | 0 .../RepeatOperationsStepFactoryBean.java | 0 .../SimpleExitStatusExceptionClassifier.java | 0 .../step/support/SimpleItemHandler.java | 0 .../support/SimpleRetryExceptionHandler.java | 0 .../support/SkipLimitExceededException.java | 0 .../support/StatefulRetryStepFactoryBean.java | 0 .../support/StepExecutionSynchronizer.java | 0 .../step/support/StepInterruptionPolicy.java | 0 .../support/ThreadStepInterruptionPolicy.java | 0 .../batch/execution/step/support/package.html | 0 .../execution/tasklet/TaskletAdapter.java | 0 .../batch/execution/tasklet/package.html | 0 .../main/resources/batch.template.properties | 0 .../src/main/resources/schema-db2.sql | 0 .../src/main/resources/schema-derby.sql | 0 .../src/main/resources/schema-hsqldb.sql | 0 .../src/main/resources/schema-mysql.sql | 0 .../src/main/resources/schema-oracle10g.sql | 0 .../src/main/resources/schema-postgresql.sql | 0 .../src/main/sql/db2.properties | 0 .../src/main/sql/db2.vpp | 0 .../src/main/sql/derby.properties | 0 .../src/main/sql/derby.vpp | 0 .../src/main/sql/destroy.sql.vpp | 0 .../src/main/sql/hsqldb.properties | 0 .../src/main/sql/hsqldb.vpp | 0 .../src/main/sql/init.sql.vpp | 0 .../src/main/sql/mysql.properties | 0 .../src/main/sql/mysql.vpp | 0 .../src/main/sql/oracle10g.properties | 0 .../src/main/sql/oracle10g.vpp | 0 .../src/main/sql/postgresql.properties | 0 .../src/main/sql/postgresql.vpp | 0 .../src/main/sql/schema.sql.vpp | 0 .../execution/AbstractExceptionTests.java | 0 .../JobRegistryBeanPostProcessorTests.java | 0 .../configuration/MapJobRegistryTests.java | 0 .../batch/execution/job/AbstractJobTests.java | 0 .../batch/execution/job/JobSupport.java | 0 .../batch/execution/job/SimpleJobTests.java | 0 .../execution/launch/EmptyItemWriter.java | 0 .../launch/SimpleJobLauncherTests.java | 0 .../support/CommandLineJobRunnerTests.java | 0 .../DefaultJobParametersFactoryTests.java | 0 .../ScheduledJobParametersFactoryTests.java | 0 .../SimpleExportedJobLauncherTests.java | 0 .../support/SimpleJvmExitCodeMapperTests.java | 0 .../launch/support/StubJobLauncher.java | 0 .../listener/CompositeChunkListenerTests.java | 0 .../CompositeItemReadListenerTests.java | 0 .../CompositeItemWriteListenerTests.java | 0 .../listener/CompositeJobListenerTests.java | 0 .../listener/CompositeStepListenerTests.java | 0 .../JobRepositoryFactoryBeanTests.java | 0 .../execution/repository/MockStepDao.java | 0 .../SimpleJobRepositoryIntegrationTests.java | 0 .../repository/SimpleJobRepositoryTests.java | 0 .../repository/dao/AbstractJobDaoTests.java | 0 .../repository/dao/AbstractStepDaoTests.java | 0 .../repository/dao/JdbcJobDaoQueryTests.java | 0 .../repository/dao/JdbcJobDaoTests.java | 0 .../dao/JdbcStepDaoPrefixTests.java | 0 .../repository/dao/JdbcStepDaoTests.java | 0 .../dao/MapJobExecutionDaoTests.java | 0 .../dao/MapJobInstanceDaoTests.java | 0 .../dao/MapStepExecutionDaoTests.java | 0 ...NoSuchBatchDomainObjectExceptionTests.java | 0 .../StepExecutionProxyResourceTests.java | 0 .../execution/step/ItemOrientedStepTests.java | 86 +++++----- .../batch/execution/step/StepSupport.java | 0 .../execution/step/TaskletStepTests.java | 0 .../support/DefaultStepFactoryBeanTests.java | 0 .../step/support/JobRepositorySupport.java | 0 .../step/support/MockItemReader.java | 0 .../RepeatOperationsStepFactoryBeanTests.java | 0 ...pleExitStatusExceptionClassifierTests.java | 0 .../SimpleRetryExceptionHandlerTests.java | 0 .../SkipLimitReadFailurePolicyTests.java | 0 .../StatefulRetryStepFactoryBeanTests.java | 0 .../StepExecutorInterruptionTests.java | 0 .../ThreadStepInterruptionPolicyTests.java | 0 .../tasklet/TaskletAdapterTests.java | 0 .../InitializingDataSourceFactoryBean.java | 0 .../batch/execution/bootstrap/support/job.xml | 0 .../bootstrap/support/test-environment.xml | 0 .../execution/configuration/test-context.xml | 0 .../repository/dao/data-source-context.xml | 0 .../execution/repository/dao/destroy.sql | 0 .../batch/execution/repository/dao/init.sql | 0 .../execution/repository/dao/sql-dao-test.xml | 0 spring-batch-execution/.springBeans | 12 +- spring-batch-execution/pom.xml | 117 -------------- spring-batch-infrastructure/.springBeans | 1 - .../item/adapter/AbstractDelegatorTests.java | 2 +- spring-batch-samples/pom.xml | 5 - 153 files changed, 188 insertions(+), 187 deletions(-) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/configuration/MapJobRegistry.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/configuration/ReferenceJobFactory.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/configuration/package.html (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/job/AbstractJob.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/job/SimpleJob.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/job/package.html (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/launch/JobLauncher.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/launch/package.html (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/launch/support/CommandLineJobRunner.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactory.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/launch/support/ExitCodeMapper.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/launch/support/ExportedJobLauncher.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/launch/support/JvmSystemExiter.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactory.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncher.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapper.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/launch/support/SystemExiter.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/launch/support/package.html (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/listener/CompositeChunkListener.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/listener/CompositeItemReadListener.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/listener/CompositeItemWriteListener.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/listener/CompositeJobListener.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/listener/CompositeStepListener.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/package.html (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBean.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/repository/dao/AbstractJdbcBatchMetadataDao.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobExecutionDao.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobInstanceDao.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepExecutionDao.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/repository/dao/JobExecutionDao.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/repository/dao/JobInstanceDao.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDao.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDao.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDao.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/repository/dao/NoSuchObjectException.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/repository/dao/StepExecutionDao.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/repository/dao/package.html (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/repository/package.html (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/AbstractStep.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/ItemHandler.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/ItemOrientedStep.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/TaskletStep.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/package.html (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/support/AbstractStepFactoryBean.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/support/AlwaysSkipItemSkipPolicy.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/support/BatchListenerFactoryHelper.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/support/DefaultItemFailureHandler.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/support/DefaultStepExecutionSynchronizer.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBean.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/support/ItemSkipPolicyItemHandler.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/support/LimitCheckingItemSkipPolicy.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/support/ListenerMulticaster.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/support/NeverSkipItemSkipPolicy.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBean.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifier.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/support/SimpleItemHandler.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandler.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/support/SkipLimitExceededException.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBean.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/support/StepExecutionSynchronizer.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/support/StepInterruptionPolicy.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicy.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/step/support/package.html (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/tasklet/TaskletAdapter.java (100%) rename {spring-batch-execution => spring-batch-core}/src/main/java/org/springframework/batch/execution/tasklet/package.html (100%) rename {spring-batch-execution => spring-batch-core}/src/main/resources/batch.template.properties (100%) rename {spring-batch-execution => spring-batch-core}/src/main/resources/schema-db2.sql (100%) rename {spring-batch-execution => spring-batch-core}/src/main/resources/schema-derby.sql (100%) rename {spring-batch-execution => spring-batch-core}/src/main/resources/schema-hsqldb.sql (100%) rename {spring-batch-execution => spring-batch-core}/src/main/resources/schema-mysql.sql (100%) rename {spring-batch-execution => spring-batch-core}/src/main/resources/schema-oracle10g.sql (100%) rename {spring-batch-execution => spring-batch-core}/src/main/resources/schema-postgresql.sql (100%) rename {spring-batch-execution => spring-batch-core}/src/main/sql/db2.properties (100%) rename {spring-batch-execution => spring-batch-core}/src/main/sql/db2.vpp (100%) rename {spring-batch-execution => spring-batch-core}/src/main/sql/derby.properties (100%) rename {spring-batch-execution => spring-batch-core}/src/main/sql/derby.vpp (100%) rename {spring-batch-execution => spring-batch-core}/src/main/sql/destroy.sql.vpp (100%) rename {spring-batch-execution => spring-batch-core}/src/main/sql/hsqldb.properties (100%) rename {spring-batch-execution => spring-batch-core}/src/main/sql/hsqldb.vpp (100%) rename {spring-batch-execution => spring-batch-core}/src/main/sql/init.sql.vpp (100%) rename {spring-batch-execution => spring-batch-core}/src/main/sql/mysql.properties (100%) rename {spring-batch-execution => spring-batch-core}/src/main/sql/mysql.vpp (100%) rename {spring-batch-execution => spring-batch-core}/src/main/sql/oracle10g.properties (100%) rename {spring-batch-execution => spring-batch-core}/src/main/sql/oracle10g.vpp (100%) rename {spring-batch-execution => spring-batch-core}/src/main/sql/postgresql.properties (100%) rename {spring-batch-execution => spring-batch-core}/src/main/sql/postgresql.vpp (100%) rename {spring-batch-execution => spring-batch-core}/src/main/sql/schema.sql.vpp (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/AbstractExceptionTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessorTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/configuration/MapJobRegistryTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/job/AbstractJobTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/job/JobSupport.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/launch/EmptyItemWriter.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/launch/SimpleJobLauncherTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/launch/support/CommandLineJobRunnerTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactoryTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactoryTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncherTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapperTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/launch/support/StubJobLauncher.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/listener/CompositeChunkListenerTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/listener/CompositeItemReadListenerTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/listener/CompositeItemWriteListenerTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/listener/CompositeJobListenerTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/listener/CompositeStepListenerTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBeanTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/repository/MockStepDao.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryIntegrationTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoQueryTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoPrefixTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDaoTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDaoTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDaoTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/repository/dao/NoSuchBatchDomainObjectExceptionTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/resource/StepExecutionProxyResourceTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java (94%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/step/StepSupport.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/step/TaskletStepTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBeanTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/step/support/JobRepositorySupport.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/step/support/MockItemReader.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBeanTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifierTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandlerTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/step/support/SkipLimitReadFailurePolicyTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBeanTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/step/support/StepExecutorInterruptionTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicyTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/org/springframework/batch/execution/tasklet/TaskletAdapterTests.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java (100%) rename {spring-batch-execution => spring-batch-core}/src/test/resources/org/springframework/batch/execution/bootstrap/support/job.xml (100%) rename {spring-batch-execution => spring-batch-core}/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml (100%) rename {spring-batch-execution => spring-batch-core}/src/test/resources/org/springframework/batch/execution/configuration/test-context.xml (100%) rename {spring-batch-execution => spring-batch-core}/src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml (100%) rename {spring-batch-execution => spring-batch-core}/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql (100%) rename {spring-batch-execution => spring-batch-core}/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql (100%) rename {spring-batch-execution => spring-batch-core}/src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml (100%) diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml index 82dad4615..b8df7276b 100644 --- a/spring-batch-core/pom.xml +++ b/spring-batch-core/pom.xml @@ -47,18 +47,27 @@ - backport-util-concurrent - backport-util-concurrent - 3.0 + hsqldb + hsqldb test + + commons-io + commons-io + test + + + easymock + easymock + junit junit - easymock - easymock + cglib + cglib-nodep + test @@ -67,13 +76,29 @@ org.springframework - spring-context-support - test + spring-context org.springframework spring-core + + org.springframework + spring-jdbc + + + org.springframework + spring-test + test + + + org.springframework + spring-tx + + + backport-util-concurrent + backport-util-concurrent + @@ -81,6 +106,119 @@ org.apache.maven.plugins maven-antrun-plugin + + + generate-sql + generate-sources + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + run + + + diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessor.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/MapJobRegistry.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/configuration/MapJobRegistry.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/MapJobRegistry.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/configuration/MapJobRegistry.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/ReferenceJobFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/configuration/ReferenceJobFactory.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/ReferenceJobFactory.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/configuration/ReferenceJobFactory.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/package.html b/spring-batch-core/src/main/java/org/springframework/batch/execution/configuration/package.html similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/package.html rename to spring-batch-core/src/main/java/org/springframework/batch/execution/configuration/package.html diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/AbstractJob.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/job/AbstractJob.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/job/AbstractJob.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/job/AbstractJob.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/SimpleJob.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/job/SimpleJob.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/job/SimpleJob.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/job/SimpleJob.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/package.html b/spring-batch-core/src/main/java/org/springframework/batch/execution/job/package.html similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/job/package.html rename to spring-batch-core/src/main/java/org/springframework/batch/execution/job/package.html diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobLauncher.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/JobLauncher.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobLauncher.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/JobLauncher.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/package.html b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/package.html similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/package.html rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/package.html diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/CommandLineJobRunner.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/CommandLineJobRunner.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/CommandLineJobRunner.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/CommandLineJobRunner.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactory.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactory.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactory.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ExitCodeMapper.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/ExitCodeMapper.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ExitCodeMapper.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/ExitCodeMapper.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ExportedJobLauncher.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/ExportedJobLauncher.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ExportedJobLauncher.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/ExportedJobLauncher.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/JvmSystemExiter.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/JvmSystemExiter.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/JvmSystemExiter.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/JvmSystemExiter.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactory.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactory.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactory.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncher.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncher.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncher.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncher.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapper.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapper.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapper.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapper.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SystemExiter.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/SystemExiter.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/SystemExiter.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/SystemExiter.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/package.html b/spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/package.html similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/support/package.html rename to spring-batch-core/src/main/java/org/springframework/batch/execution/launch/support/package.html diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeChunkListener.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/listener/CompositeChunkListener.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeChunkListener.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/listener/CompositeChunkListener.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeItemReadListener.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/listener/CompositeItemReadListener.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeItemReadListener.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/listener/CompositeItemReadListener.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeItemWriteListener.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/listener/CompositeItemWriteListener.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeItemWriteListener.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/listener/CompositeItemWriteListener.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeJobListener.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/listener/CompositeJobListener.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeJobListener.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/listener/CompositeJobListener.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeStepListener.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/listener/CompositeStepListener.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/listener/CompositeStepListener.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/listener/CompositeStepListener.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/package.html b/spring-batch-core/src/main/java/org/springframework/batch/execution/package.html similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/package.html rename to spring-batch-core/src/main/java/org/springframework/batch/execution/package.html diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBean.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBean.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBean.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/AbstractJdbcBatchMetadataDao.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/AbstractJdbcBatchMetadataDao.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/AbstractJdbcBatchMetadataDao.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/AbstractJdbcBatchMetadataDao.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobExecutionDao.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobExecutionDao.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobExecutionDao.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobInstanceDao.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobInstanceDao.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobInstanceDao.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/JdbcJobInstanceDao.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepExecutionDao.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepExecutionDao.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/JdbcStepExecutionDao.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JobExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/JobExecutionDao.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JobExecutionDao.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/JobExecutionDao.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JobInstanceDao.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/JobInstanceDao.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JobInstanceDao.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/JobInstanceDao.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDao.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDao.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDao.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDao.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDao.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDao.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDao.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDao.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDao.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDao.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/NoSuchObjectException.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/NoSuchObjectException.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/NoSuchObjectException.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/NoSuchObjectException.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/StepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/StepExecutionDao.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/StepExecutionDao.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/StepExecutionDao.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/package.html b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/package.html similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/package.html rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/dao/package.html diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/package.html b/spring-batch-core/src/main/java/org/springframework/batch/execution/repository/package.html similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/package.html rename to spring-batch-core/src/main/java/org/springframework/batch/execution/repository/package.html diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/resource/StepExecutionProxyResource.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/AbstractStep.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/AbstractStep.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/AbstractStep.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/AbstractStep.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/ItemHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/ItemHandler.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/ItemHandler.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/ItemHandler.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/ItemOrientedStep.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/ItemOrientedStep.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/ItemOrientedStep.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/ItemOrientedStep.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/TaskletStep.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/TaskletStep.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/TaskletStep.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/TaskletStep.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/package.html b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/package.html similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/package.html rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/package.html diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/AbstractStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/AbstractStepFactoryBean.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/AbstractStepFactoryBean.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/AbstractStepFactoryBean.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/AlwaysSkipItemSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/AlwaysSkipItemSkipPolicy.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/AlwaysSkipItemSkipPolicy.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/AlwaysSkipItemSkipPolicy.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/BatchListenerFactoryHelper.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/BatchListenerFactoryHelper.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/BatchListenerFactoryHelper.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/BatchListenerFactoryHelper.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultItemFailureHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/DefaultItemFailureHandler.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultItemFailureHandler.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/DefaultItemFailureHandler.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepExecutionSynchronizer.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/DefaultStepExecutionSynchronizer.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepExecutionSynchronizer.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/DefaultStepExecutionSynchronizer.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBean.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBean.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBean.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ItemSkipPolicyItemHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/ItemSkipPolicyItemHandler.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ItemSkipPolicyItemHandler.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/ItemSkipPolicyItemHandler.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/LimitCheckingItemSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/LimitCheckingItemSkipPolicy.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/LimitCheckingItemSkipPolicy.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/LimitCheckingItemSkipPolicy.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ListenerMulticaster.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/ListenerMulticaster.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ListenerMulticaster.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/ListenerMulticaster.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/NeverSkipItemSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/NeverSkipItemSkipPolicy.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/NeverSkipItemSkipPolicy.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/NeverSkipItemSkipPolicy.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBean.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBean.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBean.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifier.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifier.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifier.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifier.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleItemHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/SimpleItemHandler.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleItemHandler.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/SimpleItemHandler.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandler.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandler.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandler.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SkipLimitExceededException.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/SkipLimitExceededException.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SkipLimitExceededException.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/SkipLimitExceededException.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBean.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBean.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBean.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StepExecutionSynchronizer.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/StepExecutionSynchronizer.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StepExecutionSynchronizer.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/StepExecutionSynchronizer.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StepInterruptionPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/StepInterruptionPolicy.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/StepInterruptionPolicy.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/StepInterruptionPolicy.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicy.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicy.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicy.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/package.html b/spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/package.html similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/package.html rename to spring-batch-core/src/main/java/org/springframework/batch/execution/step/support/package.html diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/TaskletAdapter.java b/spring-batch-core/src/main/java/org/springframework/batch/execution/tasklet/TaskletAdapter.java similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/TaskletAdapter.java rename to spring-batch-core/src/main/java/org/springframework/batch/execution/tasklet/TaskletAdapter.java diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/package.html b/spring-batch-core/src/main/java/org/springframework/batch/execution/tasklet/package.html similarity index 100% rename from spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/package.html rename to spring-batch-core/src/main/java/org/springframework/batch/execution/tasklet/package.html diff --git a/spring-batch-execution/src/main/resources/batch.template.properties b/spring-batch-core/src/main/resources/batch.template.properties similarity index 100% rename from spring-batch-execution/src/main/resources/batch.template.properties rename to spring-batch-core/src/main/resources/batch.template.properties diff --git a/spring-batch-execution/src/main/resources/schema-db2.sql b/spring-batch-core/src/main/resources/schema-db2.sql similarity index 100% rename from spring-batch-execution/src/main/resources/schema-db2.sql rename to spring-batch-core/src/main/resources/schema-db2.sql diff --git a/spring-batch-execution/src/main/resources/schema-derby.sql b/spring-batch-core/src/main/resources/schema-derby.sql similarity index 100% rename from spring-batch-execution/src/main/resources/schema-derby.sql rename to spring-batch-core/src/main/resources/schema-derby.sql diff --git a/spring-batch-execution/src/main/resources/schema-hsqldb.sql b/spring-batch-core/src/main/resources/schema-hsqldb.sql similarity index 100% rename from spring-batch-execution/src/main/resources/schema-hsqldb.sql rename to spring-batch-core/src/main/resources/schema-hsqldb.sql diff --git a/spring-batch-execution/src/main/resources/schema-mysql.sql b/spring-batch-core/src/main/resources/schema-mysql.sql similarity index 100% rename from spring-batch-execution/src/main/resources/schema-mysql.sql rename to spring-batch-core/src/main/resources/schema-mysql.sql diff --git a/spring-batch-execution/src/main/resources/schema-oracle10g.sql b/spring-batch-core/src/main/resources/schema-oracle10g.sql similarity index 100% rename from spring-batch-execution/src/main/resources/schema-oracle10g.sql rename to spring-batch-core/src/main/resources/schema-oracle10g.sql diff --git a/spring-batch-execution/src/main/resources/schema-postgresql.sql b/spring-batch-core/src/main/resources/schema-postgresql.sql similarity index 100% rename from spring-batch-execution/src/main/resources/schema-postgresql.sql rename to spring-batch-core/src/main/resources/schema-postgresql.sql diff --git a/spring-batch-execution/src/main/sql/db2.properties b/spring-batch-core/src/main/sql/db2.properties similarity index 100% rename from spring-batch-execution/src/main/sql/db2.properties rename to spring-batch-core/src/main/sql/db2.properties diff --git a/spring-batch-execution/src/main/sql/db2.vpp b/spring-batch-core/src/main/sql/db2.vpp similarity index 100% rename from spring-batch-execution/src/main/sql/db2.vpp rename to spring-batch-core/src/main/sql/db2.vpp diff --git a/spring-batch-execution/src/main/sql/derby.properties b/spring-batch-core/src/main/sql/derby.properties similarity index 100% rename from spring-batch-execution/src/main/sql/derby.properties rename to spring-batch-core/src/main/sql/derby.properties diff --git a/spring-batch-execution/src/main/sql/derby.vpp b/spring-batch-core/src/main/sql/derby.vpp similarity index 100% rename from spring-batch-execution/src/main/sql/derby.vpp rename to spring-batch-core/src/main/sql/derby.vpp diff --git a/spring-batch-execution/src/main/sql/destroy.sql.vpp b/spring-batch-core/src/main/sql/destroy.sql.vpp similarity index 100% rename from spring-batch-execution/src/main/sql/destroy.sql.vpp rename to spring-batch-core/src/main/sql/destroy.sql.vpp diff --git a/spring-batch-execution/src/main/sql/hsqldb.properties b/spring-batch-core/src/main/sql/hsqldb.properties similarity index 100% rename from spring-batch-execution/src/main/sql/hsqldb.properties rename to spring-batch-core/src/main/sql/hsqldb.properties diff --git a/spring-batch-execution/src/main/sql/hsqldb.vpp b/spring-batch-core/src/main/sql/hsqldb.vpp similarity index 100% rename from spring-batch-execution/src/main/sql/hsqldb.vpp rename to spring-batch-core/src/main/sql/hsqldb.vpp diff --git a/spring-batch-execution/src/main/sql/init.sql.vpp b/spring-batch-core/src/main/sql/init.sql.vpp similarity index 100% rename from spring-batch-execution/src/main/sql/init.sql.vpp rename to spring-batch-core/src/main/sql/init.sql.vpp diff --git a/spring-batch-execution/src/main/sql/mysql.properties b/spring-batch-core/src/main/sql/mysql.properties similarity index 100% rename from spring-batch-execution/src/main/sql/mysql.properties rename to spring-batch-core/src/main/sql/mysql.properties diff --git a/spring-batch-execution/src/main/sql/mysql.vpp b/spring-batch-core/src/main/sql/mysql.vpp similarity index 100% rename from spring-batch-execution/src/main/sql/mysql.vpp rename to spring-batch-core/src/main/sql/mysql.vpp diff --git a/spring-batch-execution/src/main/sql/oracle10g.properties b/spring-batch-core/src/main/sql/oracle10g.properties similarity index 100% rename from spring-batch-execution/src/main/sql/oracle10g.properties rename to spring-batch-core/src/main/sql/oracle10g.properties diff --git a/spring-batch-execution/src/main/sql/oracle10g.vpp b/spring-batch-core/src/main/sql/oracle10g.vpp similarity index 100% rename from spring-batch-execution/src/main/sql/oracle10g.vpp rename to spring-batch-core/src/main/sql/oracle10g.vpp diff --git a/spring-batch-execution/src/main/sql/postgresql.properties b/spring-batch-core/src/main/sql/postgresql.properties similarity index 100% rename from spring-batch-execution/src/main/sql/postgresql.properties rename to spring-batch-core/src/main/sql/postgresql.properties diff --git a/spring-batch-execution/src/main/sql/postgresql.vpp b/spring-batch-core/src/main/sql/postgresql.vpp similarity index 100% rename from spring-batch-execution/src/main/sql/postgresql.vpp rename to spring-batch-core/src/main/sql/postgresql.vpp diff --git a/spring-batch-execution/src/main/sql/schema.sql.vpp b/spring-batch-core/src/main/sql/schema.sql.vpp similarity index 100% rename from spring-batch-execution/src/main/sql/schema.sql.vpp rename to spring-batch-core/src/main/sql/schema.sql.vpp diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/AbstractExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/AbstractExceptionTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/AbstractExceptionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/AbstractExceptionTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessorTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessorTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/configuration/JobRegistryBeanPostProcessorTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/MapJobRegistryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/configuration/MapJobRegistryTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/MapJobRegistryTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/configuration/MapJobRegistryTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/AbstractJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/job/AbstractJobTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/job/AbstractJobTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/job/AbstractJobTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/JobSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/job/JobSupport.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/job/JobSupport.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/job/JobSupport.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/EmptyItemWriter.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/launch/EmptyItemWriter.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/EmptyItemWriter.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/launch/EmptyItemWriter.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobLauncherTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/launch/SimpleJobLauncherTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobLauncherTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/launch/SimpleJobLauncherTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/CommandLineJobRunnerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/CommandLineJobRunnerTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/CommandLineJobRunnerTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/CommandLineJobRunnerTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactoryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactoryTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactoryTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/DefaultJobParametersFactoryTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactoryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactoryTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactoryTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/ScheduledJobParametersFactoryTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncherTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncherTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncherTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/SimpleExportedJobLauncherTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapperTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapperTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapperTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/SimpleJvmExitCodeMapperTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/StubJobLauncher.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/StubJobLauncher.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/support/StubJobLauncher.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/launch/support/StubJobLauncher.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeChunkListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeChunkListenerTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeChunkListenerTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeChunkListenerTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeItemReadListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeItemReadListenerTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeItemReadListenerTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeItemReadListenerTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeItemWriteListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeItemWriteListenerTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeItemWriteListenerTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeItemWriteListenerTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeJobListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeJobListenerTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeJobListenerTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeJobListenerTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeStepListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeStepListenerTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/listener/CompositeStepListenerTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/listener/CompositeStepListenerTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBeanTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBeanTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBeanTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/MockStepDao.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/MockStepDao.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/MockStepDao.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/MockStepDao.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryIntegrationTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryIntegrationTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryIntegrationTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoQueryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoQueryTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoQueryTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoQueryTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/JdbcJobDaoTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoPrefixTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoPrefixTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoPrefixTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoPrefixTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/JdbcStepDaoTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDaoTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDaoTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/MapJobExecutionDaoTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDaoTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDaoTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/MapJobInstanceDaoTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDaoTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDaoTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/MapStepExecutionDaoTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/NoSuchBatchDomainObjectExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/NoSuchBatchDomainObjectExceptionTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/NoSuchBatchDomainObjectExceptionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/repository/dao/NoSuchBatchDomainObjectExceptionTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/resource/StepExecutionProxyResourceTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/resource/StepExecutionProxyResourceTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/resource/StepExecutionProxyResourceTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/resource/StepExecutionProxyResourceTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java similarity index 94% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java index b2cfbf444..aeab819b0 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/ItemOrientedStepTests.java @@ -93,6 +93,10 @@ public class ItemOrientedStepTests extends TestCase { } protected void setUp() throws Exception { + MapJobInstanceDao.clear(); + MapStepExecutionDao.clear(); + MapJobExecutionDao.clear(); + transactionManager = new ResourcelessTransactionManager(); itemOrientedStep = (ItemOrientedStep) getStep(new String[] { "foo", "bar", "spam" }); @@ -141,7 +145,8 @@ public class ItemOrientedStepTests extends TestCase { public void testRepository() throws Exception { - SimpleJobRepository repository = new SimpleJobRepository(new MapJobInstanceDao(), new MapJobExecutionDao(), new MapStepExecutionDao()); + SimpleJobRepository repository = new SimpleJobRepository(new MapJobInstanceDao(), new MapJobExecutionDao(), + new MapStepExecutionDao()); itemOrientedStep.setJobRepository(repository); JobExecution jobExecution = repository.createJobExecution(jobInstance.getJob(), jobInstance.getJobParameters()); @@ -174,8 +179,7 @@ public class ItemOrientedStepTests extends TestCase { try { itemOrientedStep.execute(stepExecution); - } - catch (Exception ex) { + } catch (Exception ex) { assertEquals(stepExecution.getRollbackCount(), new Integer(1)); } @@ -204,16 +208,15 @@ public class ItemOrientedStepTests extends TestCase { try { itemOrientedStep.execute(stepExecution); - } - catch (Exception ex) { + } catch (Exception ex) { ExitStatus status = stepExecution.getExitStatus(); assertFalse(status.isContinuable()); } } /* - * make sure a job that has never been executed before, but does have - * saveExecutionAttributes = true, doesn't have restoreFrom called on it. + * make sure a job that has never been executed before, but does have saveExecutionAttributes = true, doesn't have + * restoreFrom called on it. */ public void testNonRestartedJob() throws Exception { MockRestartableItemReader tasklet = new MockRestartableItemReader(); @@ -251,16 +254,14 @@ public class ItemOrientedStepTests extends TestCase { try { itemOrientedStep.execute(stepExecution); fail("Expected BatchCriticalException"); - } - catch (UnexpectedJobExecutionException e) { + } catch (UnexpectedJobExecutionException e) { assertEquals("foo", e.getCause().getMessage()); } assertEquals(BatchStatus.UNKNOWN, stepExecution.getStatus()); } /* - * make sure a job that has been executed before, and is therefore being - * restarted, is restored. + * make sure a job that has been executed before, and is therefore being restarted, is restored. */ // public void testRestartedJob() throws Exception { // String step = "stepName"; @@ -282,9 +283,8 @@ public class ItemOrientedStepTests extends TestCase { // assertTrue(tasklet.isGetExecutionAttributesCalled()); // } /* - * Test that a job that is being restarted, but has saveExecutionAttributes - * set to false, doesn't have restore or getExecutionAttributes called on - * it. + * Test that a job that is being restarted, but has saveExecutionAttributes set to false, doesn't have restore or + * getExecutionAttributes called on it. */ public void testNoSaveExecutionAttributesRestartableJob() { MockRestartableItemReader tasklet = new MockRestartableItemReader(); @@ -294,8 +294,7 @@ public class ItemOrientedStepTests extends TestCase { try { itemOrientedStep.execute(stepExecution); - } - catch (Throwable t) { + } catch (Throwable t) { fail(); } @@ -303,9 +302,8 @@ public class ItemOrientedStepTests extends TestCase { } /* - * Even though the job is restarted, and saveExecutionAttributes is true, - * nothing will be restored because the Tasklet does not implement - * Restartable. + * Even though the job is restarted, and saveExecutionAttributes is true, nothing will be restored because the + * Tasklet does not implement Restartable. */ public void testRestartJobOnNonRestartableTasklet() throws Exception { itemOrientedStep.setItemHandler(new SimpleItemHandler(new AbstractItemReader() { @@ -324,6 +322,7 @@ public class ItemOrientedStepTests extends TestCase { public Object read() throws Exception { return "foo"; } + public void update(ExecutionContext executionContext) { // TODO Auto-generated method stub executionContext.putString("foo", "bar"); @@ -344,11 +343,11 @@ public class ItemOrientedStepTests extends TestCase { } public void testDirectlyInjectedItemStream() throws Exception { - itemOrientedStep.setStreams(new ItemStream[] {new ItemStreamSupport() { + itemOrientedStep.setStreams(new ItemStream[] { new ItemStreamSupport() { public void update(ExecutionContext executionContext) { executionContext.putString("foo", "bar"); } - }}); + } }); JobExecution jobExecution = new JobExecution(jobInstance); StepExecution stepExecution = new StepExecution(itemOrientedStep, jobExecution); @@ -364,6 +363,7 @@ public class ItemOrientedStepTests extends TestCase { public void beforeStep(StepExecution stepExecution) { list.add("foo"); } + public ExitStatus afterStep(StepExecution stepExecution) { list.add("bar"); return null; @@ -380,32 +380,33 @@ public class ItemOrientedStepTests extends TestCase { public void beforeStep(StepExecution stepExecution) { list.add("foo"); } + public void open(ExecutionContext executionContext) throws ItemStreamException { assertEquals(1, list.size()); } }; - itemOrientedStep.setStreams(new ItemStream[] {reader}); + itemOrientedStep.setStreams(new ItemStream[] { reader }); itemOrientedStep.registerStepListener(reader); StepExecution stepExecution = new StepExecution(itemOrientedStep, new JobExecution(jobInstance)); itemOrientedStep.execute(stepExecution); assertEquals(1, list.size()); } - - public void testAfterStep() throws Exception{ - + + public void testAfterStep() throws Exception { + final ExitStatus customStatus = new ExitStatus(false, "custom code"); - - itemOrientedStep.setStepListeners(new StepListener[] {new StepListenerSupport() { + + itemOrientedStep.setStepListeners(new StepListener[] { new StepListenerSupport() { public ExitStatus afterStep(StepExecution stepExecution) { list.add("afterStepCalled"); return customStatus; } - }}); - + } }); + RepeatTemplate stepTemplate = new RepeatTemplate(); stepTemplate.setCompletionPolicy(new SimpleCompletionPolicy(5)); itemOrientedStep.setStepOperations(stepTemplate); - + JobExecution jobExecution = new JobExecution(jobInstance); StepExecution stepExecution = new StepExecution(itemOrientedStep, jobExecution); itemOrientedStep.execute(stepExecution); @@ -443,13 +444,14 @@ public class ItemOrientedStepTests extends TestCase { public Object read() throws Exception { return "foo"; } + public void update(ExecutionContext executionContext) { // TODO Auto-generated method stub executionContext.putString("foo", "bar"); } }; itemOrientedStep.setItemHandler(new SimpleItemHandler(reader, itemWriter)); - itemOrientedStep.setStreams(new ItemStream[] {reader}); + itemOrientedStep.setStreams(new ItemStream[] { reader }); JobExecution jobExecution = new JobExecution(jobInstance); StepExecution stepExecution = new StepExecution(itemOrientedStep, jobExecution); @@ -499,12 +501,11 @@ public class ItemOrientedStepTests extends TestCase { try { itemOrientedStep.execute(stepExecution); fail("Expected StepInterruptedException"); - } - catch (JobInterruptedException ex) { + } catch (JobInterruptedException ex) { assertEquals(BatchStatus.STOPPED, stepExecution.getStatus()); String msg = stepExecution.getExitStatus().getExitDescription(); assertTrue("Message does not contain JobInterruptedException: " + msg, msg - .contains("JobInterruptedException")); + .contains("JobInterruptedException")); } } @@ -527,8 +528,7 @@ public class ItemOrientedStepTests extends TestCase { try { itemOrientedStep.execute(stepExecution); fail("Expected RuntimeException"); - } - catch (RuntimeException ex) { + } catch (RuntimeException ex) { assertEquals(BatchStatus.FAILED, stepExecution.getStatus()); // The original rollback was caused by this one: assertEquals("Foo", ex.getMessage()); @@ -560,8 +560,7 @@ public class ItemOrientedStepTests extends TestCase { try { itemOrientedStep.execute(stepExecution); fail("Expected BatchCriticalException"); - } - catch (UnexpectedJobExecutionException ex) { + } catch (UnexpectedJobExecutionException ex) { assertEquals(BatchStatus.UNKNOWN, stepExecution.getStatus()); String msg = stepExecution.getExitStatus().getExitDescription(); assertTrue("Message does not contain ResetFailedException: " + msg, msg.contains("ResetFailedException")); @@ -588,8 +587,7 @@ public class ItemOrientedStepTests extends TestCase { try { itemOrientedStep.execute(stepExecution); fail("Expected BatchCriticalException"); - } - catch (UnexpectedJobExecutionException ex) { + } catch (UnexpectedJobExecutionException ex) { assertEquals(BatchStatus.UNKNOWN, stepExecution.getStatus()); String msg = stepExecution.getExitStatus().getExitDescription(); assertEquals("", msg); @@ -604,7 +602,7 @@ public class ItemOrientedStepTests extends TestCase { itemOrientedStep.setJobRepository(new JobRepositorySupport() { public void saveOrUpdate(StepExecution stepExecution) { - if (stepExecution.getEndTime()!=null) { + if (stepExecution.getEndTime() != null) { throw new RuntimeException("Bar"); } super.saveOrUpdate(stepExecution); @@ -617,8 +615,7 @@ public class ItemOrientedStepTests extends TestCase { try { itemOrientedStep.execute(stepExecution); fail("Expected RuntimeException"); - } - catch (RuntimeException ex) { + } catch (RuntimeException ex) { // The job actually completeed, but teh streams couldn't be closed. assertEquals(BatchStatus.COMPLETED, stepExecution.getStatus()); String msg = stepExecution.getExitStatus().getExitDescription(); @@ -651,8 +648,7 @@ public class ItemOrientedStepTests extends TestCase { try { itemOrientedStep.execute(stepExecution); fail("Expected InfrastructureException"); - } - catch (UnexpectedJobExecutionException ex) { + } catch (UnexpectedJobExecutionException ex) { // The job actually completeed, but the streams couldn't be closed. assertEquals(BatchStatus.COMPLETED, stepExecution.getStatus()); String msg = stepExecution.getExitStatus().getExitDescription(); diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/StepSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/StepSupport.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/StepSupport.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/StepSupport.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/TaskletStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/TaskletStepTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/TaskletStepTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/TaskletStepTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBeanTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBeanTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBeanTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/JobRepositorySupport.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/JobRepositorySupport.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/JobRepositorySupport.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/JobRepositorySupport.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/MockItemReader.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/MockItemReader.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/MockItemReader.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/MockItemReader.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBeanTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBeanTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/RepeatOperationsStepFactoryBeanTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifierTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifierTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifierTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/SimpleExitStatusExceptionClassifierTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandlerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandlerTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandlerTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandlerTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SkipLimitReadFailurePolicyTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/SkipLimitReadFailurePolicyTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SkipLimitReadFailurePolicyTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/SkipLimitReadFailurePolicyTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBeanTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBeanTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/StatefulRetryStepFactoryBeanTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/StepExecutorInterruptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/StepExecutorInterruptionTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/StepExecutorInterruptionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/StepExecutorInterruptionTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicyTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicyTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicyTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/step/support/ThreadStepInterruptionPolicyTests.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/TaskletAdapterTests.java b/spring-batch-core/src/test/java/org/springframework/batch/execution/tasklet/TaskletAdapterTests.java similarity index 100% rename from spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/TaskletAdapterTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/execution/tasklet/TaskletAdapterTests.java diff --git a/spring-batch-execution/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java b/spring-batch-core/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java similarity index 100% rename from spring-batch-execution/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java rename to spring-batch-core/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/job.xml b/spring-batch-core/src/test/resources/org/springframework/batch/execution/bootstrap/support/job.xml similarity index 100% rename from spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/job.xml rename to spring-batch-core/src/test/resources/org/springframework/batch/execution/bootstrap/support/job.xml diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml b/spring-batch-core/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml similarity index 100% rename from spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml rename to spring-batch-core/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/test-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/execution/configuration/test-context.xml similarity index 100% rename from spring-batch-execution/src/test/resources/org/springframework/batch/execution/configuration/test-context.xml rename to spring-batch-core/src/test/resources/org/springframework/batch/execution/configuration/test-context.xml diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml similarity index 100% rename from spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml rename to spring-batch-core/src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql b/spring-batch-core/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql similarity index 100% rename from spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql rename to spring-batch-core/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql b/spring-batch-core/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql similarity index 100% rename from spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql rename to spring-batch-core/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml b/spring-batch-core/src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml similarity index 100% rename from spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml rename to spring-batch-core/src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml diff --git a/spring-batch-execution/.springBeans b/spring-batch-execution/.springBeans index 0d78bec76..c0fa1b743 100644 --- a/spring-batch-execution/.springBeans +++ b/spring-batch-execution/.springBeans @@ -1,17 +1,12 @@ 1 - + - src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml - src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml - src/test/resources/org/springframework/batch/execution/configuration/test-context.xml - src/test/resources/org/springframework/batch/execution/bootstrap/support/job.xml - src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml @@ -19,8 +14,6 @@ true false - src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml - src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml @@ -28,7 +21,6 @@ true false - src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml @@ -36,8 +28,6 @@ true false - src/test/resources/org/springframework/batch/execution/bootstrap/support/job.xml - src/test/resources/org/springframework/batch/execution/bootstrap/support/test-environment.xml diff --git a/spring-batch-execution/pom.xml b/spring-batch-execution/pom.xml index 5ff3cdff4..ae023a746 100644 --- a/spring-batch-execution/pom.xml +++ b/spring-batch-execution/pom.xml @@ -102,123 +102,6 @@ - - org.apache.maven.plugins - maven-antrun-plugin - - - generate-sql - generate-sources - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - run - - - - diff --git a/spring-batch-infrastructure/.springBeans b/spring-batch-infrastructure/.springBeans index 15db1a370..133aca434 100644 --- a/spring-batch-infrastructure/.springBeans +++ b/spring-batch-infrastructure/.springBeans @@ -7,7 +7,6 @@ - src/test/resources/org/springframework/batch/retry/aop/retry-transaction-test.xml src/test/resources/org/springframework/batch/item/database/data-source-context.xml src/test/resources/org/springframework/batch/item/file/mapping/bean-wrapper.xml diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/AbstractDelegatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/AbstractDelegatorTests.java index ab2af4969..871b22923 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/AbstractDelegatorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/AbstractDelegatorTests.java @@ -10,7 +10,7 @@ import org.springframework.util.Assert; /** * Tests for {@link AbstractMethodInvokingDelegator} - * + * * @author Robert Kasanicky */ public class AbstractDelegatorTests extends TestCase { diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml index 98982f56f..64cbe27a3 100644 --- a/spring-batch-samples/pom.xml +++ b/spring-batch-samples/pom.xml @@ -41,11 +41,6 @@ - - org.springframework.batch - spring-batch-execution - ${project.version} - aspectj aspectjrt