[BATCH-429] Move sub-packages over to core

This commit is contained in:
dsyer
2008-03-09 08:51:55 +00:00
parent 5f9350e1c1
commit bc94866754
138 changed files with 1560 additions and 482 deletions

View File

@@ -53,7 +53,7 @@ public class JobExecutionNotificationPublisher implements ApplicationListener, N
* close we log the event at INFO level and send a JMX notification if we
* are also an MBean.
*
* @see org.springframework.batch.execution.launch.SimpleJobLauncher#onApplicationEvent(org.springframework.context.ApplicationEvent)
* @see org.springframework.batch.core.launch.SimpleJobLauncher#onApplicationEvent(org.springframework.context.ApplicationEvent)
*/
public void onApplicationEvent(ApplicationEvent applicationEvent) {
if (applicationEvent instanceof SimpleMessageApplicationEvent) {

View File

@@ -26,10 +26,10 @@ import org.quartz.JobExecutionContext;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.JobParametersBuilder;
import org.springframework.batch.core.configuration.JobLocator;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.repository.JobRestartException;
import org.springframework.batch.core.repository.NoSuchJobException;
import org.springframework.batch.execution.launch.JobLauncher;
import org.springframework.scheduling.quartz.QuartzJobBean;
/**

View File

@@ -1,7 +1,7 @@
package org.springframework.batch.sample.step.support;
import org.springframework.batch.core.JobInterruptedException;
import org.springframework.batch.execution.step.support.StepInterruptionPolicy;
import org.springframework.batch.core.step.support.StepInterruptionPolicy;
import org.springframework.batch.repeat.RepeatContext;
public class NoopStepInterruptionPolicy implements StepInterruptionPolicy {

View File

@@ -9,7 +9,7 @@
<!-- The tasklet used in this job will run in an infinite loop. This is useful for testing graceful shutdown from
multiple environments. -->
<bean id="jobLauncher" class="org.springframework.batch.execution.launch.SimpleJobLauncher">
<bean id="jobLauncher" class="org.springframework.batch.core.launch.SimpleJobLauncher">
<property name="jobRepository" ref="jobRepository" />
<property name="taskExecutor">
<bean class="org.springframework.core.task.SimpleAsyncTaskExecutor"/>

View File

@@ -10,7 +10,7 @@
<bean id="retrySample" parent="simpleJob">
<property name="steps">
<bean id="step1" parent="simpleStep"
class="org.springframework.batch.execution.step.support.StatefulRetryStepFactoryBean">
class="org.springframework.batch.core.step.StatefulRetryStepFactoryBean">
<property name="itemReader" ref="itemGenerator" />
<property name="itemWriter" ref="itemWriter" />
<property name="retryLimit" value="3" />

View File

@@ -10,15 +10,15 @@
<import resource="data-source-context.xml" />
<bean id="jobConfigurationRegistryBeanPostProcessor"
class="org.springframework.batch.execution.configuration.JobRegistryBeanPostProcessor">
class="org.springframework.batch.core.configuration.support.JobRegistryBeanPostProcessor">
<property name="jobRegistry" ref="jobConfigurationRegistry" />
</bean>
<bean id="jobLauncher" class="org.springframework.batch.execution.launch.SimpleJobLauncher">
<bean id="jobLauncher" class="org.springframework.batch.core.launch.SimpleJobLauncher">
<property name="jobRepository" ref="jobRepository" />
</bean>
<bean id="jobConfigurationRegistry" class="org.springframework.batch.execution.configuration.MapJobRegistry" />
<bean id="jobConfigurationRegistry" class="org.springframework.batch.core.configuration.support.MapJobRegistry" />
<aop:config>
<aop:advisor pointcut="execution(* org.springframework.batch.execution..*Repository+.*(..))"
@@ -32,33 +32,33 @@
</tx:attributes>
</tx:advice>
<bean id="jobRepository" class="org.springframework.batch.execution.repository.JobRepositoryFactoryBean"
<bean id="jobRepository" class="org.springframework.batch.core.repository.support.JobRepositoryFactoryBean"
p:databaseType="hsql" p:dataSource-ref="dataSource" />
<bean id="mapJobInstanceDao" lazy-init="true"
class="org.springframework.batch.execution.repository.dao.MapJobInstanceDao" />
class="org.springframework.batch.core.repository.support.dao.MapJobInstanceDao" />
<bean id="mapJobExecutionDao" lazy-init="true"
class="org.springframework.batch.execution.repository.dao.MapJobExecutionDao" />
class="org.springframework.batch.core.repository.support.dao.MapJobExecutionDao" />
<bean id="mapStepExecutionDao" lazy-init="true"
class="org.springframework.batch.execution.repository.dao.MapStepExecutionDao" />
class="org.springframework.batch.core.repository.support.dao.MapStepExecutionDao" />
<bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
<property name="dataSource" ref="dataSource" />
</bean>
<bean id="simpleJob" class="org.springframework.batch.execution.job.SimpleJob" abstract="true">
<bean id="simpleJob" class="org.springframework.batch.core.job.SimpleJob" abstract="true">
<property name="jobRepository" ref="jobRepository" />
<property name="restartable" value="true" />
</bean>
<bean id="taskletStep" class="org.springframework.batch.execution.step.TaskletStep" abstract="true">
<bean id="taskletStep" class="org.springframework.batch.core.step.TaskletStep" abstract="true">
<property name="jobRepository" ref="jobRepository" />
<property name="allowStartIfComplete" value="true" />
</bean>
<bean id="simpleStep" class="org.springframework.batch.execution.step.support.DefaultStepFactoryBean"
<bean id="simpleStep" class="org.springframework.batch.core.step.DefaultStepFactoryBean"
abstract="true">
<property name="transactionManager" ref="transactionManager" />
<property name="jobRepository" ref="jobRepository" />

View File

@@ -18,7 +18,7 @@ package org.springframework.batch.sample;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.execution.launch.JobLauncher;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
import org.springframework.util.ClassUtils;

View File

@@ -31,10 +31,10 @@ import org.quartz.spi.TriggerFiredBundle;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.configuration.JobLocator;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
import org.springframework.batch.core.repository.JobRestartException;
import org.springframework.batch.core.repository.NoSuchJobException;
import org.springframework.batch.execution.launch.JobLauncher;
import org.springframework.batch.sample.tasklet.JobSupport;
/**