diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobOperator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobOperator.java index d545dfd4b..a5a184c11 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobOperator.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobOperator.java @@ -50,6 +50,7 @@ import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.repository.JobRestartException; import org.springframework.batch.support.PropertiesConverter; import org.springframework.beans.factory.InitializingBean; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; /** @@ -355,6 +356,7 @@ public class SimpleJobOperator implements JobOperator, InitializingBean { * @see * org.springframework.batch.core.launch.JobOperator#stop(java.lang.Long) */ + @Transactional public boolean stop(long executionId) throws NoSuchJobExecutionException { JobExecution jobExecution = findExecutionById(executionId); diff --git a/spring-batch-samples/.springBeans b/spring-batch-samples/.springBeans index dae6e44e7..0beb88fe6 100644 --- a/spring-batch-samples/.springBeans +++ b/spring-batch-samples/.springBeans @@ -46,6 +46,8 @@ src/main/resources/jobs/iosample/hibernate.xml src/main/resources/jobs/hibernateJob.xml src/main/resources/jobs/iosample/jpa.xml + src/main/resources/jobs/iosample/ibatis.xml + src/test/resources/org/springframework/batch/sample/JobOperatorFunctionalTests-context.xml diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobOperatorFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobOperatorFunctionalTests.java index 94890119b..8fd953750 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobOperatorFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobOperatorFunctionalTests.java @@ -1,6 +1,10 @@ package org.springframework.batch.sample; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.springframework.batch.core.BatchStatus.STARTED; +import static org.springframework.batch.core.BatchStatus.STOPPED; import java.util.List; import java.util.Map; @@ -11,7 +15,6 @@ import org.apache.commons.logging.LogFactory; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import static org.springframework.batch.core.BatchStatus.*; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.core.configuration.ListableJobRegistry; @@ -22,7 +25,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration() +@ContextConfiguration public class JobOperatorFunctionalTests { private static final Log logger = LogFactory.getLog(JobOperatorFunctionalTests.class); diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/JobOperatorFunctionalTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/JobOperatorFunctionalTests-context.xml index 93b921438..e70a46ca6 100644 --- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/JobOperatorFunctionalTests-context.xml +++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/JobOperatorFunctionalTests-context.xml @@ -1,10 +1,14 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd" + xmlns:tx="http://www.springframework.org/schema/tx"> + + +